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)
commit59b69ac2bad602d02904d310ee156e47e74d8109
tree0111734ea6331072d4991f9b6fb53c996a96bf79
parentbb95a0d73bb69d73c16d32c10a0c31a32abddb03
parentabce9ac292e13da367bbd22c1f7669f988d931ac
Merge branch 'tpmdd-next-v3.6' of git://github.com/shpedoikal/linux into for-linus
drivers/char/tpm/tpm.c