Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorDavid S. Miller <davem@davemloft.net>
Mon, 1 Feb 2010 07:34:58 +0000 (23:34 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 Feb 2010 07:34:58 +0000 (23:34 -0800)

Trivial merge