diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-05 00:01:28 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-05 00:01:28 +0200 |
| commit | 43a60c1792b13eed49220af0e1344bf48e3a0677 (patch) | |
| tree | cdacc16876e95df8a4ee7a554d267407ec0cb808 /arch/arm/kernel/traps.c | |
| parent | Linux 3.6-rc1 (diff) | |
| parent | ARM: Don't unconditionally bloat thread_info (diff) | |
| download | linux-43a60c1792b13eed49220af0e1344bf48e3a0677.tar.xz linux-43a60c1792b13eed49220af0e1344bf48e3a0677.zip | |
Merge branch 'cleanup' into for-linus
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Diffstat (limited to 'arch/arm/kernel/traps.c')
0 files changed, 0 insertions, 0 deletions