git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
58a2737
b07fed4
)
Merge branch 'mxs/saif' into next/drivers
author
Arnd Bergmann
<arnd@arndb.de>
Tue, 6 Dec 2011 14:23:35 +0000
(14:23 +0000)
committer
Arnd Bergmann
<arnd@arndb.de>
Tue, 6 Dec 2011 14:23:35 +0000
(14:23 +0000)
Conflicts:
drivers/net/ethernet/cadence/Kconfig
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff