Merge remote-tracking branch 's390/features'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 7 Feb 2019 22:26:42 +0000 (09:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 7 Feb 2019 22:26:42 +0000 (09:26 +1100)
1  2 
arch/s390/kernel/setup.c
drivers/s390/net/qeth_core_main.c

Simple merge
Simple merge