Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorDavid S. Miller <davem@davemloft.net>
Tue, 9 Feb 2010 06:45:56 +0000 (22:45 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Feb 2010 06:45:56 +0000 (22:45 -0800)

Trivial merge