]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
projects / can-eth-gw-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f36678 17d857b)
Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Tue, 29 Sep 2009 21:47:33 +0000 (07:47 +1000)
committerJames Morris <jmorris@namei.org>
Tue, 29 Sep 2009 21:47:33 +0000 (07:47 +1000)
1  2 
drivers/char/tpm/tpm.c patch | diff1 | diff2 | blob | history

diff --cc drivers/char/tpm/tpm.c
Simple merge