]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6560018078aac2bfb5db0c698e2d572d2342d98f
treea67a788c7ba06cb40219b49505f84594dabc6f82
parentef4d41251b9a9cb53ebdc98a69654b767f285b0a
parentf0c68deab05df017e87449397925e6657af651e7
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6

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