git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8bfc245
a0b1c42
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
author
Ralf Baechle
<ralf@linux-mips.org>
Thu, 21 Feb 2013 15:16:55 +0000
(16:16 +0100)
committer
Ralf Baechle
<ralf@linux-mips.org>
Fri, 22 Feb 2013 09:07:30 +0000
(10:07 +0100)
Conflicts:
include/linux/ssb/ssb_driver_gige.h
Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/-
bgmac.c due to change of an API.
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff