]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'm68k/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 29 Jul 2011 02:03:28 +0000 (12:03 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 29 Jul 2011 02:03:28 +0000 (12:03 +1000)
1  2 
arch/sparc/kernel/ioport.c
include/linux/ioport.h

Simple merge
Simple merge