Arnd Bergmann dcf7ec5ee6 Merge branch 'samsung/driver' into next/drivers ... Conflicts: arch/arm/mach-mxs/include/mach/common.h Pull in previous samsung conflict merges and do a trivial merge of an mxs double-add conflict. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-09 16:16:29 +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	Merge branch 'devel-stable' into for-linus	2012-01-05 13:24:33 +00:00
dts	Merge branch 'samsung/cleanup' into next/drivers	2011-12-28 00:18:10 +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