diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 14:20:02 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 14:20:02 +0100 |
| commit | ceb0885d3b01bb2e2f18765770e212914f2864be (patch) | |
| tree | 0952c90cd49704a9172e985ca491d79b60c40bc8 /arch/arm/mach-msm/Makefile | |
| parent | Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl', 'spear' and 'versatile' into devel (diff) | |
| parent | ARM: 6246/1: mmci: support larger MMCIDATALENGTH register (diff) | |
| download | linux-dev-ceb0885d3b01bb2e2f18765770e212914f2864be.tar.xz linux-dev-ceb0885d3b01bb2e2f18765770e212914f2864be.zip | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/mm/init.c
Diffstat (limited to 'arch/arm/mach-msm/Makefile')
0 files changed, 0 insertions, 0 deletions