From: James Morris <james.l.morris@oracle.com>
Date: Sat, 20 Apr 2013 16:00:45 +0000 (-0700)
Subject: Merge branch 'tpmdd-04-17-13' of git://github.com/shpedoikal/linux into my-next
X-Git-Tag: firefly_0821_release~3680^2~627^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b7ae9f064bec903bd4a9f257a35da4d1e9bbcc99;p=firefly-linux-kernel-4.4.55.git

Merge branch 'tpmdd-04-17-13' of git://github.com/shpedoikal/linux into my-next
---

b7ae9f064bec903bd4a9f257a35da4d1e9bbcc99