diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 06:32:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 06:32:50 +0200 |
| commit | e82ca04387dd6c98722f5f48235089839fd04268 (patch) | |
| tree | 8fb4b0435e57c7dab70dfd4cc71b4cd35686126d /drivers/char/ftape/lowlevel/ftape-rw.c | |
| parent | Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
| parent | Pull smart-battery into release branch (diff) | |
| download | linux-e82ca04387dd6c98722f5f48235089839fd04268.tar.xz linux-e82ca04387dd6c98722f5f48235089839fd04268.zip | |
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: (44 commits)
ACPI: remove function tracing macros from drivers/acpi/*.c
ACPI: add support for Smart Battery
ACPI: handle battery notify event on broken BIOS
ACPI: handle AC notify event on broken BIOS
ACPI: asus_acpi: add S1N WLED control
ACPI: asus_acpi: correct M6N/M6R display nodes
ACPI: asus_acpi: add S1N WLED control
ACPI: asus_acpi: rework model detection
ACPI: asus_acpi: support L5D
ACPI: asus_acpi: handle internal Bluetooth / support W5A
ACPI: asus_acpi: support A4G
ACPI: asus_acpi: support W3400N
ACPI: asus_acpi: LED display support
ACPI: asus_acpi: support A3G
ACPI: asus_acpi: misc cleanups
ACPI: video: Remove unneeded acpi_handle from driver.
ACPI: thermal: Remove unneeded acpi_handle from driver.
ACPI: power: Remove unneeded acpi_handle from driver.
ACPI: pci_root: Remove unneeded acpi_handle from driver.
ACPI: pci_link: Remove unneeded acpi_handle from driver.
...
Diffstat (limited to 'drivers/char/ftape/lowlevel/ftape-rw.c')
0 files changed, 0 insertions, 0 deletions