git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a990cbd
3d64b44
)
Merge branch 'zynq/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git...
author
Arnd Bergmann
<arnd@arndb.de>
Sun, 17 Jul 2011 19:43:26 +0000
(21:43 +0200)
committer
Arnd Bergmann
<arnd@arndb.de>
Sun, 17 Jul 2011 19:43:26 +0000
(21:43 +0200)
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff