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
..
.gitignore	kbuild: ignore all generated files for make allmodconfig (x86_64)	2006-02-26 20:15:58 +01:00
adummy.c	[ATM]: kmalloc to kzalloc patches for drivers/atm	2006-10-04 00:31:04 -07:00
ambassador.c	[ATM] ambassador,firestream: "-1 >>" is implementation defined	2006-12-02 21:22:25 -08:00
ambassador.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
atmsar11.data	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
atmsar11.regions	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
atmsar11.start	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
atmtcp.c	[ATM]: deregistration removes device from atm_devs list immediately	2005-11-29 16:16:41 -08:00
eni.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
eni.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
firestream.c	[ATM] ambassador,firestream: "-1 >>" is implementation defined	2006-12-02 21:22:25 -08:00
firestream.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
fore200e.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
fore200e.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
fore200e_firmware_copyright	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
fore200e_mkfirm.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
he.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
he.h	[ATM]: [he] Use the DMA_32BIT_MASK constant from dma-mapping.h	2005-04-24 18:55:35 -07:00
horizon.c	[ATM] horizon: read_bia() needs to be __devinit	2006-10-24 16:16:39 -07:00
horizon.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
idt77105.c	[ATM]: [idt77105] should be __devinit not __init	2006-06-29 16:58:12 -07:00
idt77105.h	[ATM]: [idt77105] should be __devinit not __init	2006-06-29 16:58:12 -07:00
idt77252.c	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
idt77252.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
idt77252_tables.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
iphase.c	Fix misc .c/.h comment typos	2006-11-30 05:24:39 +01:00
iphase.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
Kconfig	[ATM]: Typo in drivers/atm/Kconfig...	2006-07-08 13:30:09 -07:00
lanai.c	Various drivers' irq handlers: kill dead code, needless casts	2006-10-06 15:00:58 -04:00
Makefile	[ATM]: [adummy] dummy ATM driver (similar to net/dummy)	2005-11-29 16:17:11 -08:00
midway.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
nicstar.c	[ATM] nicstar: Fix a bogus casting warning	2006-10-21 19:55:25 -07:00
nicstar.h	[NET]: Kill skb->list	2005-08-29 15:31:14 -07:00
nicstarmac.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
nicstarmac.copyright	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
pca200e.data	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
pca200e_ecd.data	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
sba200e_ecd.data	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
suni.c	[ATM]: [suni] change suni_init to __devinit	2006-06-29 16:58:17 -07:00
suni.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
tonga.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
uPD98401.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
uPD98402.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
uPD98402.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
zatm.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
zatm.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
zeprom.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00