From: Greg Kroah-Hartman Date: Tue, 25 Oct 2011 07:18:11 +0000 (+0200) Subject: Merge branch 'staging-next' into Linux 3.1 X-Git-Tag: firefly_0821_release~3680^2~4313^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=43a3beb6da994549ec28a9f31727b997a025f958;p=firefly-linux-kernel-4.4.55.git 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 --- 43a3beb6da994549ec28a9f31727b997a025f958