]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branches 'misc', 'mlx4', 'mthca', 'nes' and 'srp' into for-next
authorRoland Dreier <rolandd@cisco.com>
Mon, 17 Jan 2011 05:22:41 +0000 (21:22 -0800)
committerRoland Dreier <rolandd@cisco.com>
Mon, 17 Jan 2011 05:22:41 +0000 (21:22 -0800)
commit4790f4dc5f4326dab5d81ed8fb8c9473e620bdbb
tree72d5bbcdc8aa72c4e48a81ce33be5ed797093224
parentf06267104dd9112f11586830d22501d0e26245ea
parentda995a8aee044bc5d0847e19e351cd48a2cb8bcc
parenteb4a7cbf27082bea34764bab3bc85595683f967b
parent843276ad985cb59212ceb70d989474521ff516f6
parent695b83495e2fba9d3a883193cfc9d5eefa96a911
Merge branches 'misc', 'mlx4', 'mthca', 'nes' and 'srp' into for-next
drivers/infiniband/ulp/srp/ib_srp.c