Merge branch 'tpmdd-04-17-13' of git://github.com/shpedoikal/linux into my-next
authorJames Morris <james.l.morris@oracle.com>
Sat, 20 Apr 2013 16:00:45 +0000 (09:00 -0700)
committerJames Morris <james.l.morris@oracle.com>
Sat, 20 Apr 2013 16:00:45 +0000 (09:00 -0700)

Trivial merge