summaryrefslogtreecommitdiffstats
path: root/security/apparmor
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2019-05-14 09:09:23 +0200
committerLee Jones <lee.jones@linaro.org>2019-05-14 09:09:23 +0200
commit60a7a9a2493a10b408c00eb323fc479a3a292c17 (patch)
treefdcd458c63e432e24607622832399a930c18dd49 /security/apparmor
parentleds: lm3532: Introduce the lm3532 LED driver (diff)
parentarm64: dts: stratix10: New System Manager compatible (diff)
parentMAINTAINERS: Add an entry for MAX77650 PMIC driver (diff)
parentpinctrl: stmfx: Fix 'warn: bitwise AND condition is false here' (diff)
parentmfd: max77620: Provide system power-off functionality (diff)
downloadlinux-60a7a9a2493a10b408c00eb323fc479a3a292c17.tar.xz
linux-60a7a9a2493a10b408c00eb323fc479a3a292c17.zip
Merge branches 'ib-mfd-arm-leds-5.2', 'ib-mfd-gpio-input-leds-power-5.2', 'ib-mfd-pinctrl-5.2-2' and 'ib-mfd-regulator-5.2', tag 'ib-mfd-arm-net-5.2' into ibs-for-mfd-merged
Immutable branch between MFD, ARM and Net due for the 5.2 merge window