Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/drivers/infiniband/hw/ipath
History
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
..
ipath_common.h IB/ipath: Set CPU affinity early 2006-09-28 11:17:07 -07:00
ipath_cq.c IB/ipath: Fix races with ib_resize_cq() 2006-09-28 11:17:12 -07:00
ipath_debug.h IB/ipath: remove stale references to userspace SMA 2006-09-22 15:22:32 -07:00
ipath_diag.c IB/ipath: Initialize diagpkt file on device init only 2006-10-16 10:06:07 -07:00
ipath_driver.c [PATCH] IB/ipath - fix driver build for platforms with PCI, but not HT 2006-11-16 11:43:37 -08:00
ipath_eeprom.c IB/ipath: Fix EEPROM read when driver is compiled with -Os 2006-09-28 11:17:05 -07:00
ipath_file_ops.c IB/ipath: Set CPU affinity early 2006-09-28 11:17:07 -07:00
ipath_fs.c [PATCH] r/o bind mount prepwork: inc_nlink() helper 2006-10-01 00:39:30 -07:00
ipath_iba6110.c [PATCH] IB/ipath - program intconfig register using new HT irq hook 2006-11-08 18:29:25 -08:00
ipath_iba6120.c [PATCH] IB/ipath - program intconfig register using new HT irq hook 2006-11-08 18:29:25 -08:00
ipath_init_chip.c IB/ipath: Improved support for PowerPC 2006-09-28 11:16:53 -07:00
ipath_intr.c [PATCH] IB/ipath - program intconfig register using new HT irq hook 2006-11-08 18:29:25 -08:00
ipath_kernel.h [PATCH] IB/ipath - program intconfig register using new HT irq hook 2006-11-08 18:29:25 -08:00
ipath_keys.c IB/ipath: Ensure that PD of MR matches PD of QP checking the Rkey 2006-09-28 11:16:41 -07:00
ipath_layer.c IB/ipath: remove stale references to userspace SMA 2006-09-22 15:22:32 -07:00
ipath_layer.h IB/ipath: remove stale references to userspace SMA 2006-09-22 15:22:32 -07:00
ipath_mad.c IB/ipath: Clean up handling of GUID 0 2006-09-28 11:16:32 -07:00
ipath_mmap.c Remove all inclusions of <linux/config.h> 2006-10-04 03:38:54 -04:00
ipath_mr.c IB/ipath: Ensure that PD of MR matches PD of QP checking the Rkey 2006-09-28 11:16:41 -07:00
ipath_qp.c IB/ipath: Flush RWQEs if access error or invalid error seen 2006-09-28 11:16:55 -07:00
ipath_rc.c IB/ipath: Fix RDMA reads 2006-10-02 14:52:17 -07:00
ipath_registers.h IB/ipath: Support multiple simultaneous devices of different types 2006-09-28 11:16:49 -07:00
ipath_ruc.c IB/ipath: Flush RWQEs if access error or invalid error seen 2006-09-28 11:16:55 -07:00
ipath_srq.c IB/ipath: Count SRQs properly 2006-09-28 11:16:35 -07:00
ipath_stats.c IB/ipath: remove stale references to userspace SMA 2006-09-22 15:22:32 -07:00
ipath_sysfs.c IB/ipath: Clean up handling of GUID 0 2006-09-28 11:16:32 -07:00
ipath_uc.c IB/ipath: Ensure that PD of MR matches PD of QP checking the Rkey 2006-09-28 11:16:41 -07:00
ipath_ud.c IB/ipath: Ensure that PD of MR matches PD of QP checking the Rkey 2006-09-28 11:16:41 -07:00
ipath_user_pages.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
ipath_verbs.c IB/ipath: Fix typo in pma_counter_select subscript 2006-11-29 15:33:07 -08:00
ipath_verbs.h IB/ipath: Flush RWQEs if access error or invalid error seen 2006-09-28 11:16:55 -07:00
ipath_verbs_mcast.c IB/ipath: account for attached QPs correctly 2006-09-22 15:22:35 -07:00
ipath_wc_ppc64.c IB/ipath: Improved support for PowerPC 2006-09-28 11:16:53 -07:00
ipath_wc_x86_64.c IB/ipath: Call mtrr_del with correct arguments 2006-09-28 11:16:57 -07:00
Kconfig IB/ipath: Depend on CONFIG_NET 2006-11-20 13:06:19 -08:00
Makefile [PATCH] IB/ipath - fix driver build for platforms with PCI, but not HT 2006-11-16 11:43:37 -08:00