Greg Kroah-Hartman 6a2a2cdd57 Merge 3.6-rc6 into staging-next ...

This pulls in the staging tree fixes in 3.6-rc6 into our branch to resolve the
merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-09-16 17:17:25 -07:00

..

Kconfig

staging: zram/zcache: swtich Kconfig dependency from X86 to ZSMALLOC

2012-06-25 10:00:53 -07:00

Makefile

…

tmem.c

staging: zcache: fix spelling of comment

2012-09-05 12:02:14 -07:00

tmem.h

staging/zmem: Use lockdep_assert_held instead of spin_is_locked

2012-03-16 14:47:41 -07:00

zcache-main.c

staging: zcache: fix cleancache race condition with shrinker

2012-09-05 12:06:48 -07:00