]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15ab1b8 5788f4d)
Merge remote-tracking branch 'i.MX/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Dec 2011 23:28:18 +0000 (10:28 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Dec 2011 23:28:18 +0000 (10:28 +1100)
Conflicts:
arch/arm/mach-imx/clock-mx51-mx53.c
arch/arm/mach-imx/devices-imx53.h
arch/arm/mach-imx/mm-imx5.c
arch/arm/mach-mx5/Kconfig
arch/arm/mach-mx5/Makefile
arch/arm/mach-mx5/pm-imx5.c
arch/arm/plat-mxc/include/mach/hardware.h

1  2 
arch/arm/mach-mxs/clock-mx28.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-mxs/clock-mx28.c
Simple merge
Linux kernel for KaRo TX COM modules