projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cbb16be 4cd4fc7)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Sep 2013 18:12:20 +0000 (11:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Sep 2013 18:12:20 +0000 (11:12 -0700)
commitb822cb187d6c62d6de0a7a8cfd7bd76234cecdd6
treef25714f9060575f99c554dcbc032c84dbbd4eb4ftree | snapshot
parentcbb16bec2d5bc5423f720e6aaed152de9be234eccommit | diff
parent4cd4fc77032dca46fe7475d81461e29145db247acommit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull apparmor fixes from James Morris:
 "Bugfixes for the Apparmor code for regressions introduced in the 3.12
  pull request"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  apparmor: fix suspicious RCU usage warning in policy.c/policy.h
  apparmor: Use shash crypto API interface for profile hashes
John Crispins staging tree