Merge branches 'amso1100', 'bkl', 'cma', 'cxgb3', 'cxgb4', 'ipoib', 'iser', 'masked-atomics', 'misc', 'mthca' and 'nes' into for-next - linux

diff options

author	Roland Dreier <rolandd@cisco.com>	2010-05-16 05:06:01 +0200
committer	Roland Dreier <rolandd@cisco.com>	2010-05-16 05:06:01 +0200
commit	ffebedb7ab3f7964a70a1771547b26af38a189d2 (patch)
tree	6f627a6c3b4ccefc231e6f81119da8d5f0903215 /drivers/infiniband/ulp
parent	RDMA/amso1100: Use the dma state API instead of pci equivalents (diff)
parent	IB: Explicitly rule out llseek to avoid BKL in default_llseek() (diff)
parent	RDMA/cma: Randomize local port allocation (diff)
parent	RDMA/cxgb3: Shrink .text with compile-time init of handlers arrays (diff)
parent	MAINTAINERS: Add cxgb4 and iw_cxgb4 entries (diff)
parent	IPoIB: Allow disabling/enabling TSO on the fly through ethtool (diff)
parent	IB/iser: Fix error flow in iser_create_ib_conn_res() (diff)
parent	IB/mlx4: Add support for masked atomic operations (diff)
parent	IB/core: Use kmemdup() instead of kmalloc()+memcpy() (diff)
parent	IB/mthca: Use the dma state API instead of pci equivalents (diff)
parent	RDMA/nes: Make unnecessarily global functions static (diff)
download	linux-ffebedb7ab3f7964a70a1771547b26af38a189d2.tar.xz linux-ffebedb7ab3f7964a70a1771547b26af38a189d2.zip

Merge branches 'amso1100', 'bkl', 'cma', 'cxgb3', 'cxgb4', 'ipoib', 'iser', 'masked-atomics', 'misc', 'mthca' and 'nes' into for-next