David S. Miller 49997d7515 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: Documentation/powerpc/booting-without-of.txt drivers/atm/Makefile drivers/net/fs_enet/fs_enet-main.c drivers/pci/pci-acpi.c net/8021q/vlan.c net/iucv/iucv.c		2008-07-18 02:39:39 -07:00
..
.gitignore	…
Kconfig	atm: [fore200e] convert to use request_firmware()	2008-06-17 16:23:11 -07:00
Makefile	firmware: convert Ambassador ATM driver to request_firmware()	2008-07-10 14:49:39 +01:00
adummy.c	…
ambassador.c	firmware: convert Ambassador ATM driver to request_firmware()	2008-07-10 14:49:39 +01:00
ambassador.h	firmware: convert Ambassador ATM driver to request_firmware()	2008-07-10 14:49:39 +01:00
atmtcp.c	…
eni.c	…
eni.h	drivers/atm/eni.h: remove unused macro KERNEL_OFFSET	2008-06-10 12:46:52 -07:00
firestream.c	…
firestream.h	…
fore200e.c	atm: [fore200e] convert to use request_firmware()	2008-06-17 16:23:11 -07:00
fore200e.h	atm: [fore200e] convert to use request_firmware()	2008-06-17 16:23:11 -07:00
he.c	atm: [he] remove #ifdef clutter	2008-06-17 16:21:44 -07:00
he.h	atm: [he] remove #ifdef clutter	2008-06-17 16:21:44 -07:00
horizon.c	…
horizon.h	…
idt77105.c	…
idt77105.h	…
idt77252.c	drivers/atm/: remove CVS keywords	2008-05-20 14:52:25 -07:00
idt77252.h	drivers/atm/: remove CVS keywords	2008-05-20 14:52:25 -07:00
idt77252_tables.h	…
iphase.c	atm: [iphase] 64-bit cleanup	2008-06-17 16:21:18 -07:00
iphase.h	iphase: Fix 64bit warning.	2008-05-14 23:28:47 -07:00
lanai.c	…
midway.h	…
nicstar.c	drivers: atm, char fix integer as NULL pointer warnings	2008-04-28 17:29:18 -07:00
nicstar.h	…
nicstarmac.c	…
nicstarmac.copyright	drivers/atm/: remove CVS keywords	2008-05-20 14:52:25 -07:00
suni.c	atm: [suni] add support for setting loopback and framing modes	2008-06-17 16:19:24 -07:00
suni.h	atm: [suni] add support for setting loopback and framing modes	2008-06-17 16:19:24 -07:00
tonga.h	…
uPD98401.h	…
uPD98402.c	…
uPD98402.h	…
zatm.c	…
zatm.h	…
zeprom.h	…