Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetoot...
John W. Linville [Tue, 4 Jan 2011 19:25:28 +0000 (14:25 -0500)]

Trivial merge