summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2013-11-17 08:22:19 -0800
committerRoland Dreier <roland@purestorage.com>2013-11-17 08:22:19 -0800
commitb4fdf52b3fc8dd3ce13ece334f5fdff869705429 (patch)
tree3cb3cf9b8fbee6a0ae79097cfd8197b90985bc02 /drivers
parent352b9056352fdfc2e70f81e3f73b9b5c85b2207b (diff)
parent649fb5ec0e5291da4f5e3b6c8eb4fc8c4efbb24f (diff)
parent69ad5da41b4ed94aef31d4111a3442cfd73ce570 (diff)
parent7f1a38671c55b5cbda77dbbda8b4651224c50cd7 (diff)
parentf3a5e3e37e221d29ce611238a22ac61cf76c6614 (diff)
parent93b80ac297b1cfdf3bea771a5ce6ea4ff5d25d1d (diff)
parentcf1c5e1f1c965cf44e680127b2e9564fc472676c (diff)
parent4127c365c9dbd4412e70b1c01f6ae1e3624cafac (diff)
parentd5e3f378337581af86a8b86a4db8fd6e164eae3c (diff)
parent2fadd83184d58701f1116ca578465b5a75f9417c (diff)
parentcd4e38542a5c2cab94e5410fb17c1cc004a60792 (diff)
Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'srp' into for-next