git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4dad999 d766091)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
authorGustavo F. Padovan <padovan@profusion.mobi>
Mon, 19 Dec 2011 13:37:53 +0000 (11:37 -0200)
committerGustavo F. Padovan <padovan@profusion.mobi>
Mon, 19 Dec 2011 13:37:53 +0000 (11:37 -0200)
Conflicts:
net/bluetooth/l2cap_core.c


Trivial merge
Pandora Kernel Repository