Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Jul 2010 20:17:49 +0000 (16:17 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Jul 2010 20:17:49 +0000 (16:17 -0400)
commit099284bdecf6e0af78662371ed3f45b71d796aad
tree90c336885d8dd6daf46ea4b94f71bb8f986b5ba9
parent073730d771d97bb5bbef080bd5d6d0a5af7cba7d
parent4ebaa4edf8799cab19d5a0642dc95f04fd284e06
Merge branch 'master' of git://git./linux/kernel/git/holtmann/bluetooth-next-2.6