| commit | 6b284fe1892e320a76145bdc421fc7222169c98b | [log] [tgz] |
|---|---|---|
| author | Theodore Ts'o <tytso@mit.edu> | Wed Nov 13 20:27:49 2013 -0500 |
| committer | Theodore Ts'o <tytso@mit.edu> | Wed Nov 13 20:27:49 2013 -0500 |
| tree | ade8c8bfbf6876455add22ca0f5c325e3373b2d9 | |
| parent | 392a546dc8368d1745f9891ef3f8f7c380de8650 [diff] | |
| parent | 2821fe6b00a1e902fd399bb4b7e40bc3041f4d44 [diff] |
Merge /usr/projects/linux/base into merge-resolve Conflicts: drivers/char/random.c