Merge tag 'lsk-android-14.04' into develop-3.10

lsk-android 14.04

Conflicts:
	Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
	drivers/pinctrl/pinconf-generic.c
	include/linux/pinctrl/consumer.h
	include/linux/pinctrl/pinconf-generic.h

diff --cc Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/kernel/Makefile
Simple merge

diff --cc arch/arm/mm/proc-v7.S
Simple merge

diff --cc drivers/ata/libata-core.c
Simple merge

diff --cc drivers/cpufreq/cpufreq_interactive.c
Simple merge

diff --cc drivers/pinctrl/Makefile
Simple merge

diff --cc drivers/regulator/core.c
Simple merge

diff --cc include/linux/pinctrl/consumer.h
Simple merge

diff --cc include/linux/pinctrl/pinconf-generic.h
Simple merge