David S. Miller 6332178d91 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/ppp_generic.c		2008-12-23 17:56:23 -08:00
..
acpi	ACPICA: disable _BIF warning	2008-11-27 02:17:30 -05:00
asm-arm
asm-frv	ide: fix support for IDE PCI controllers using MMIO on frv	2008-10-17 18:09:14 +02:00
asm-generic	atomic: fix a typo in atomic_long_xchg()	2008-12-10 08:01:53 -08:00
asm-h8300	h8300: update timer handler - new files	2008-10-16 11:21:29 -07:00
asm-m32r	[PATCH] remove unused ibcs2/PER_SVR4 in SET_PERSONALITY	2008-10-16 15:40:05 +02:00
asm-m68k	proc: move /proc/hardware to m68k-specific code	2008-10-23 14:24:03 +04:00
asm-mn10300	MN10300: Fix __put_user_asm8()	2008-12-10 13:34:33 -08: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: move drm vblank initialization/cleanup to driver load/unload	2008-11-25 09:49:03 +10:00
keys
linux	net: Remove unused netdev arg from some NAPI interfaces.	2008-12-22 20:43:12 -08: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-12-23 17:56:23 -08:00
pcmcia
rdma
rxrpc
scsi	[SCSI] fc_transport: fix old bug on bitflag definitions	2008-11-21 17:30:53 +09:00
sound	Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus	2008-11-10 17:58:46 +01:00
trace
video	Revert "radeonfb: accelerate imageblit and other improvements"	2008-12-10 16:53:32 -08:00
xen
Kbuild