]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'scsi/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 29 Jul 2011 03:29:59 +0000 (13:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 29 Jul 2011 03:29:59 +0000 (13:29 +1000)
1  2 
drivers/scsi/hpsa.c

Simple merge