| commit | bb95a0d73bb69d73c16d32c10a0c31a32abddb03 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Thu Oct 11 18:40:09 2012 +0800 |
| committer | James Morris <james.l.morris@oracle.com> | Thu Oct 11 18:40:09 2012 +0800 |
| tree | 1ed36ec9effac9185636446fd445b11db6a15ad7 | |
| parent | 12250d843e8489ee00b5b7726da855e51694e792 [diff] | |
| parent | 1631cfb7cee28388b04aef6c0a73050f6fd76e4d [diff] |
Merge branch 'tpmdd-fixes-v3.6' of git://github.com/shpedoikal/linux into for-linus