Merge branch 'for-next' from git://sources.calxeda.com/kernel/linux.git

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

diff --cc Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
Simple merge

diff --cc drivers/of/base.c
Simple merge

diff --cc include/linux/of.h
Simple merge