summaryrefslogtreecommitdiff
path: root/drivers/infiniband/hw
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2014-01-03 22:55:04 +0800
committerZhang Rui <rui.zhang@intel.com>2014-01-03 22:55:04 +0800
commit8c59ecb5c1dca77ea83634b6a6d8e7c58bb31b22 (patch)
treec0e3e6435d74ead993a2a9a98bb3dcb04bc0fab1 /drivers/infiniband/hw
parent201531c2777e05c8f859c10fa35542da02e5870b (diff)
parent800744bf31df54b0cd4d1104ccfa426d3f578f0e (diff)
parent329fe7b14d6cef4b8cf8c866ff41057a70224de2 (diff)
Merge branches 'misc' and 'soc' of .git into next