]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'viafb/viafb-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Aug 2011 00:40:23 +0000 (10:40 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Aug 2011 00:40:23 +0000 (10:40 +1000)
1  2 
drivers/video/via/viafbdev.c

Simple merge