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

..

Kconfig

zram/xvmalloc: create CONFIG_ZRAM_DEBUG for debug code

2011-02-04 13:29:11 -08:00

Makefile

Staging: zram: Makefile: replace the use of <module>-objs with <module>-y

2010-10-08 07:23:41 -07:00

xvmalloc_int.h

zram/xvmalloc: Close 32byte hole on 64bit CPUs

2011-02-04 13:29:11 -08:00

xvmalloc.c

zram/xvmalloc: combine duplicate block delete code

2011-02-04 13:29:12 -08:00

xvmalloc.h

Staging: Rename ramzswap files to zram

2010-06-18 12:46:42 -07:00

zram_drv.c

Merge 2.6.38-rc5 into staging-next

2011-02-18 12:11:27 -08:00

zram_drv.h

zram: Prevent overflow in logical block size

2011-02-04 13:29:11 -08:00

zram_sysfs.c

Staging: zram: round up the disk size provided by user

2011-01-20 16:06:18 -08:00

zram.txt

Staging: zram: Update zram documentation

2010-08-31 15:36:36 -07:00