projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 144d80b 2e680dd)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Oct 2012 23:58:20 +0000 (16:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Oct 2012 23:58:20 +0000 (16:58 -0700)
commit206aa6a6c57a24d927e89071fbbf690208052caf
treed465b470f3bfc51401c7ec480553b5a61e2197e2tree | snapshot
parent144d80bed91a6557269c935bf03e0f56089e5be0commit | diff
parent2e680dd61e80592385338bfbeb86833d1c60546ccommit | diff
Merge branch 'for-linus' of git://git./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
John Crispins staging tree