]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 05:12:18 +0000 (15:12 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 05:12:18 +0000 (15:12 +1000)
1  2 
drivers/staging/comedi/comedi_fops.c
drivers/staging/comedi/comedidev.h

Simple merge
Simple merge