summaryrefslogtreecommitdiffstats
path: root/include/uapi/asm-generic
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-26 16:58:25 +0000
committerMark Brown <broonie@linaro.org>2014-03-26 16:58:25 +0000
commit5481b348e80fb280ff9eaa17ad99a5b592c7e145 (patch)
tree6426bf355f56f51e27b91ca99ac54c51d9403cc8 /include/uapi/asm-generic
parent24ee65e4a50fcefa2a7197f45a330ee96ec84a4b (diff)
parent948838a10ad24afea3229957b6f02f8587a569e0 (diff)
parent516add1d9d504c5345c7ffb32f99d9343609fddf (diff)
parentd6fe2c7251e47d2aa4006e73da4f518f4f6f9e74 (diff)
parent3bf0e9e0ba27f8acb8f1c5597adde7223f3d6e38 (diff)
parent350ff52d409da8e081bcd79dd64d2093be896134 (diff)
parentfae3b83645ec37b4f274b0bb9c602152ae10ece5 (diff)
parent0b61ad1a7e5a62b771e20401bebfaa062502039c (diff)
parent4deaf85a39bf07577ac69f75309b010686129d33 (diff)
Merge remote-tracking branches 'regulator/topic/tps65218', 'regulator/topic/tps6524x', 'regulator/topic/tps6586x', 'regulator/topic/tps65910', 'regulator/topic/tps80031', 'regulator/topic/wm831x', 'regulator/topic/wm8350' and 'regulator/topic/wm8994' into regulator-next