summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2012-11-26 11:08:41 -0800
committerRoland Dreier <roland@purestorage.com>2012-11-26 11:08:41 -0800
commitd0951d2133f260e216dbaa8dadcc73d3d5237809 (patch)
tree61ba33774509bc038610d7a63acb049c898971d6 /drivers/infiniband
parent76f267b7ad978fec755f74ada4020edcb7493657 (diff)
parent5107c2a3d117de8219a53e622c0f1f1bc3f7d1ae (diff)
parent08ff32352d6ff7083533dc1c25618d42f92ec28e (diff)
parent079abea6a37fd3b4f7e1b7cf9e4d055463988753 (diff)
parent7235aa79f683db0d908dcb0c2b7062dfdd765196 (diff)
downloadlinux-d0951d2133f260e216dbaa8dadcc73d3d5237809.tar.bz2
Merge branches 'cxgb4', 'misc', 'mlx4', 'nes' and 'uapi' into for-next