Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetoot...
commitf2529c2cc80b72fcf889a9399e522b9648ab4d9e
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Jul 2011 18:33:09 +0000 (5 14:33 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Jul 2011 18:33:09 +0000 (5 14:33 -0400)
tree345c37f67d53f6b07a81fe5f625fe6af946359d5
parenta0b8de350be458b33248e48b2174d9af8a4c4798
parent163f4dabea4e3be485c17e8f08e3a6468ad31cbf
Merge branch 'master' of /linux/kernel/git/padovan/bluetooth-2.6