| commit | 3f30a09a612bac2b531a206c2a58a292dd7ff182 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Thu Oct 09 21:33:02 2008 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Oct 09 21:33:02 2008 +0100 |
| tree | 62741c2f78aeb3009c66dbcf014ebff2e034e597 | |
| parent | 9e165acf1b9e37af7c0fa39399b43d0bd8600039 [diff] | |
| parent | fda50a1c49ad7483eaa29a268d560422c413933f [diff] |
Merge branch 'pxa-all' into devel Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/corgi.c arch/arm/mach-pxa/include/mach/hardware.h arch/arm/mach-pxa/spitz.c