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)
commitc2e46d2e2a8e6ed17fac6154ac7e5fa7fe4efb28
tree39e4aa997e6a10ef4eebb31487ea15c3c2e70c34
parent95b00786f3b8fa99f53931361beeb4c10504ad87
parent65ea6520375cc09d19ecb46f03ab7ef70bcf06dd
Pull procfs-default into release branch

Conflicts:

drivers/acpi/sbs.c

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/battery.c
drivers/acpi/sbs.c