]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 's390/features'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 01:01:47 +0000 (11:01 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 01:01:47 +0000 (11:01 +1000)
1  2 
drivers/s390/net/qeth_core_main.c

Simple merge