Merge branch 'dt-bus-name' into for-next

author Rob Herring <[email protected]>

Tue, 13 May 2014 23:34:35 +0000 (18:34 -0500)

committer Rob Herring <[email protected]>

Tue, 13 May 2014 23:34:35 +0000 (18:34 -0500)
author Rob Herring <[email protected]>
Tue, 13 May 2014 23:34:35 +0000 (18:34 -0500)
committer Rob Herring <[email protected]>
Tue, 13 May 2014 23:34:35 +0000 (18:34 -0500)
diff --cc arch/powerpc/platforms/powernv/opal.c
Simple merge
diff --cc arch/xtensa/kernel/setup.c
Simple merge
author	Rob Herring <[email protected]>
	Tue, 13 May 2014 23:34:35 +0000 (18:34 -0500)
committer	Rob Herring <[email protected]>
	Tue, 13 May 2014 23:34:35 +0000 (18:34 -0500)
		1	2
arch/powerpc/platforms/powernv/opal.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/xtensa/kernel/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history