Greg Kroah-Hartman 8f5f90a872 Merge 3.8-rc5 into staging-next ... This resolves a merge issue with a iio driver, and the zram code. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-01-25 21:25:02 -08:00
..
Kconfig	staging: Add angle bracket before and after the URL	2013-01-07 14:56:04 -08:00
Makefile	staging: zram: replace xvmalloc with zsmalloc	2012-02-08 17:13:00 -08:00
zram.txt	Staging: zram: Update zram documentation	2010-08-31 15:36:36 -07:00
zram_drv.c	Merge 3.8-rc5 into staging-next	2013-01-25 21:25:02 -08:00
zram_drv.h	staging: zram: correct obsolete comment on max_zpage_size	2012-10-22 13:43:46 -07:00
zram_sysfs.c	staging: zram: handle mem suffixes in disk size zram_sysfs parameter	2012-10-31 14:49:09 -07:00