summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2011-01-16 21:22:41 -0800
committerRoland Dreier <rolandd@cisco.com>2011-01-16 21:22:41 -0800
commit4790f4dc5f4326dab5d81ed8fb8c9473e620bdbb (patch)
tree72d5bbcdc8aa72c4e48a81ce33be5ed797093224 /drivers
parentf06267104dd9112f11586830d22501d0e26245ea (diff)
parentda995a8aee044bc5d0847e19e351cd48a2cb8bcc (diff)
parenteb4a7cbf27082bea34764bab3bc85595683f967b (diff)
parent843276ad985cb59212ceb70d989474521ff516f6 (diff)
parent695b83495e2fba9d3a883193cfc9d5eefa96a911 (diff)
Merge branches 'misc', 'mlx4', 'mthca', 'nes' and 'srp' into for-next