]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'scsi/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 Sep 2011 02:40:37 +0000 (12:40 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 Sep 2011 02:40:37 +0000 (12:40 +1000)
1  2 
drivers/s390/cio/qdio_main.c
drivers/scsi/fcoe/fcoe.c

Simple merge
Simple merge