]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
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)
1  2 
arch/arm/mach-s3c2443/clock.c
arch/arm/plat-s3c24xx/pwm-clock.c
arch/arm/plat-s3c24xx/pwm.c

Simple merge
Simple merge
Simple merge