]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'amso1100', 'cma', 'cxgb4', 'fdr', 'ipath', 'misc', 'mlx4', 'mthca...
authorRoland Dreier <roland@purestorage.com>
Tue, 11 Oct 2011 19:56:31 +0000 (12:56 -0700)
committerRoland Dreier <roland@purestorage.com>
Tue, 11 Oct 2011 19:56:31 +0000 (12:56 -0700)
commit270e432b713e704e378e44ef9d77261dc2a9ef39
tree2d1168bd7e04410d9549ed1c563f634587f7ebdf
parent2be6053318aa4f2787b7bc5cf5160017d7d1586b
parent65ec048dd841f8f7f1442ba0d5d8f29e5565b217
parent9efe10a1e1a1ab1dba0af0f520e0697f6e81ebf1
parente36fb88a9a0fb8ac4b87c8ac709214a408de6d97
parent3e60a77ea218d1915bdc9127f88ab866fd2ac643
parentcaf6e3f221ddc12ccabd1cd0ba149561db0090d4
parenta8312755db7ac800c83ec036058c3109892e0949
parentee47f2e395a0a143b39028a3b5e386eb64897c18
parent0f0bee8bbc2b3e49baa703118041f99db9ef41a1
Merge branches 'amso1100', 'cma', 'cxgb4', 'fdr', 'ipath', 'misc', 'mlx4', 'mthca' and 'nes' into for-next
drivers/infiniband/core/cma.c
drivers/infiniband/hw/nes/nes_cm.c
drivers/infiniband/hw/nes/nes_cm.h
drivers/infiniband/hw/nes/nes_verbs.h