summaryrefslogtreecommitdiffstats
path: root/security/apparmor/.gitignore
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-25 09:34:10 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-25 09:34:10 +0200
commitcd85b557414fe4cd44ea6608825e96612a5fe2b2 (patch)
tree8299d2bd75d4516b1c86aea06b296bdd3fcd2044 /security/apparmor/.gitignore
parentMerge branches 'stable/drivers-3.2', 'stable/drivers.bugfixes-3.2' and 'stabl... (diff)
parentm68k: Finally remove leftover markers sections (diff)
downloadlinux-cd85b557414fe4cd44ea6608825e96612a5fe2b2.tar.xz
linux-cd85b557414fe4cd44ea6608825e96612a5fe2b2.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Finally remove leftover markers sections m68k/mac: Fix mac_irq_pending() for PSC MACE and SCC m68k/mac: Fix compiler warning in via_read_time() zorro: Fix four checkpatch warnings
Diffstat (limited to 'security/apparmor/.gitignore')
0 files changed, 0 insertions, 0 deletions