Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 17 Oct 2008 13:29:03 +0000 (14:29 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 17 Oct 2008 13:29:03 +0000 (14:29 +0100)
commit11cd4cb5f55cdc2f487b8c714610aa3538e28103
tree81376ff23d9a706c3d4f45e5cf4d213e63abd2ed
parent485bdde78747f7ce2af164406c32db23e4688925
parent55b404fd78792d7a88d19f2534510ee42841146f
Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
arch/arm/mach-s3c2443/clock.c
arch/arm/plat-s3c24xx/pwm-clock.c
arch/arm/plat-s3c24xx/pwm.c