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
..
bindings	Merge branch 'samsung/dt' into next/dt	2012-01-07 20:40:51 +00:00
00-INDEX
booting-without-of.txt	dt: add documentation of ARM dt boot interface	2011-05-23 09:30:20 -06:00