Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetoot...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Jul 2011 18:58:22 +0000 (14:58 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Jul 2011 18:58:22 +0000 (14:58 -0400)
commit4b42c542afbc119c4012324ea80e0c5a89afea4f
treea67a788c7ba06cb40219b49505f84594dabc6f82
parentd8598981146241064993e371cea8333f59553cb6
parente2fd318e3a9208245ee1041f6d413c8593fba29d
Merge branch 'master' of /linux/kernel/git/padovan/bluetooth-next-2.6

Conflicts:
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_core.c