projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc513ac ebcce7b)
Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 7 Oct 2008 18:08:35 +0000 (19:08 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 7 Oct 2008 18:08:35 +0000 (19:08 +0100)
Merge branch 'pxa-eseries' into pxa-machines

Conflicts:

arch/arm/mach-pxa/Makefile


Trivial merge
John Crispins staging tree