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
..
asix.c
catc.c
cdc_ether.c
cdc_subset.c
dm9601.c
gl620a.c
hso.c	HSO: add option hso driver	2008-06-11 21:58:39 -04:00
kaweth.c	kaweth: use request_firmware()	2008-07-10 14:47:51 +01:00
Kconfig	HSO: add option hso driver	2008-06-11 21:58:39 -04:00
Makefile	HSO: add option hso driver	2008-06-11 21:58:39 -04:00
mcs7830.c
net1080.c
pegasus.c
pegasus.h
plusb.c
rndis_host.c	rndis_host: pass buffer length to rndis_command	2008-06-28 10:23:34 -04:00
rtl8150.c
usbnet.c
zaurus.c