Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 19 Apr 2011 19:34:48 +0000 (15:34 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 19 Apr 2011 19:34:48 +0000 (15:34 -0400)
commitbb411b4db2767cfd4a99b3328da843ce4ea1596a
tree8b03d033476d9bb4abbff4f214a1b942081828e9
parent44c866a0a57b08b7090be24ccb33679ed1d4f476
parent26954c7f26068b6ced108806fdd39aee5cd54e6f
Merge branch 'master' of git://git./linux/kernel/git/padovan/bluetooth-next-2.6