Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorDavid S. Miller <davem@davemloft.net>
Tue, 5 May 2009 04:31:29 +0000 (21:31 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 May 2009 04:31:29 +0000 (21:31 -0700)

Trivial merge