Arnd Bergmann e067096c8d Merge branch 'tegra/soc' into next/boards ... Conflicts: arch/arm/mach-tegra/board-harmony-pcie.c To fix an internal merge conflict between the tegra/soc and tegra/boards branches. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-06 23:09:14 +00:00
..
bootp	ARM: 6499/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in bootp/init.S	2010-11-30 13:44:24 +00:00
compressed	ARM: LPAE: add ISBs around MMU enabling code	2011-12-08 10:30:38 +00:00
dts	Merge branch 'tegra/soc' into next/boards	2012-01-06 23:09:14 +00:00
.gitignore	[ARM] 4449/1: more entries in arch/arm/boot/.gitignore	2007-06-25 20:37:35 +01:00
install.sh	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
Makefile	ARM: 7152/1: distclean: Remove generated .dtb files	2011-11-08 18:25:04 +00:00