Thomas Gleixner 6e40f5bbbc Merge branch 'sched/urgent' into sched/core ...

Conflicts: kernel/sched.c

Necessary due to the urgent fixes which conflict with the code move
from sched.c to sched_fair.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2010-02-16 16:48:56 +01:00

..

acpi

Merge branch 'bugzilla-14483' into release

2010-01-20 01:14:50 -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

Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

2010-02-01 10:46:49 -08:00

keys

RxRPC: Use uX/sX rather than uintX_t/intX_t types

2009-09-16 00:01:13 -07:00

linux

Merge branch 'sched/urgent' into sched/core

2010-02-16 16:48:56 +01:00

math-emu

…

media

V4L/DVB (13670): soc-camera: Add mt9t112 camera driver

2009-12-16 09:27:41 -02:00

mtd

Kill jffs2-user.h

2009-06-05 17:31:38 +01:00

net

netns xfrm: deal with dst entries in netns

2010-01-24 22:47:53 -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

[SCSI] fc-transport: Use packed modifier for fc_bsg_request structure.

2010-01-17 12:36:33 -06: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

tracing: Fix sign fields in ftrace_define_fields_##call()

2009-12-30 10:27:06 -05: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

[SCSI] FC Pass Thru support

2009-06-12 14:20:05 -05:00