projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d56557a e950598)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Sep 2010 02:13:06 +0000 (19:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Sep 2010 02:13:06 +0000 (19:13 -0700)
commite6f901bb85bc0707aaafb3c123c3013c0feaba7d
tree8b039ab90baa6f96e7eed664afb7c8b166baff84tree | snapshot
parentd56557af19867edb8c0e96f8e26399698a08857fcommit | diff
parente950598d43dce8d97e7d5270808393425d1e5cbdcommit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  ima: always maintain counters
  AppArmor: Fix locking from removal of profile namespace
  AppArmor: Fix splitting an fqname into separate namespace and profile names
  AppArmor: Fix security_task_setrlimit logic for 2.6.36 changes
  AppArmor: Drop hack to remove appended " (deleted)" string
John Crispins staging tree