Arnd Bergmann b2f1df8d2f Merge branch 'renesas/timer' into next/timer ...

Conflicts:
	arch/arm/mach-shmobile/timer.c

This resolves a nonobvious merge conflict between renesas
timer changes in the global timer changes with those
from the renesas soc branch and last minute bug fixes that
went into v3.3.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2012-03-20 09:41:43 +00:00

..

bindings

Merge branch 'renesas/timer' into next/timer

2012-03-20 09:41:43 +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