git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6defd90 aa59e19)
Merge branch 'omap-all' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 14 Oct 2008 21:24:42 +0000 (22:24 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 14 Oct 2008 21:24:42 +0000 (22:24 +0100)
Conflicts:

arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/irq.c


Trivial merge
Pandora Kernel Repository