From: Greg Kroah-Hartman Date: Tue, 4 Sep 2012 18:58:26 +0000 (-0700) Subject: Merge branch 'staging-linus' into staging-next X-Git-Tag: firefly_0821_release~3680^2~1977^2~815 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c283cf384a7debe3fa421c4f77a375e111e8fcb5;p=firefly-linux-kernel-4.4.55.git Merge branch 'staging-linus' into staging-next Pick up 2 more comedi patches from Ian that are needed for other changes in the future. Signed-off-by: Greg Kroah-Hartman --- c283cf384a7debe3fa421c4f77a375e111e8fcb5