]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
projects / users / dwmw2 / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb95a0d abce9ac)
Merge branch 'tpmdd-next-v3.6' of git://github.com/shpedoikal/linux into for-linus
authorJames Morris <james.l.morris@oracle.com>
Thu, 11 Oct 2012 10:41:29 +0000 (18:41 +0800)
committerJames Morris <james.l.morris@oracle.com>
Thu, 11 Oct 2012 10:41:29 +0000 (18:41 +0800)
1  2 
drivers/char/tpm/tpm.c patch | diff1 | diff2 | blob | history

diff --cc drivers/char/tpm/tpm.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.