git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d0c4da 1c2e004)
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>
Tue, 12 Jun 2012 01:36:42 +0000 (22:36 -0300)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Tue, 12 Jun 2012 01:36:42 +0000 (22:36 -0300)
Conflicts:
net/bluetooth/hci_event.c


Trivial merge
Pandora Kernel Repository