David S. Miller d4a66e752d Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/benet/be_cmds.h include/linux/sysctl.h		2010-01-10 22:55:03 -08:00
..
acpi	Merge branch 'ost' into release	2009-12-16 02:18:36 -05:00
asm-generic	fix up O_SYNC comments	2009-12-17 11:03:24 -05:00
crypto	crypto: hash - Remove legacy hash/digest code	2009-10-19 12:53:37 +09:00
drm	drm: convert drm_ioctl to unlocked_ioctl	2009-12-18 11:22:31 +10:00
keys
linux	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-10 22:55:03 -08:00
math-emu
media	V4L/DVB (13670): soc-camera: Add mt9t112 camera driver	2009-12-16 09:27:41 -02:00
mtd
net	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-10 22:55:03 -08:00
pcmcia	pcmcia: CodingStyle fixes	2009-12-07 22:23:40 +01:00
rdma	Merge branches 'amso1100', 'cma', 'cxgb3', 'ehca', 'ipath', 'ipoib', 'iser', 'misc', 'mlx4' and 'nes' into for-next	2009-12-15 23:39:25 -08:00
rxrpc
scsi	kfifo: move struct kfifo in place	2009-12-22 14:17:55 -08:00
sound	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
trace	Merge branch 'linus' into tracing/urgent	2009-12-14 09:16:49 +01:00
video	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2009-12-16 10:29:52 -08:00
xen	xen: move Xen-testing predicates to common header	2009-11-04 08:47:24 -08:00
Kbuild