Greg Kroah-Hartman 43a3beb6da Merge branch 'staging-next' into Linux 3.1 ...

This was done to resolve a conflict in the
drivers/staging/comedi/drivers/ni_labpc.c file that resolved a build
bugfix in Linus's tree with a "better" bugfix that was in the
staging-next tree that resolved the issue in a more complete manner.

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

2011-10-25 09:18:11 +02: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 branch 'staging-next' into Linux 3.1

2011-10-25 09:18:11 +02:00