]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'modules/modules-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 02:15:55 +0000 (13:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 02:15:55 +0000 (13:15 +1100)
Conflicts:
Documentation/module-signing.txt


Trivial merge