]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 2 Dec 2008 22:07:40 +0000 (22:07 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 2 Dec 2008 22:07:40 +0000 (22:07 +0000)
commitc5b84b3bb0c055d70dc9f1b5e900378bc9d059ea
treebd5b0b4efb552bacd812f9e6e08a29bae70c0da1
parentd281bc9d8a22419abc254f86a7fc268bb99914e1
parentbc2fd1c09c226ea47ab8301cde6dbcf9e5c78b73
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

Conflicts:

arch/arm/mach-pxa/pxa25x.c
13 files changed:
arch/arm/boot/compressed/head.S
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/ezx.c
arch/arm/mach-pxa/mioa701.c
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
arch/arm/mach-pxa/pxa3xx.c
drivers/media/video/pxa_camera.c
drivers/mtd/nand/pxa3xx_nand.c
drivers/net/irda/pxaficp_ir.c
drivers/serial/pxa.c
drivers/video/pxafb.c