David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: drivers/infiniband/core/iwcm.c drivers/net/chelsio/cxgb2.c drivers/net/wireless/bcm43xx/bcm43xx_main.c drivers/net/wireless/prism54/islpci_eth.c drivers/usb/core/hub.h drivers/usb/input/hid-core.c net/core/netpoll.c Fix up merge failures with Linus's head and fix new compilation failures. Signed-Off-By: David Howells <dhowells@redhat.com>		2006-12-05 14:37:56 +00:00
..
Kconfig	IB/mthca: Always build debugging code unless CONFIG_EMBEDDED=y	2006-04-02 14:39:20 -07:00
Makefile	IB/mthca: Always build debugging code unless CONFIG_EMBEDDED=y	2006-04-02 14:39:20 -07:00
mthca_allocator.c	IB/mthca: Use IRQ safe locks to protect allocation bitmaps	2006-08-31 17:25:56 -07:00
mthca_av.c	IB/mthca: Fix section mismatches	2006-11-29 15:33:06 -08:00
mthca_catas.c	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
mthca_cmd.c	IB/mthca: Fix MAD extended header format for MAD_IFC firmware command	2006-10-31 10:51:26 -08:00
mthca_cmd.h	IB: simplify static rate encoding	2006-04-10 09:43:47 -07:00
mthca_config_reg.h	[PATCH] IB: Add copyright notices	2005-08-26 20:37:35 -07:00
mthca_cq.c	IB/mthca: Fix section mismatches	2006-11-29 15:33:06 -08:00
mthca_dev.h	IB/mthca: Recover from catastrophic errors	2006-09-22 15:22:54 -07:00
mthca_doorbell.h	[PATCH] IB: sparse endianness cleanup	2005-08-26 20:37:35 -07:00
mthca_eq.c	IB/mthca: Fix section mismatches	2006-11-29 15:33:06 -08:00
mthca_mad.c	IB/mthca: Fix section mismatches	2006-11-29 15:33:06 -08:00
mthca_main.c	IB/mthca: Fix section mismatches	2006-11-29 15:33:06 -08:00
mthca_mcg.c	IB/mthca: Fix section mismatches	2006-11-29 15:33:06 -08:00
mthca_memfree.c	IB/mthca: Use an enum for HCA page size	2006-03-20 10:08:19 -08:00
mthca_memfree.h	IB/mthca: Use an enum for HCA page size	2006-03-20 10:08:19 -08:00
mthca_mr.c	IB/mthca: Fix section mismatches	2006-11-29 15:33:06 -08:00
mthca_pd.c	IB/mthca: Fix section mismatches	2006-11-29 15:33:06 -08:00
mthca_profile.c	IB/mthca: Optimize large messages on Sinai HCAs	2006-03-20 10:08:22 -08:00
mthca_profile.h	[PATCH] IB/mthca: Add SRQ implementation	2005-08-26 20:37:37 -07:00
mthca_provider.c	IB: kmemdup() cleanup	2006-11-29 15:33:06 -08:00
mthca_provider.h	IB/mthca: Fix potential AB-BA deadlock with CQ locks	2006-08-11 08:56:57 -07:00
mthca_qp.c	IB/mthca: Fix section mismatches	2006-11-29 15:33:06 -08:00
mthca_reset.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
mthca_srq.c	IB/mthca: Fix initial SRQ logsize for mem-free HCAs	2006-11-29 15:33:08 -08:00
mthca_uar.c	IB/mthca: Don't use privileged UAR for kernel access	2006-09-22 15:17:18 -07:00
mthca_user.h	IB/mthca: Add device-specific support for resizing CQs	2006-03-20 10:08:08 -08:00
mthca_wqe.h	IB/mthca: fix posting of send lists of length >= 255 on mem-free HCAs	2005-11-29 11:33:46 -08:00