]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 's390/features'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Dec 2012 22:42:22 +0000 (09:42 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Dec 2012 22:42:22 +0000 (09:42 +1100)
1  2 
include/asm-generic/io.h

Simple merge