Merge branch for-rmk-devel of git://aeryn.fluff.org.uk/bjdooks/linux into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 10 Jun 2009 21:40:55 +0000 (22:40 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 10 Jun 2009 21:41:06 +0000 (22:41 +0100)
commit547c32aeb5a24178ef20488ae0508efcc32ae8e4
treefdc33154820cfddc845cef2f67380dace655b28f
parentb0efb42478c81ed0ed9aa0dc444db200c32624f0
parent99ae99533a059750c4b0f76295625b8ac5ea751a
Merge branch for-rmk-devel of git://aeryn.fluff.org.uk/bjdooks/linux into devel
arch/arm/mach-ep93xx/core.c
arch/arm/mach-s3c2410/mach-bast.c
arch/arm/mach-s3c6400/include/mach/map.h
arch/arm/mach-versatile/core.c
arch/arm/plat-s3c24xx/dma.c
arch/arm/plat-s3c64xx/gpiolib.c