]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
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

Simple merge