| commit | 4b767155ffad4be0aaafeead585ad21375dc7475 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 18 08:26:15 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 18 08:26:15 2013 -0700 |
| tree | e1985f52fd4807cb9d85b975fbd42ea0795ccf13 | |
| parent | 991657a39dff76c81e7dbcd0b1f8e56a0ff36aa7 [diff] | |
| parent | 4502403dcf8f5c76abd4dbab8726c8e4ecb5cd34 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security Pull selinux bugfix from James Morris. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: selinux: use GFP_ATOMIC under spin_lock