]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'cleanup' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 4 Oct 2012 22:01:28 +0000 (23:01 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 4 Oct 2012 22:01:28 +0000 (23:01 +0100)
commit43a60c1792b13eed49220af0e1344bf48e3a0677
treecdacc16876e95df8a4ee7a554d267407ec0cb808
parent0d7614f09c1ebdbaa1599a5aba7593f147bf96ee
parent9fc31ddc70ac594b5a1d8a83303b65008221088c
Merge branch 'cleanup' into for-linus

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