Conflicts:
	Documentation/kernel-parameters.txt
Signed-off-by: NLen Brown <len.brown@intel.com>