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
..
Kconfig	…
Makefile	…
net2280.h	drivers/net/wireless/p54/net2280.h: silence checkpatch.pl	2008-04-08 16:44:45 -04:00
p54.h	mac80211: clean up get_tx_stats callback	2008-05-07 15:02:26 -04:00
p54common.c	p54: Add quality output to iwlist and iwconfig	2008-07-02 15:48:34 -04:00
p54common.h	mac80211: move TX info into skb->cb	2008-05-21 21:48:11 -04:00
p54pci.c	mac80211: let drivers wake but not start queues	2008-05-21 21:48:08 -04:00
p54pci.h	…
p54usb.c	p54: treat firmware data as const	2008-07-10 14:26:21 +01:00
p54usb.h	…