Greg Kroah-Hartman e4c5bf8e3d Merge 'staging-next' to Linus's tree ... This merges the staging-next tree to Linus's tree and resolves some conflicts that were present due to changes in other trees that were affected by files here. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2010-10-28 09:44:56 -07:00
..
Kconfig	Staging: zram: Replace ioctls with sysfs interface	2010-08-31 15:33:54 -07:00
Makefile	Staging: zram: Makefile: replace the use of <module>-objs with <module>-y	2010-10-08 07:23:41 -07:00
xvmalloc.c	Staging: Rename ramzswap files to zram	2010-06-18 12:46:42 -07:00
xvmalloc.h	Staging: Rename ramzswap files to zram	2010-06-18 12:46:42 -07:00
xvmalloc_int.h	Staging: Rename ramzswap files to zram	2010-06-18 12:46:42 -07:00
zram.txt	Staging: zram: Update zram documentation	2010-08-31 15:36:36 -07:00
zram_drv.c	Merge 'staging-next' to Linus's tree	2010-10-28 09:44:56 -07:00
zram_drv.h	Staging: zram: Remove need for explicit device initialization	2010-08-31 15:36:36 -07:00
zram_sysfs.c	Staging: zram: Remove need for explicit device initialization	2010-08-31 15:36:36 -07:00