diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-06 14:59:36 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-06 14:59:36 +0100 |
| commit | 3ec20e2e618314a798c81a974455b0a47e2af435 (patch) | |
| tree | c36ee1a6ed3a8c28911f6ae95f7cf060c2087189 /net/ipv6/ip6_fib.c | |
| parent | 3c68319b28474055481824032e6730c28404116f (diff) | |
| parent | daad0bf1491e5321c76a6ba4ccf50a4991494aa8 (diff) | |
| download | linux-3ec20e2e618314a798c81a974455b0a47e2af435.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Three bug fixes and an update to the default configuration"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/defconfig: set SCSI_DH=y
s390/vtime: correct scaled cputime of partially idle CPUs
s390/boot/decompression: disable floating point in decompressor
s390/numa: use correct type for node_to_cpumask_map
Diffstat (limited to 'net/ipv6/ip6_fib.c')
0 files changed, 0 insertions, 0 deletions