| commit | cc513ac0f29473de365664c4fba9cf033c1f2324 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Tue Oct 07 19:08:32 2008 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Oct 07 19:08:32 2008 +0100 |
| tree | 27ee53310699caa0e5cac80d519c0ec04120f8ca | |
| parent | 1543966a079fc7065849ae43ca4dd767c188ad55 [diff] | |
| parent | 19ec95df2c4ec2d28919f267c4d17178f8fe9d9c [diff] |
Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm Merge branch 'pxa-viper' into pxa-machines Conflicts: arch/arm/mach-pxa/Makefile drivers/pcmcia/Kconfig drivers/pcmcia/Makefile