git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26954c7 069f40f)
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
authorGustavo F. Padovan <padovan@profusion.mobi>
Thu, 21 Apr 2011 00:47:07 +0000 (21:47 -0300)
committerGustavo F. Padovan <padovan@profusion.mobi>
Thu, 21 Apr 2011 00:47:07 +0000 (21:47 -0300)
Conflicts:
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c


Trivial merge
Pandora Kernel Repository