David S. Miller ed77a89c30 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 ... Conflicts: net/netfilter/nf_conntrack_netlink.c		2008-11-28 02:19:15 -08:00
..
acpi	Merge branch 'ec' into release	2008-11-11 21:17:26 -05:00
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-xtensa
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 git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6	2008-11-28 02:19:15 -08:00
math-emu
media
mtd
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6	2008-11-28 02:19:15 -08:00
pcmcia
rdma
rxrpc
scsi
sound	Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus	2008-11-10 17:58:46 +01:00
trace
video	atmel_lcdfb: change irq_base definition to allow error reporting	2008-11-12 17:17:16 -08:00
xen
Kbuild