Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorDavid S. Miller <davem@davemloft.net>
Sat, 16 May 2009 20:46:06 +0000 (13:46 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 16 May 2009 20:46:06 +0000 (13:46 -0700)

Trivial merge