Merge remote-tracking branch 'devicetree/devicetree/next'

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

Thu, 13 Oct 2011 03:40:39 +0000 (14:40 +1100)

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

Thu, 13 Oct 2011 03:40:39 +0000 (14:40 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 03:40:39 +0000 (14:40 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 03:40:39 +0000 (14:40 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/of/fdt.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 13 Oct 2011 03:40:39 +0000 (14:40 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 13 Oct 2011 03:40:39 +0000 (14:40 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/of/fdt.c	patch \|	diff1 \|	diff2 \|	blob \| history