Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iboe', 'ipoib', 'misc', 'mlx4', 'nes', 'qib' and 'srp' into for-next - linux

diff options

author	Roland Dreier <rolandd@cisco.com>	2010-10-27 01:09:11 +0200
committer	Roland Dreier <rolandd@cisco.com>	2010-10-27 01:09:11 +0200
commit	116e9535fe5e00bafab7a637f306b110cf95cff5 (patch)
tree	59ab246aae5c0fc871434a50ad1eb42fce0af0b4 /drivers/infiniband/hw/amso1100
parent	RDMA/amso1100: Remove KERN_<level> from pr_<level> use (diff)
parent	RDMA/ucma: Allow tuning the max listen backlog (diff)
parent	RDMA/cxgb3: Remove unnecessary KERN_<level> use (diff)
parent	RDMA/cxgb4: Remove unnecessary KERN_<level> use (diff)
parent	IB/ehca: Fix driver on relocatable kernel (diff)
parent	IB/core: Add link layer type information to sysfs (diff)
parent	IPoIB: Set dev_id field of net_device (diff)
parent	IB: Replace EXTRA_CFLAGS with ccflags-y (diff)
parent	IB/mlx4: Signal node desc changes to SM by using FW to generate trap 144 (diff)
parent	RDMA/nes: Turn carrier off on ifdown (diff)
parent	IB/qib: clean up properly if pci_set_consistent_dma_mask() fails (diff)
parent	IB/srp: Sync buffer before posting send (diff)
download	linux-116e9535fe5e00bafab7a637f306b110cf95cff5.tar.xz linux-116e9535fe5e00bafab7a637f306b110cf95cff5.zip

Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iboe', 'ipoib', 'misc', 'mlx4', 'nes', 'qib' and 'srp' into for-next