Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorDavid S. Miller <davem@davemloft.net>
Sun, 28 Feb 2010 08:57:28 +0000 (00:57 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 28 Feb 2010 08:57:28 +0000 (00:57 -0800)

Trivial merge