summaryrefslogtreecommitdiffstats
path: root/include/linux/platform_data
diff options
context:
space:
mode:
authorMark Brown2014-09-28 13:17:00 +0200
committerMark Brown2014-09-28 13:17:00 +0200
commitfdaff15ae6cc8745b9b56adab0252729b476ed7e (patch)
tree182eb140d5c71501159fb0d46ffc8b74c766dc13 /include/linux/platform_data
parentMerge remote-tracking branch 'regulator/topic/pwm' into regulator-drivers (diff)
parentregulator: sky81452: Adding Skyworks SKY81452 regulator driver (diff)
downloadkernel-qcow2-linux-fdaff15ae6cc8745b9b56adab0252729b476ed7e.tar.gz
kernel-qcow2-linux-fdaff15ae6cc8745b9b56adab0252729b476ed7e.tar.xz
kernel-qcow2-linux-fdaff15ae6cc8745b9b56adab0252729b476ed7e.zip
Merge remote-tracking branch 'regulator/topic/sky81452' into regulator-drivers
Conflicts: drivers/regulator/Kconfig drivers/regulator/Makefile
Diffstat (limited to 'include/linux/platform_data')
0 files changed, 0 insertions, 0 deletions