summaryrefslogtreecommitdiffstats
path: root/security/apparmor/procattr.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-12-29 13:49:51 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-29 13:49:51 -0800
commitd7ada73c189610614d863da7799f24c32c468809 (patch)
tree68916431bb8c6c782adbc9a579836c208dee04aa /security/apparmor/procattr.c
parent8cf126d92791381632818df862fdbc89ab6f7572 (diff)
parent9b17c16525552b247cb2d9bb8eeadc87950b36ff (diff)
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson: "Another smallish batch of fixes, it's been quiet due to the holidays. Nothing controversial here, a handful of things across the board" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: pxa: fix USB gadget driver compilation regression ARM: OMAP2+: Fix LCD panel backlight regression for LDP legacy booting ARM: OMAP2+: hwmod_data: fix missing OMAP_INTC_START in irq data ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL ARM: shmobile: r8a7790: fix shdi resource sizes ARM: shmobile: bockw: fixup DMA mask ARM: shmobile: armadillo: Add PWM backlight power supply
Diffstat (limited to 'security/apparmor/procattr.c')
0 files changed, 0 insertions, 0 deletions