Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Feb 2011 21:49:17 +0000 (16:49 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Feb 2011 21:49:17 +0000 (16:49 -0500)
commitf4f314bf6fd39d85065c3fcda27bd594163abcf0
tree2b88d345b2563e51c196b038ff5f74b94c77b2e0
parentc269a20393500e84e8cbae23ca6d65e1107433c4
parent8ffd878419839638d1aea102455b575da39c1a62
Merge branch 'master' of git://git./linux/kernel/git/padovan/bluetooth-next-2.6