Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorDavid S. Miller <davem@davemloft.net>
Wed, 3 Dec 2008 06:38:02 +0000 (22:38 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 3 Dec 2008 06:38:02 +0000 (22:38 -0800)

Trivial merge