diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-16 16:45:16 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-16 16:45:16 -0400 |
| commit | 4722cd7741c6404f967f7a7b8b666540b6c1663e (patch) | |
| tree | 877b7d8efe1e4e4ce48416186b4f45da3a5fccac /arch/arm/mach-cns3xxx | |
| parent | 1db3706b05b11abcf2673ffbed5ad43b4c90ed11 (diff) | |
| parent | 4fb0d2ea397ab207fdecbd88ad0e37b36ce68a62 (diff) | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
Conflicts:
arch/arm/mach-imx/mach-cpuimx27.c
Diffstat (limited to 'arch/arm/mach-cns3xxx')
0 files changed, 0 insertions, 0 deletions