Merge "allow modprobe to read /proc/cmdline"