]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7845bc3 b9e3238)
Merge branch 'for-james' of git://github.com/srajiv/tpm into next
authorJames Morris <jmorris@namei.org>
Wed, 16 Nov 2011 23:08:37 +0000 (10:08 +1100)
committerJames Morris <jmorris@namei.org>
Wed, 16 Nov 2011 23:08:37 +0000 (10:08 +1100)
1  2 
drivers/char/tpm/Kconfig patch | diff1 | diff2 | blob | history
drivers/char/tpm/tpm.c patch | diff1 | diff2 | blob | history

diff --cc drivers/char/tpm/Kconfig
Simple merge
diff --cc drivers/char/tpm/tpm.c
Simple merge
Linux kernel for KaRo TX COM modules