Pull procfs-default into release branch

Conflicts:

	drivers/acpi/sbs.c

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

diff --cc drivers/acpi/battery.c
Simple merge

diff --cc drivers/acpi/sbs.c
index 73c1ba314299fa28582be042e91f44c8f6bcf2df,278d20f9366a6227b92f741b518450a6be333a27..6045cdbe176beafe7f250c65a0bf93b3fa428da7
--- 1/drivers/acpi/sbs.c
--- 2/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@@ -824,16 -817,14 +824,16 @@@ static int acpi_battery_add(struct acpi
  
  static void acpi_battery_remove(struct acpi_sbs *sbs, int id)
  {
 -      if (sbs->battery[id].bat.dev)
 -              device_remove_file(sbs->battery[id].bat.dev, &alarm_attr);
 -              power_supply_unregister(&sbs->battery[id].bat);
 -#ifdef CONFIG_ACPI_PROCFS_POWER
 -      if (sbs->battery[id].proc_entry) {
 -              acpi_sbs_remove_fs(&(sbs->battery[id].proc_entry),
 -                                 acpi_battery_dir);
 +      struct acpi_battery *battery = &sbs->battery[id];
 +
 +      if (battery->bat.dev) {
 +              if (battery->have_sysfs_alarm)
 +                      device_remove_file(battery->bat.dev, &alarm_attr);
 +              power_supply_unregister(&battery->bat);
        }
- #ifdef CONFIG_ACPI_PROCFS
++#ifdef CONFIG_ACPI_PROCFS_POWER
 +      if (battery->proc_entry)
 +              acpi_sbs_remove_fs(&battery->proc_entry, acpi_battery_dir);
  #endif
  }