summaryrefslogtreecommitdiff
path: root/security/capability.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-08 06:16:23 +0300
committerMark Brown <broonie@kernel.org>2015-02-08 06:16:23 +0300
commit30c5c53042e835fee7880ee2cb2d630f7a19d63f (patch)
treeb1137bdd67cf268877148c5319a373d3e4f98f8e /security/capability.c
parentfca8e13f50e604436951ce59736046a79258ec20 (diff)
parent765e8023251d3366b959f2e77e5ed48c597d57a0 (diff)
parent8c7dd8bce05345ca5fe249b64782e8feeb3b9259 (diff)
parent121b567d8f4dce55c8095a842766fc1e5523be94 (diff)
downloadlinux-30c5c53042e835fee7880ee2cb2d630f7a19d63f.tar.xz
Merge remote-tracking branches 'regulator/topic/axp20x', 'regulator/topic/da9211' and 'regulator/topic/fan53555' into regulator-next