David S. Miller 5bdc22a565 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	net/sched/sch_hfsc.c
	net/sched/sch_htb.c
	net/sched/sch_tbf.c

2011-01-24 14:09:35 -08:00

..

acpi

Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2011-01-20 16:28:34 -08:00

asm-generic

module: show version information for built-in modules in sysfs

2011-01-24 14:32:51 +10:30

crypto

crypto: padlock - Move padlock.h into include/crypto

2011-01-07 14:52:00 +11:00

drm

Revert "drm: Update fbdev fb_fix_screeninfo"

2011-01-14 16:10:28 -08:00

keys

keys: add new key-type encrypted

2010-11-29 08:55:29 +11:00

linux

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-01-24 14:09:35 -08:00

math-emu

…

media

[media] v4l: Include linux/videodev2.h in media/v4l2-ctrls.h

2011-01-19 11:52:09 -02:00

mtd

…

net

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-01-24 14:09:35 -08:00

pcmcia

…

rdma

RDMA: Update workqueue usage

2011-01-16 21:16:31 -08:00

rxrpc

…

scsi

Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block

2011-01-13 10:45:01 -08:00

sound

ALSA: constify functions in ac97

2011-01-14 19:14:47 +01:00

target

[SCSI] target: Add LIO target core v4.0.0-rc6

2011-01-14 10:12:29 -06:00

trace

Merge branches 'core-fixes-for-linus', 'x86-fixes-for-linus', 'timers-fixes-for-linus' and 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2011-01-15 12:45:00 -08:00

video

Merge branch 'fbdev/udlfb'

2011-01-06 18:10:09 +09:00

xen

Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

2011-01-13 18:46:48 -08:00

Kbuild

…