Pull procfs-default into release branch

Browse source

Conflicts:

	drivers/acpi/sbs.c

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

...

This commit is contained in:

Len Brown 2007-11-20 01:20:00 -05:00

parent 95b00786f3 65ea652037

commit c2e46d2e2a

5 changed files with 46 additions and 34 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

16

drivers/acpi/Kconfig

View file

2

drivers/acpi/Makefile

View file

20

drivers/acpi/ac.c

View file

20

drivers/acpi/battery.c

View file

20

drivers/acpi/sbs.c

View file