]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'target-updates/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 01:42:57 +0000 (11:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 01:42:57 +0000 (11:42 +1000)
1  2 
drivers/infiniband/ulp/srpt/ib_srpt.c

Simple merge