summaryrefslogtreecommitdiff
path: root/arch/arm/mach-sa1100/include
AgeCommit message (Collapse)AuthorFilesLines
2008-08-07Merge branch 'for-rmk' of ↵Russell King1-0/+18
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 Conflicts: arch/arm/mach-pxa/generic.c arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c arch/arm/mach-pxa/pxa2xx.c arch/arm/mach-pxa/pxa3xx.c arch/arm/mach-pxa/reset.c arch/arm/mach-pxa/spitz.c arch/arm/mach-pxa/tosa.c drivers/watchdog/sa1100_wdt.c
2008-08-07[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/machRussell King30-0/+5237
This just leaves include/asm-arm/plat-* to deal with. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>