git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be093be 569106c)
Merge branch 'master' of git://git.marvell.com/orion into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 19 Mar 2009 23:10:40 +0000 (23:10 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 19 Mar 2009 23:10:40 +0000 (23:10 +0000)
Conflicts:

arch/arm/mach-mx1/devices.c


Trivial merge
Pandora Kernel Repository