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
..
bindings	Merge branch 'tegra/soc' into next/boards	2012-01-06 23:09:14 +00:00
00-INDEX	Documentation: add devicetree docs index file	2011-03-16 10:47:03 -07:00
booting-without-of.txt	dt: add documentation of ARM dt boot interface	2011-05-23 09:30:20 -06:00