]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'net/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 23:12:48 +0000 (10:12 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 23:12:48 +0000 (10:12 +1100)
1  2 
drivers/infiniband/core/cma.c

Simple merge