Viewing all changes in revision 269.
- Committer: Jon Masters
- Date: 2011-06-02 17:40:46 UTC
- mfrom: (265.1.1)
- Revision ID: git-v1:f8e51716464f623e0fe09de68a401080c1b15952
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>
Conflicts:
ChangeLog
Signed-off-by: Jon Masters <jcm@jonmasters.org>
expand all
collapse all
added
removed