Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
David S. Miller [Mon, 22 Mar 2010 01:03:11 +0000 (18:03 -0700)]

Trivial merge