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

Conflicts:
	drivers/misc/Makefile