Commits
Merge branches 'release' and 'fluff' into release Conflicts: drivers/acpi/scan.c include/linux/acpi.h Signed-off-by: Len Brown <len.brown@intel.com>
Showing diff to9e52797131e
Len Brown committed 299cfe38081MMerge branches 'release' and 'hwmon-conflicts' into release- Len Brown committed 299cfe38081MMerge branches 'release' and 'hwmon-conflicts' into release
Alan Cox committed 9e52797131eACPI: its a directory not a folder.... The kernel help consistently uses 'directory' ...