| commit | 59b69ac2bad602d02904d310ee156e47e74d8109 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Thu Oct 11 18:41:29 2012 +0800 |
| committer | James Morris <james.l.morris@oracle.com> | Thu Oct 11 18:41:29 2012 +0800 |
| tree | 0111734ea6331072d4991f9b6fb53c996a96bf79 | |
| parent | bb95a0d73bb69d73c16d32c10a0c31a32abddb03 [diff] | |
| parent | abce9ac292e13da367bbd22c1f7669f988d931ac [diff] |
Merge branch 'tpmdd-next-v3.6' of git://github.com/shpedoikal/linux into for-linus