Merge branch 'tpmdd-fixes-v3.6' of git://github.com/shpedoikal/linux into for-linus