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

..

lmc

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

2006-10-05 15:10:12 +01:00

.gitignore

gitignore: misc files

2006-01-01 22:21:50 +01:00

c101.c

[PATCH] WAN: fix C101 card carrier handling

2006-08-19 17:51:25 -04:00

cosa.c

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

2006-10-05 15:10:12 +01:00

cosa.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cycx_drv.c

[PATCH] drivers/net/wan/: possible cleanups

2005-09-14 08:36:54 -04:00

cycx_main.c

drivers/net: eliminate irq handler impossible checks, needless casts

2006-10-06 14:56:04 -04:00

cycx_x25.c

[PATCH] Replace drivers/net/wan custom ctype macros with standard ones

2005-09-14 08:35:09 -04:00

dlci.c

[PATCH] remove unnecessary config.h includes from drivers/net/

2006-08-14 14:00:43 -04:00

dscc4.c

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

2006-10-05 15:10:12 +01:00

farsync.c

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

2006-10-05 15:10:12 +01:00

farsync.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

hd6457x.c

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

2006-10-05 15:10:12 +01:00

hd64570.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

hd64572.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

hdlc_cisco.c

[IPV4]: annotate struct in_ifaddr

2006-09-28 18:00:55 -07:00

hdlc_fr.c

[PATCH] Modularize generic HDLC

2006-09-26 17:40:24 -04:00

hdlc_ppp.c

[PATCH] Modularize generic HDLC

2006-09-26 17:40:24 -04:00

hdlc_raw_eth.c

[PATCH] Modularize generic HDLC

2006-09-26 17:40:24 -04:00

hdlc_raw.c

[PATCH] Modularize generic HDLC

2006-09-26 17:40:24 -04:00

hdlc_x25.c

[PATCH] Modularize generic HDLC

2006-09-26 17:40:24 -04:00

hdlc.c

[PATCH] Modularize generic HDLC

2006-09-26 17:40:24 -04:00

hostess_sv11.c

[PATCH] irq-flags: drivers/net: Use the new IRQF_ constants

2006-07-02 13:58:51 -07:00

Kconfig

[PATCH] WAN: DSCC4 driver requires generic HDLC

2006-12-02 00:12:03 -05:00

lapbether.c

[NET]: Kill skb->real_dev

2005-08-29 15:32:25 -07:00

Makefile

[PATCH] Modularize generic HDLC

2006-09-26 17:40:24 -04:00

n2.c

[PATCH] n2: fix confusing error code

2006-10-31 20:22:05 -05:00

pc300_drv.c

[PATCH] WAN/pc300: handle, propagate minor errors

2006-10-21 14:08:24 -04:00

pc300_tty.c

WorkStruct: make allyesconfig

2006-11-22 14:57:56 +00:00

pc300-falc-lh.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

pc300.h

[PATCH] git-netdev-all: pc300_tty build fix

2006-09-27 16:18:24 -04:00

pci200syn.c

drivers/net: Remove deprecated use of pci_module_init()

2006-08-19 17:48:59 -04:00

sbni.c

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

2006-10-05 15:10:12 +01:00

sbni.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sdla.c

drivers/net: eliminate irq handler impossible checks, needless casts

2006-10-06 14:56:04 -04:00

sealevel.c

[PATCH] irq-flags: drivers/net: Use the new IRQF_ constants

2006-07-02 13:58:51 -07:00

syncppp.c

[PATCH] Uninitialized variable in drivers/net/wan/syncppp.c

2006-09-29 09:18:23 -07:00

wanxl.c

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

2006-10-05 15:10:12 +01:00

wanxl.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

wanxlfw.inc_shipped

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

wanxlfw.S

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

x25_asy.c

[PATCH] TTY layer buffering revamp

2006-01-10 08:01:59 -08:00

x25_asy.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

z85230.c

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

2006-10-05 15:10:12 +01:00

z85230.h

IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

2006-10-05 15:10:12 +01:00