Merge branch 'master' of master.kernel.org:/pub/scm/utils/kernel/module-init-tools... v3.15
authorJon Masters <jcm@jonmasters.org>
Thu, 2 Jun 2011 17:40:46 +0000 (13:40 -0400)
committerJon Masters <jcm@jonmasters.org>
Thu, 2 Jun 2011 17:40:46 +0000 (13:40 -0400)
commitf8e51716464f623e0fe09de68a401080c1b15952
treeaf06afe0b9de0fe5a68db10866fe3e9af048c3be
parente61ce680928a57c8d74cb0d3feadc8b0d8514799
parent95c6c113083e4c012c3efe6b7ac59e3b56559a07
Merge branch 'master' of /utils/kernel/module-init-tools/module-init-tools

Conflicts:
ChangeLog

Signed-off-by: Jon Masters <jcm@jonmasters.org>