maxmustermann/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
linux/net/irda
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
..
ircomm WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
irlan [IRDA]: Trivial annotations. 2006-12-02 21:22:48 -08:00
irnet [NET]: Conversions from kmalloc+memset to k(z|c)alloc. 2006-07-21 14:51:30 -07:00
af_irda.c [IrDA]: Memory allocations cleanups 2006-09-28 18:02:48 -07:00
discovery.c [NET]: kfree cleanup 2005-11-08 09:41:34 -08:00
irda_device.c [NET]: Conversions from kmalloc+memset to k(z|c)alloc. 2006-07-21 14:51:30 -07:00
iriap.c [IRDA]: Use kmemdup where applicable 2006-12-02 21:30:17 -08:00
iriap_event.c [IrDA]: Memory allocations cleanups 2006-09-28 18:02:48 -07:00
irias_object.c [IRDA]: Use kmemdup where applicable 2006-12-02 21:30:17 -08:00
irlap.c [NET]: Conversions from kmalloc+memset to k(z|c)alloc. 2006-07-21 14:51:30 -07:00
irlap_event.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
irlap_frame.c [IrDA]: Memory allocations cleanups 2006-09-28 18:02:48 -07:00
irlmp.c [IRDA]: Use kmemdup where applicable 2006-12-02 21:30:17 -08:00
irlmp_event.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
irlmp_frame.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
irmod.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
irproc.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
irqueue.c [IRDA]: Use kmemdup where applicable 2006-12-02 21:30:17 -08:00
irsysctl.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
irttp.c [IRDA]: Trivial annotations. 2006-12-02 21:22:48 -08:00
Kconfig Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
parameters.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
qos.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
timer.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
wrapper.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00