Merge tag 'v3.15' into next
authorPaul Moore <pmoore@redhat.com>
Tue, 17 Jun 2014 21:30:23 +0000 (17:30 -0400)
committerPaul Moore <pmoore@redhat.com>
Tue, 17 Jun 2014 21:30:23 +0000 (17:30 -0400)
Linux 3.15

1  2 
security/selinux/hooks.c

Simple merge