| commit | fc582aef7dcc27a7120cf232c1e76c569c7b6eab | [log] [tgz] |
|---|---|---|
| author | Eric Paris <eparis@redhat.com> | Fri Nov 22 18:57:08 2013 -0500 |
| committer | Eric Paris <eparis@redhat.com> | Fri Nov 22 18:57:54 2013 -0500 |
| tree | 7d275dd4ceab6067b91e9a25a5f6338b425fbccd | |
| parent | 9175c9d2aed528800175ef81c90569d00d23f9be [diff] | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 [diff] |
Merge tag 'v3.12' Linux 3.12 Conflicts: fs/exec.c