Merge branch 'reset' into merge-20130708
Merge branch 'dtc-fixes' into merge-20130708
Merge branch 'dtc-overlays' into merge-20130708
Merge branch 'of-fixes' into merge-20130708
Merge branch 'pdev-fixes' into merge-20130708
Merge branch 'mmc-fixes' into merge-20130708
Merge branch 'dts-fixes' into merge-20130708
Merge branch 'capes' into merge-20130708
Merge branch 'i2c-fixes' into merge-20130708
Merge branch 'pinctrl-fixes' into merge-20130708
Merge branch 'general-fixes' into merge-20130708
Merge branch 'capemgr' into merge-20130708

Conflicts:
	drivers/misc/Makefile
Merge branch 'tscadc' into merge-20130708

Conflicts:
	arch/arm/boot/dts/am335x-evm.dts