| commit | f9cef506815386df4bd7e463b59e0a0984ce0355 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Oct 28 12:27:34 2010 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Oct 28 12:27:34 2010 +0100 |
| tree | b26a202b2f0472e3ebe889012312b115917717f9 | |
| parent | 9ae21ca362679757786f5abe556c7943e9001426 [diff] | |
| parent | cbff3eb3e6e3c618583a7435f87c1548aa12b0ad [diff] |
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