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

…

addr.h

…

atm_misc.c

…

atm_sysfs.c

[ATM]: handle sysfs errors

2006-10-21 19:55:22 -07:00

br2684.c

[ATM]: Kill ipcommon.[ch]

2006-12-02 21:32:08 -08:00

clip.c

[ATM]: Kill ipcommon.[ch]

2006-12-02 21:32:08 -08:00

common.c

…

common.h

…

ioctl.c

…

Kconfig

…

lec_arpc.h

…

lec.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

lec.h

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

[ATM]: Kill ipcommon.[ch]

2006-12-02 21:32:08 -08:00

mpc.c

[ATM]: Use kmemdup & kzalloc where applicable

2006-12-02 21:30:13 -08:00

mpc.h

[ATM]: Annotations.

2006-12-02 21:22:55 -08:00

mpoa_caches.c

[ATM]: Use kmemdup & kzalloc where applicable

2006-12-02 21:30:13 -08:00

mpoa_caches.h

[ATM]: Annotations.

2006-12-02 21:22:55 -08:00

mpoa_proc.c

[ATM]: Annotations.

2006-12-02 21:22:55 -08:00

pppoatm.c

…

proc.c

…

protocols.h

…

pvc.c

…

raw.c

…

resources.c

…

resources.h

…

signaling.c

…

signaling.h

…

svc.c

…