tree d465b470f3bfc51401c7ec480553b5a61e2197e2
parent 144d80bed91a6557269c935bf03e0f56089e5be0
parent 2e680dd61e80592385338bfbeb86833d1c60546c
author Linus Torvalds <torvalds@linux-foundation.org> 1351123100 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1351123100 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull apparmor bugfix from James Morris.

Fix a possibly unbounded recursion by iterating over the entries instead.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  apparmor: fix IRQ stack overflow during free_profile