]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2...
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 13:14:25 +0000 (15:14 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 13:14:25 +0000 (15:14 +0200)
commit5d5ba6272593acd26e81766380d69b1784eb777f
treea5dd723679582505ef3905c90f0c2c032d191b94
parentf4dbe54da5f9159064993934f9eaf2a9423f7ee1
parentecfb29273ddafade9eb2764e1ce80f7af5c8ae16
Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/devel

Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
16 files changed:
arch/arm/Kconfig
arch/arm/mach-imx/mach-cpuimx27.c
arch/arm/mach-imx/mach-cpuimx35.c
arch/arm/mach-imx/mach-eukrea_cpuimx25.c
arch/arm/mach-mx5/board-mx53_ard.c
arch/arm/mach-mx5/board-mx53_loco.c
arch/arm/mach-mx5/board-mx53_smd.c
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
arch/arm/mach-mxs/Kconfig
arch/arm/mach-mxs/Makefile
arch/arm/mach-mxs/clock-mx28.c
arch/arm/mach-mxs/include/mach/mxs.h
arch/arm/plat-mxc/devices/Kconfig
arch/arm/plat-mxc/devices/Makefile
arch/arm/plat-mxc/include/mach/devices-common.h