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)
commitb7ae9f064bec903bd4a9f257a35da4d1e9bbcc99
treece1d1f40a1050f8ed1a3bd33c7ff226e250bf77e
parentdf2c2afba4fa867616436364633c7612ccfba84b
parent32d33b29ba077d6b45de35f2181e0a7411b162f4
Merge branch 'tpmdd-04-17-13' of git://github.com/shpedoikal/linux into my-next