Merge tag 'lsk-android-14.04' into develop-3.10
author黄涛 <huangtao@rock-chips.com>
Thu, 24 Apr 2014 11:04:10 +0000 (19:04 +0800)
committer黄涛 <huangtao@rock-chips.com>
Thu, 24 Apr 2014 11:04:10 +0000 (19:04 +0800)
commit7fe47454f2f8c73cd78c99ecef23e9d0ceca16dc
treef94a9b62245b655dbf68eecfcc7074b7ff9b3c96
parent840cd4829864699a92dd45c707c8c1c8ba2e7748
parent1fe07cd0c79781de1d565a15038e87480adc944a
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
12 files changed:
Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
Makefile
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/kernel/Makefile
arch/arm/mm/proc-v7.S
drivers/ata/libata-core.c
drivers/cpufreq/cpufreq_interactive.c
drivers/pinctrl/Makefile
drivers/regulator/core.c
include/linux/pinctrl/consumer.h
include/linux/pinctrl/pinconf-generic.h