Merge branches 'mainline-dma-devel', 'mainline-reset', 'mainline-dtc-fixes', 'mainline-dtc-overlays', 'mainline-of-fixes', 'mainline-pdev-fixes', 'mainline-mmc-fixes', 'mainline-dts-fixes', 'mainline-capes', 'mainline-i2c-fixes', 'mainline-pinctrl-fixes', 'mainline-fixes' and 'mainline-capemgr' into mainline-merge-20130701

Conflicts:
	drivers/misc/Makefile