]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 02:28:35 +0000 (12:28 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 02:28:39 +0000 (12:28 +1000)
commit12b55fdddbe47a104b5c1b335aa6f5c6c7bcb69a
tree75f7dcd7e225230d9552f8be0b3b685a12f8e18a
parent96bd6896ae14989dbd729b68db204b5301dfb990
parent8ac270d1e29f0428228ab2b9a8ae5e1ed4a5cd84
Merge remote-tracking branch 'security/next'

Conflicts:
include/linux/filter.h
MAINTAINERS
include/linux/filter.h
include/linux/seccomp.h
net/compat.c
net/core/filter.c