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: v3.10-rc1~145^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b7ae9f064bec903bd4a9f257a35da4d1e9bbcc99;p=users%2Fjedix%2Flinux-maple.git

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

b7ae9f064bec903bd4a9f257a35da4d1e9bbcc99