Greg Kroah-Hartman 6eafa4604c Merge 3.1-rc4 into staging-next ...

This resolves a conflict with:
	drivers/staging/brcm80211/brcmsmac/types.h

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2011-08-29 08:47:46 -07:00

..

Kconfig

staging: zcache: misc build/config

2011-02-09 15:08:22 -08:00

Makefile

staging: fix zcache building

2011-08-02 16:06:18 -07:00

tmem.c

Staging: zcache: signedness bug in tmem_get()

2011-08-23 14:52:20 -07:00

tmem.h

staging: zcache: support multiple clients, prep for KVM and RAMster

2011-07-08 14:18:53 -07:00

zcache-main.c

Merge 3.1-rc4 into staging-next

2011-08-29 08:47:46 -07:00