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
..
addr.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 14:37:56 +00:00
agent.c
agent.h
cache.c	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
cm_msgs.h
cm.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 14:37:56 +00:00
cma.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 14:37:56 +00:00
core_priv.h
device.c
fmr_pool.c
iwcm.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 14:37:56 +00:00
iwcm.h
mad_priv.h	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
mad_rmpp.c	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
mad_rmpp.h
mad.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 14:37:56 +00:00
Makefile
packer.c
sa_query.c	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
smi.c
smi.h
sysfs.c
ucm.c	IB/ucm: Fix deadlock in cleanup	2006-11-29 15:33:10 -08:00
ud_header.c
user_mad.c
uverbs_cmd.c	IB/uverbs: Return sq_draining value in query_qp response	2006-10-30 21:19:35 -08:00
uverbs_main.c
uverbs_marshall.c
uverbs_mem.c	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
uverbs.h
verbs.c