From: 黄涛 <huangtao@rock-chips.com>
Date: Thu, 24 Apr 2014 11:04:10 +0000 (+0800)
Subject: Merge tag 'lsk-android-14.04' into develop-3.10
X-Git-Tag: firefly_0821_release~5436
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7fe47454f2f8c73cd78c99ecef23e9d0ceca16dc;p=firefly-linux-kernel-4.4.55.git

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
---

7fe47454f2f8c73cd78c99ecef23e9d0ceca16dc