summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/include/mach/reset.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-rmk' of ↵Russell King2008-08-071-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