From: Greg Kroah-Hartman Date: Tue, 4 Sep 2012 18:46:38 +0000 (-0700) Subject: Merge branch 'staging-linus' into staging-next X-Git-Tag: firefly_0821_release~3680^2~1977^2~817 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4d480efacee65eba9b6301dd02d679458d5ce447;p=firefly-linux-kernel-4.4.55.git Merge branch 'staging-linus' into staging-next This gets the 6 staging comedi patches that are needed for further patches that Ian sent. Signed-off-by: Greg Kroah-Hartman --- 4d480efacee65eba9b6301dd02d679458d5ce447