Greg Kroah-Hartman 80ae3fa5d6 Merge 2.6.38-rc5 into staging-next ...

This is to resolve a merge conflict with:
	drivers/staging/zram/zram_drv.c
as pointed out by Stephen Rothwell

Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Robert Jennings <rcj@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2011-02-18 12:11:27 -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

tracing: Replace syscall_meta_data struct array with pointer array

2011-02-03 09:29:06 -05:00

crypto

…

drm

drm/radeon: remove 0x4243 pci id

2011-02-02 12:50:41 +10:00

keys

…

linux

Merge 2.6.38-rc5 into staging-next

2011-02-18 12:11:27 -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

include/net/genetlink.h: Allow genlmsg_cancel to accept a NULL argument

2011-02-03 20:47:08 -08:00

pcmcia

…

rdma

RDMA: Update workqueue usage

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

rxrpc

…

scsi

[SCSI] fix incorrect value of SCSI_MAX_SG_CHAIN_SEGMENTS due to include file ordering

2011-01-24 11:49:34 -06: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

tracing: Replace trace_event struct array with pointer array

2011-02-02 21:37:13 -05:00

video

…

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

…