From: James Morris <james.l.morris@oracle.com>
Date: Thu, 11 Oct 2012 10:40:09 +0000 (+0800)
Subject: Merge branch 'tpmdd-fixes-v3.6' of git://github.com/shpedoikal/linux into for-linus
X-Git-Tag: firefly_0821_release~3680^2~1815^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bb95a0d73bb69d73c16d32c10a0c31a32abddb03;p=firefly-linux-kernel-4.4.55.git

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

bb95a0d73bb69d73c16d32c10a0c31a32abddb03