diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 14:07:19 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 14:07:19 +0100 |
| commit | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (patch) | |
| tree | 15ab3c23d05e98829741b03922b51b81fd102b64 /arch/arm/mach-pxa | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable (diff) | |
| parent | ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3 (diff) | |
| download | linux-dev-2192482ee5ce5d5d4a6cec0c351b2d3a744606eb.tar.xz linux-dev-2192482ee5ce5d5d4a6cec0c351b2d3a744606eb.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-pxa')
0 files changed, 0 insertions, 0 deletions