Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
amso1100	Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iboe', 'ipoib', 'misc', 'mlx4', 'nes', 'qib' and 'srp' into for-next	2010-10-26 16:09:11 -07:00
cxgb3	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
cxgb4	infiniband: Only include mutex.h once in drivers/infiniband/hw/cxgb4/iw_cxgb4.h	2010-11-15 14:35:19 +01:00
ehca	IB/ehca: Fix driver on relocatable kernel	2010-10-06 12:57:07 -07:00
ipath	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
mlx4	IB/mlx4: Fix IBoE link state	2010-12-01 16:11:29 -08:00
mthca	IB/core: Add VLAN support for IBoE	2010-10-25 10:20:39 -07:00
nes	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2010-10-26 17:54:22 -07:00
qib	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00