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)

Trivial merge