| commit | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Mon Aug 09 14:07:19 2010 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Mon Aug 09 14:07:19 2010 +0100 |
| tree | 15ab3c23d05e98829741b03922b51b81fd102b64 | |
| parent | 500b9fc922cbec572f4fd1436533bfaed5011262 [diff] | |
| parent | a68fefe0d2f364ac3d8497ef37dcad713c261103 [diff] |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable Conflicts: arch/arm/Kconfig