David S. Miller 88c5100c28 Merge branch 'master' of github.com:davem330/net ... Conflicts: net/batman-adv/soft-interface.c		2011-10-07 13:38:43 -04:00
..
amso1100	net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map	2011-10-06 16:17:20 -04:00
cxgb3	Merge branch 'master' of github.com:davem330/net	2011-10-07 13:38:43 -04:00
cxgb4	chelsio: Move the Chelsio drivers	2011-08-10 19:54:52 -07:00
ehca	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
ipath	Merge branches 'cma', 'cxgb4', 'ipath', 'misc', 'mlx4', 'mthca', 'qib' and 'srp' into for-next	2011-07-22 11:56:11 -07:00
mlx4	mlx4: Fix infiniband Kconfig dependencies.	2011-08-11 23:05:05 -07:00
mthca	IB/mthca: Remove unnecessary read of PCI_CAP_ID_EXP	2011-07-18 12:01:22 -07:00
nes	net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map	2011-10-06 16:17:20 -04:00
qib	Merge branches 'cma', 'cxgb4', 'ipath', 'misc', 'mlx4', 'mthca', 'qib' and 'srp' into for-next	2011-07-22 11:56:11 -07:00