]> 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)
commitf58187ebcd3c795e9aa3eb1508b3554c4d956592
treea67a788c7ba06cb40219b49505f84594dabc6f82
parent5682983c527a9489c31626cf614a11c563e32384
parent9f84f1e92fc518e2236fe137adb4dfd250737226
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