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

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

author	Arnd Bergmann <arnd@arndb.de>
	Wed, 21 Mar 2012 14:27:34 +0000 (14:27 +0000)
committer	Arnd Bergmann <arnd@arndb.de>
	Wed, 21 Mar 2012 14:27:34 +0000 (14:27 +0000)
commit	6e78f85cb625587497b17c74e9b6026ea8c7449a
tree	711fe5845c4c7e7eaf8c57a597d86c0f9dda5b06	tree \| snapshot
parent	69274ff20198ec03d9b3a93ef13b30e63b18d1e0	commit \| diff
parent	e1fd10a0f32b54520470ecaaf1fbc2bc9554f398	commit \| diff

Merge branch 'tegra/cleanups' into next/timer

Conflicts:
arch/arm/mach-tegra/Makefile
arch/arm/mach-vexpress/core.h

The tegra Makefile was changed in four different branches
in the same line. This merge should reduce the amount
of churn.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

12 files changed:

Linux Kernel Source Tree.

RSS Atom

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-nomadik/board-nhk8815.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/pm24xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_eb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb11mp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pbx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-vexpress/core.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-vexpress/ct-ca9x4.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-vexpress/include/mach/ct-ca9x4.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-vexpress/v2m.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/mmci.c	diff1 \|	diff2 \|	blob \| history