git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
709baa6
61b8008
)
Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git...
author
Arnd Bergmann
<arnd@arndb.de>
Thu, 15 Mar 2012 21:05:52 +0000
(21:05 +0000)
committer
Arnd Bergmann
<arnd@arndb.de>
Thu, 15 Mar 2012 21:05:52 +0000
(21:05 +0000)
Conflicts:
arch/arm/mach-tegra/common.c
arch/arm/mach-ux500/devices-common.c
This resolves two conflicts and lets us merge the exynos5 branch
cleanly.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff