| commit | f8e51716464f623e0fe09de68a401080c1b15952 | [log] [tgz] |
|---|---|---|
| author | Jon Masters <jcm@jonmasters.org> | Thu Jun 02 13:40:46 2011 -0400 |
| committer | Jon Masters <jcm@jonmasters.org> | Thu Jun 02 13:40:46 2011 -0400 |
| tree | af06afe0b9de0fe5a68db10866fe3e9af048c3be | |
| parent | e61ce680928a57c8d74cb0d3feadc8b0d8514799 [diff] | |
| parent | 95c6c113083e4c012c3efe6b7ac59e3b56559a07 [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/utils/kernel/module-init-tools/module-init-tools Conflicts: ChangeLog Signed-off-by: Jon Masters <jcm@jonmasters.org>