]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'cleanup' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 17 Sep 2012 22:21:04 +0000 (23:21 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 17 Sep 2012 22:21:04 +0000 (23:21 +0100)
commit1d382cef48a71ec0ed8500aa2b8e7fc451cc1bf5
treecdacc16876e95df8a4ee7a554d267407ec0cb808
parent0d7614f09c1ebdbaa1599a5aba7593f147bf96ee
parent9fc31ddc70ac594b5a1d8a83303b65008221088c
Merge branch 'cleanup' into for-next

Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
arch/arm/include/asm/thread_info.h
arch/arm/mach-imx/mach-imx27_visstrim_m10.c