diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-14 07:58:59 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-14 07:58:59 +0300 |
| commit | ddf343f635fe4440cad528e12f96f28bd50aa099 (patch) | |
| tree | e578f449d0c338c2db934341632e1b85f223ceb6 /net/8021q | |
| parent | 930a93a5ef69ee06057e3ccd8c90b23e98ad3c11 (diff) | |
| parent | e85871218513c54f7dfdb6009043cb638f2fecbe (diff) | |
| download | op-kernel-dev-ddf343f635fe4440cad528e12f96f28bd50aa099.zip op-kernel-dev-ddf343f635fe4440cad528e12f96f28bd50aa099.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 patches from Martin Schwidefsky:
"Included are bug fixes and a patch to enable system call filtering
with BPF."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/compat: fix mmap compat system calls
s390/compat: fix compat wrappers for process_vm system calls
s390: do not clobber personality flags in sys_32_personality()
s390/seccomp: add support for system call filtering using BPF
s390/sclp_sdias: Add missing break and "fall through"
s390/mm: remove MAX_PHYSADDR_BITS define
Diffstat (limited to 'net/8021q')
0 files changed, 0 insertions, 0 deletions
