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