Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorDavid S. Miller <davem@davemloft.net>
Mon, 16 Nov 2009 04:59:34 +0000 (20:59 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 16 Nov 2009 04:59:34 +0000 (20:59 -0800)

Trivial merge