git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e13e21d 3306054)
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
authorGustavo F. Padovan <padovan@profusion.mobi>
Tue, 21 Jun 2011 17:52:56 +0000 (14:52 -0300)
committerGustavo F. Padovan <padovan@profusion.mobi>
Tue, 21 Jun 2011 17:52:56 +0000 (14:52 -0300)
Conflicts:
net/bluetooth/l2cap_core.c


Trivial merge
Pandora Kernel Repository