summaryrefslogtreecommitdiffstats
path: root/net/xfrm/xfrm_policy.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-26 17:58:18 +0100
committerMark Brown <broonie@linaro.org>2014-03-26 17:58:18 +0100
commit24ee65e4a50fcefa2a7197f45a330ee96ec84a4b (patch)
tree55ad5af207e743aad7c957a27019360920a3f894 /net/xfrm/xfrm_policy.c
parentMerge remote-tracking branches 'regulator/topic/max8973', 'regulator/topic/ma... (diff)
parentregulator: s5m8767: Convert to use regulator_[enable|disable|is_enabled]_regmap (diff)
parentregulator: st-pwm: Convert to get_voltage_sel (diff)
parentregulator: ti-abb: Remove redundant error message (diff)
parentregulator: tps51632: Remove redundant error message (diff)
parentregulator: tps62360: Remove redundant error message (diff)
parentregulator: tps6507x: Remove redundant error message (diff)
parentregulator: tps65090: Remove redundant error message (diff)
parentregulator: tps65217: Allow missing init_data for diagnostics (diff)
downloadlinux-24ee65e4a50fcefa2a7197f45a330ee96ec84a4b.tar.xz
linux-24ee65e4a50fcefa2a7197f45a330ee96ec84a4b.zip
Merge remote-tracking branches 'regulator/topic/s5m8767', 'regulator/topic/st-pwm', 'regulator/topic/ti-abb', 'regulator/topic/tps51632', 'regulator/topic/tps62360', 'regulator/topic/tps6507x', 'regulator/topic/tps65090' and 'regulator/topic/tps65217' into regulator-next