Arnd Bergmann b001befe58 Merge branch 'samsung/dt' into next/dt ... * samsung/dt: (3 commit) Merge branch 'depends/rmk/for-linus' into samsung/dt Merge branch 'depends/rmk/restart' into next/cleanup Merge branch 'next/cleanup' into samsung/dt Conflicts: arch/arm/mach-tegra/board-dt.c arch/arm/mach-tegra/include/mach/entry-macro.S The latest version of the samsung/dt branch resolves all sorts of conflicts with the latest upstream, no functional changes that are not already there. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-07 20:40:51 +00:00
..
bootp
compressed	Merge branch 'devel-stable' into for-linus	2012-01-05 13:24:33 +00:00
dts	Merge branch 'samsung/dt' into next/dt	2011-12-27 23:21:28 +00:00
.gitignore
install.sh
Makefile	ARM: 7152/1: distclean: Remove generated .dtb files	2011-11-08 18:25:04 +00:00