Merge remote-tracking branch 'watchdog/master'

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 10 Dec 2013 01:30:25 +0000 (12:30 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 10 Dec 2013 01:30:25 +0000 (12:30 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Dec 2013 01:30:25 +0000 (12:30 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Dec 2013 01:30:25 +0000 (12:30 +1100)
diff --cc arch/arm/boot/dts/at91sam9n12.dtsi
Simple merge
diff --cc arch/arm/boot/dts/at91sam9x5.dtsi
Simple merge
diff --cc arch/arm/boot/dts/sama5d3.dtsi
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 10 Dec 2013 01:30:25 +0000 (12:30 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 10 Dec 2013 01:30:25 +0000 (12:30 +1100)
		1	2
arch/arm/boot/dts/at91sam9n12.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/at91sam9x5.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/sama5d3.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history