leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
66a2886d86
linux/Documentation/devicetree
History
Arnd Bergmann 66a2886d86 Merge branch 'spear/dt' into spear/clock 
Conflicts:
	arch/arm/mach-spear3xx/clock.c
	arch/arm/mach-spear3xx/include/mach/generic.h
	arch/arm/mach-spear3xx/include/mach/misc_regs.h
	arch/arm/mach-spear3xx/spear320.c
	arch/arm/mach-spear6xx/clock.c
	arch/arm/mach-spear6xx/include/mach/misc_regs.h

Resolve even more merge conflicts.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14 17:31:45 +02:00
..
bindings Merge branch 'spear/dt' into spear/clock 2012-05-14 17:31:45 +02:00
00-INDEX Documentation: add devicetree docs index file 2011-03-16 10:47:03 -07:00
booting-without-of.txt Documentation: Fix multiple typo in Documentation 2012-03-07 16:08:24 +01:00
usage-model.txt dt: Linux DT usage model documentation 2012-03-29 19:13:50 -06:00