Merge branch 'staging-next' into Linux 3.1
Greg Kroah-Hartman [Tue, 25 Oct 2011 07:18:11 +0000 (09:18 +0200)]
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>

1  2 
MAINTAINERS
drivers/staging/zcache/zcache-main.c

diff --cc MAINTAINERS
Simple merge
Simple merge