From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 7 Aug 2008 10:05:25 +0000 (+0100)
Subject: Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa... 
X-Git-Tag: v2.6.27-rc3~67^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afd2fc02ab7bae6062671c5ca80dd34c34a63fb7;p=pandora-kernel.git

Merge branch 'for-rmk' of git://git./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
---

afd2fc02ab7bae6062671c5ca80dd34c34a63fb7
Reading git-diff-tree failed