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
..
ipwireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-07-14 13:24:39 -07:00
cm4000_cs.c	pcmcia: fix return value in cm4000_cs.c	2008-07-15 20:53:05 +02:00
cm4040_cs.c	pcmcia: cm40x0 cdev lock_kernel() pushdown	2008-06-24 15:33:44 +02:00
cm4040_cs.h	[PATCH] New Omnikey Cardman 4040 driver	2005-11-13 18:14:10 -08:00
Kconfig	pcmcia: ipwireless depends on NETDEVICES	2008-02-13 16:21:20 -08:00
Makefile	ipwireless: driver for PC Card 3G/UMTS modem	2008-02-07 17:19:49 -08:00
synclink_cs.c	WAN: convert drivers to use built-in netdev_stats	2008-07-04 08:47:41 -04:00