Merge branch 'tpmdd-fixes-v3.6' of git://github.com/shpedoikal/linux into for-linus
authorJames Morris <james.l.morris@oracle.com>
Thu, 11 Oct 2012 10:40:09 +0000 (18:40 +0800)
committerJames Morris <james.l.morris@oracle.com>
Thu, 11 Oct 2012 10:40:09 +0000 (18:40 +0800)
commitbb95a0d73bb69d73c16d32c10a0c31a32abddb03
tree1ed36ec9effac9185636446fd445b11db6a15ad7
parent12250d843e8489ee00b5b7726da855e51694e792
parent1631cfb7cee28388b04aef6c0a73050f6fd76e4d
Merge branch 'tpmdd-fixes-v3.6' of git://github.com/shpedoikal/linux into for-linus