]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 04:13:33 +0000 (14:13 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 04:13:33 +0000 (14:13 +1000)
commit87e3037fbda3d65e6516affa5616da178c3b9d36
treef1089dbde2a6372cad78e410f7533ac51afb7cfd
parentdb8af0cf996015c15feef4f4457d7a75701046c7
parent9b97b6cdd420cd62dae972eafaae7494a7670607
Merge remote-tracking branch 'security/next'

Conflicts:
Documentation/kernel-parameters.txt
Documentation/kernel-parameters.txt
MAINTAINERS
include/linux/security.h
mm/shmem.c
security/smack/smack_lsm.c