git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
737be10
d7b2545
)
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
author
John W. Linville
<linville@tuxdriver.com>
Thu, 29 May 2014 17:03:47 +0000
(13:03 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Thu, 29 May 2014 17:03:47 +0000
(13:03 -0400)
Conflicts:
drivers/bluetooth/btusb.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff