Arnd Bergmann f907ab06bb Merge branch 'next/fixes-non-critical' into next/drivers ... Conflicts: arch/arm/mach-lpc32xx/clock.c arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c The conflicts with pxa are non-obvious, we have multiple branches adding and removing the same clock settings. According to Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct fix here. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-03-20 22:42:24 +00:00
..
bindings	Merge branch 'next/fixes-non-critical' into next/drivers	2012-03-20 22:42:24 +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