| commit | c2f828977ba5d17c13debba374ea252d18e5ccfb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Sun Sep 16 22:24:49 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Sun Sep 16 22:24:49 2007 -0700 |
| tree | 49d95c5e9325f93f379e5c249bf5a39f8e8040ae | |
| parent | 6553daeafb4fa15cd07088f543352fa3779e86e1 [diff] | |
| parent | ecfe7f093768f7af0959f5be8ec039dcc29724af [diff] |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: thinkpad-acpi: bump up version to 0.16 ACPI: thinkpad-acpi: revert new 2.6.23 CONFIG_THINKPAD_ACPI_INPUT_ENABLED option ACPI: fix CONFIG_NET=n acpi_bus_generate_netlink_event build failure msi-laptop: replace ',' with ';' ACPI: (more) delete CONFIG_ACPI_PROCFS_SLEEP (again)