tree b26a202b2f0472e3ebe889012312b115917717f9
parent 9ae21ca362679757786f5abe556c7943e9001426
parent cbff3eb3e6e3c618583a7435f87c1548aa12b0ad
author Russell King <rmk+kernel@arm.linux.org.uk> 1288265254 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1288265254 +0100

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable

Conflicts:
	arch/arm/mach-s3c64xx/dev-audio.c