Pull procfs-default into release branch
authorLen Brown <len.brown@intel.com>
Tue, 20 Nov 2007 06:20:00 +0000 (01:20 -0500)
committerLen Brown <len.brown@intel.com>
Tue, 20 Nov 2007 06:20:00 +0000 (01:20 -0500)
Conflicts:

drivers/acpi/sbs.c

Signed-off-by: Len Brown <len.brown@intel.com>

Trivial merge