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

Conflicts:
ChangeLog

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