summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-01 18:22:55 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-01 18:22:55 -0800
commit6bba07c613e6663e5b8977eafec3cd3e63241e1c (patch)
treea650baf4e935976b10911306ffbe6b53d66f88c7 /include
parentd7e53922aa47b7a5a91bc34da00348e6ee0ed242 (diff)
parent892365ab4d29ed861709ee8611b53587ca2bb75f (diff)
downloadlinux-6bba07c613e6663e5b8977eafec3cd3e63241e1c.tar.gz
linux-6bba07c613e6663e5b8977eafec3cd3e63241e1c.tar.bz2
linux-6bba07c613e6663e5b8977eafec3cd3e63241e1c.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: [S390] memory hotplug: prevent memory zone interleave [S390] crash_dump: remove duplicate include [S390] KEYS: Enable the compat keyctl wrapper on s390x
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions