Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux into s3c64xx
commit0ffda6cca2c66e42d0ad65719f58c637ed180b05
authorBen Dooks <ben-linux@fluff.org>
Thu, 16 Oct 2008 21:58:46 +0000 (16 22:58 +0100)
committerBen Dooks <ben-linux@fluff.org>
Thu, 16 Oct 2008 21:58:46 +0000 (16 22:58 +0100)
treedc042159ff1573f5451d2671c737311a7ac7b949
parentc472273f863c80b87e53356256c5466df24328f0
parent55b404fd78792d7a88d19f2534510ee42841146f
Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux into s3c64xx
arch/arm/mach-s3c2443/clock.c
arch/arm/plat-s3c24xx/pwm-clock.c
arch/arm/plat-s3c24xx/pwm.c