Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
commit5dc0fa782ad4a2cfad93c016765492083e687cf3
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Feb 2011 20:30:42 +0000 (9 15:30 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Feb 2011 20:30:42 +0000 (9 15:30 -0500)
treea7c41c15779b5cbeafcfdc445f796c46d80ec0c0
parentfc7c976dc7a565213393ce700d4a6105f037bf20
parente733fb62082b3b187870dfba28d5f6730b8436c4
Merge branch 'master' of git://git./linux/kernel/git/padovan/bluetooth-2.6