]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f4184a5 923b49f)
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 04:18:12 +0000 (15:18 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 04:18:12 +0000 (15:18 +1100)
commit4f577e61e48255cab05965ba6d3f9a19311e46cc
tree2e394e81b46d3676a621057833ca4a6b9aca59e9tree | snapshot
parentf4184a535e8f4c352e5421bc6a0eeb8771d74828commit | diff
parent923b49ff69fcbffe6f8b2739de218c45544392a7commit | diff
Merge remote-tracking branch 'security/next'

Conflicts:
drivers/char/tpm/tpm_ppi.c
MAINTAINERS diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules