David S. Miller abb434cb05 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/bluetooth/l2cap_core.c Just two overlapping changes, one added an initialization of a local variable, and another change added a new local variable. Signed-off-by: David S. Miller <davem@davemloft.net>		2011-12-23 17:13:56 -05:00
..
amso1100	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2011-11-01 10:51:38 -07:00
cxgb3	cxgb3: Rework t3_l2t_get to take a dst_entry instead of a neighbour.	2011-12-05 15:20:19 -05:00
cxgb4	infiniband: cxgb4: Consolidate 3 copies of the same operation into 1 helper function.	2011-12-05 15:20:20 -05:00
ehca	Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'fdr', 'ipath', 'ipoib', 'misc', 'mlx4', 'misc', 'nes', 'qib' and 'xrc' into for-next	2011-11-01 09:37:08 -07:00
ipath	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
mlx4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00
mthca	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
nes	infiniband: nes: Use dst's neighbour entry.	2011-12-05 15:20:19 -05:00
qib	IB/qib: Correct sense on freectxts increment and decrement	2011-12-19 09:19:34 -08:00