diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-04 23:01:28 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-04 23:01:28 +0100 |
| commit | 43a60c1792b13eed49220af0e1344bf48e3a0677 (patch) | |
| tree | cdacc16876e95df8a4ee7a554d267407ec0cb808 /arch/arm/include/asm/unistd.h | |
| parent | 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff) | |
| parent | 9fc31ddc70ac594b5a1d8a83303b65008221088c (diff) | |
Merge branch 'cleanup' into for-linus
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Diffstat (limited to 'arch/arm/include/asm/unistd.h')
0 files changed, 0 insertions, 0 deletions