]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'm68k-current/for-linus'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Jun 2013 01:00:04 +0000 (11:00 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Jun 2013 01:00:04 +0000 (11:00 +1000)
1  2 
drivers/parport/Kconfig

Simple merge