Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorDavid S. Miller <davem@davemloft.net>
Mon, 20 Apr 2009 09:16:44 +0000 (02:16 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 20 Apr 2009 09:16:44 +0000 (02:16 -0700)

Trivial merge