David S. Miller 7e452baf6b Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/message/fusion/mptlan.c drivers/net/sfc/ethtool.c net/mac80211/debugfs_sta.c		2008-11-11 15:43:02 -08:00
..
acpi
asm-arm
asm-frv
asm-generic	Fix __pfn_to_page(pfn) for CONFIG_DISCONTIGMEM=y	2008-11-08 10:02:48 -08:00
asm-h8300
asm-m32r
asm-m68k
asm-mn10300
asm-x86	x86: add iomap_atomic*()/iounmap_atomic() on 32-bit using fixmaps	2008-10-31 10:12:38 +01:00
asm-xtensa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6	2008-10-23 09:16:56 -07:00
crypto
drm	drm/i915: Filter pci devices based on PCI_CLASS_DISPLAY_VGA	2008-11-11 18:02:12 +10:00
keys
linux	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-11 15:43:02 -08:00
math-emu
media
mtd
net	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-11 15:43:02 -08:00
pcmcia
rdma
rxrpc
scsi	scsi: make sure that scsi_init_shared_tag_map() doesn't overwrite existing map	2008-10-27 19:25:30 +01:00
sound	Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus	2008-11-10 17:58:46 +01:00
trace
video
xen
Kbuild