David S. Miller a1744d3bee Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/p54/p54common.c		2008-10-31 00:17:34 -07:00
..
acpi	Merge branch 'linus' into test	2008-10-23 00:11:07 -04:00
asm-arm
asm-cris	container freezer: add TIF_FREEZE flag to all architectures	2008-10-20 08:52:33 -07:00
asm-frv	ide: fix support for IDE PCI controllers using MMIO on frv	2008-10-17 18:09:14 +02:00
asm-generic	asm-generic: define DIE_OOPS in asm-generic	2008-10-27 11:39:03 +01:00
asm-h8300
asm-m32r
asm-m68k	proc: move /proc/hardware to m68k-specific code	2008-10-23 14:24:03 +04:00
asm-mn10300
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	radeon: fix PCI bus mastering support enables.	2008-10-18 07:10:54 +10:00
keys
linux	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-10-31 00:17:34 -07:00
math-emu	math-emu: Fix thinko in _FP_DIV	2008-10-22 22:09:59 -07:00
media	V4L/DVB (9335): videobuf: split unregister bus creating self-contained frontend de-allocator	2008-10-21 14:32:08 -02:00
mtd
net	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-10-31 00:17:34 -07: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/asoc' into for-linus	2008-10-30 14:26:24 +01:00
trace
video	video: add sh_mobile_lcdc platform flags	2008-10-20 11:38:50 +09:00
xen
Kbuild