git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Arnd Bergmann <arnd@arndb.de>
	Mon, 31 Oct 2011 13:24:28 +0000 (14:24 +0100)
committer	Arnd Bergmann <arnd@arndb.de>
	Mon, 31 Oct 2011 13:24:28 +0000 (14:24 +0100)
commit	f221a5fa7a079e7705acc285cfc5683e8c91d182
tree	c09aa76b07a9bcb0ab0dea4885909421f7a9f4a6	tree \| snapshot
parent	0ee9b894a337c198eef06414cfb22f996b7460f1	commit \| diff
parent	5d5ba6272593acd26e81766380d69b1784eb777f	commit \| diff

Merge branch 'imx/devel' into imx/imx6q

Conflicts:
arch/arm/plat-mxc/include/mach/memory.h

34 files changed:

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-armadillo5x0.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx27.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-eukrea_cpuimx25.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx27_visstrim_m10.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx27ipcam.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx27lite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-kzm_arm11_01.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx1ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx21ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx25_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31lilly.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31lite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31moboard.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx35_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mxt_td60.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pca100.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pcm037.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pcm038.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pcm043.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-qong.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-scb9328.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-cpuimx51.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-cpuimx51sd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_babbage.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_efikamx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_efikasb.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-armadillo5x0.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx27.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-eukrea_cpuimx25.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx27_visstrim_m10.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx27ipcam.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx27lite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-kzm_arm11_01.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx1ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx21ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx25_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31lilly.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31lite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31moboard.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx35_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mxt_td60.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pca100.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pcm037.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pcm038.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pcm043.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-qong.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-scb9328.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-cpuimx51.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-cpuimx51sd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_babbage.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_efikamx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_efikasb.c	diff1 \|	diff2 \|	blob \| history