tree 0111734ea6331072d4991f9b6fb53c996a96bf79
parent bb95a0d73bb69d73c16d32c10a0c31a32abddb03
parent abce9ac292e13da367bbd22c1f7669f988d931ac
author James Morris <james.l.morris@oracle.com> 1349952089 +0800
committer James Morris <james.l.morris@oracle.com> 1349952089 +0800

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