]> www.infradead.org Git - users/willy/linux.git/commitdiff
Merge remote-tracking branch 'sparc-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 9 Dec 2018 23:08:12 +0000 (10:08 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 9 Dec 2018 23:08:12 +0000 (10:08 +1100)
1  2 
drivers/sbus/char/envctrl.c
sound/sparc/cs4231.c

Simple merge
Simple merge