From: James Morris <james.l.morris@oracle.com>
Date: Thu, 11 Oct 2012 10:41:29 +0000 (+0800)
Subject: Merge branch 'tpmdd-next-v3.6' of git://github.com/shpedoikal/linux into for-linus
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=59b69ac2bad602d02904d310ee156e47e74d8109;p=linux.git

Merge branch 'tpmdd-next-v3.6' of git://github.com/shpedoikal/linux into for-linus
---

59b69ac2bad602d02904d310ee156e47e74d8109