Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux

author Russell King <rmk@dyn-67.arm.linux.org.uk>

Fri, 17 Oct 2008 13:29:03 +0000 (14:29 +0100)

committer Russell King <rmk+kernel@arm.linux.org.uk>

Fri, 17 Oct 2008 13:29:03 +0000 (14:29 +0100)
author Russell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 17 Oct 2008 13:29:03 +0000 (14:29 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Fri, 17 Oct 2008 13:29:03 +0000 (14:29 +0100)
diff --cc arch/arm/mach-s3c2443/clock.c
Simple merge
diff --cc arch/arm/plat-s3c24xx/pwm-clock.c
Simple merge
diff --cc arch/arm/plat-s3c24xx/pwm.c
Simple merge
author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Fri, 17 Oct 2008 13:29:03 +0000 (14:29 +0100)
committer	Russell 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	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-s3c24xx/pwm-clock.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-s3c24xx/pwm.c	patch \|	diff1 \|	diff2 \|	blob \| history