aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2012-10-02 07:43:59 -0700
committerRoland Dreier <roland@purestorage.com>2012-10-02 07:43:59 -0700
commitd172f5a4ab151a952a0d898ba3b0ff6a020171a6 (patch)
tree9579f3af31f7d76276108bd60ec9c35b2bd18a25 /drivers
parent2a22fb8c69275903b8be4c6203aa08bfac374844 (diff)
parentc079c28714e4d1a0b7cad120f84217e0fcde09a6 (diff)
parentbea1e22df494a729978e7f2c54f7bda328f74bc3 (diff)
parenta084feebd24764fab9657a586ea65484ddbd79cf (diff)
parentaadf4f3f66a7b710b05b31ac0839fbbf59e41f7c (diff)
parentbca1935ccdecf2354a55d9edab4c022a995ee490 (diff)
parentc00aaa1a0221a22153071fcb2f320e2ebaecc2fd (diff)
parentd8536670916a685df116b5c2cb256573fd25e4e3 (diff)
downloadlinux-linaro-stable-d172f5a4ab151a952a0d898ba3b0ff6a020171a6.tar.gz
Merge branches 'cma', 'cxgb4', 'ipoib', 'mlx4', 'mlx4-sriov', 'nes', 'qib' and 'srp' into for-linus