]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 7 Apr 2011 19:30:53 +0000 (15:30 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 7 Apr 2011 19:30:53 +0000 (15:30 -0400)
commitf3b3e36f4ecad9fd7b0ae04d7400f2153a7834eb
tree94417c101111e299fecd93ff41b2304e47e59e2c
parentb0006e69615868f3dfdfe2bd64eb11973f1208fc
parentdb940cb0db7c69a217661ecd49e1e6b0d680a6cc
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6