Merge branch 'master' of git+ssh://git.debian.org/git/collab-maint/dracut

Conflicts:
	debian/patches/dev-shm-mount
#
# It looks like you may be committing a MERGE.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.
#

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 38 and 1 different commit(s) each, respectively.
#
# Changes to be committed:
#
#	modified:   debian/patches/dev-shm-mount
#
