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	…
asm-generic	atomic: fix a typo in atomic_long_xchg()	2008-12-10 08:01:53 -08:00
asm-h8300	…
asm-m32r	…
asm-m68k	…
asm-mn10300	MN10300: Fix __put_user_asm8()	2008-12-10 13:34:33 -08:00
asm-xtensa	…
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	…
media	…
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	…