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
..
core	IB/uverbs: Handle large number of entries in poll CQ	2010-12-08 15:23:49 -08:00
hw	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
ulp	SCSI host lock push-down	2010-11-16 13:33:23 -08:00
Kconfig	Update broken web addresses in the kernel.	2010-10-18 11:03:14 +02:00
Makefile	IB/qib: Add new qib driver for QLogic PCIe InfiniBand adapters	2010-05-23 21:44:54 -07:00