kevin/linux
1
Fork 0
Code
6d4df677f8
linux/net/atm
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
..
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 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
common.h [ATM]: basic sysfs support for ATM devices 2006-06-29 16:58:19 -07:00
ioctl.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
Kconfig
lec_arpc.h [ATM]: [lec] add reference counting to lec_arp entries 2006-09-29 17:16:48 -07:00
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 [NET]: Conversions from kmalloc+memset to k(z|c)alloc. 2006-07-21 14:51:30 -07:00
proc.c [ATM]: Compile error on ARM 2006-08-17 16:29:53 -07:00
protocols.h
pvc.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
raw.c [PATCH] capable/capability.h (net/) 2006-01-11 18:42:14 -08:00
resources.c [NET]: Conversions from kmalloc+memset to k(z|c)alloc. 2006-07-21 14:51:30 -07:00
resources.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
signaling.c [ATM]: keep atmsvc failure messages quiet 2006-03-04 21:06:25 -08:00
signaling.h
svc.c