]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'microblaze/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 17 Feb 2013 23:37:40 +0000 (10:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 17 Feb 2013 23:37:40 +0000 (10:37 +1100)
1  2 
include/asm-generic/io.h

Simple merge