Merge branch 'next/drivers' into for-next

author Arnd Bergmann <arnd@arndb.de>

Fri, 23 May 2014 22:58:52 +0000 (00:58 +0200)

committer Arnd Bergmann <arnd@arndb.de>

Fri, 23 May 2014 22:58:52 +0000 (00:58 +0200)
author Arnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 22:58:52 +0000 (00:58 +0200)
committer Arnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 22:58:52 +0000 (00:58 +0200)
diff --cc drivers/Makefile
Simple merge
diff --cc drivers/bus/Kconfig
Simple merge
diff --cc drivers/bus/Makefile
Simple merge
diff --cc drivers/power/reset/Kconfig
Simple merge
diff --cc drivers/power/reset/Makefile
Simple merge
author	Arnd Bergmann <arnd@arndb.de>
	Fri, 23 May 2014 22:58:52 +0000 (00:58 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Fri, 23 May 2014 22:58:52 +0000 (00:58 +0200)
		1	2
drivers/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/bus/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/bus/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/power/reset/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/power/reset/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history