summaryrefslogtreecommitdiff
path: root/drivers/acpi/battery.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-24 08:40:33 +0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-24 08:40:33 +0400
commit1a8f46100b657f533ce677e79bc27c6794c91c46 (patch)
tree65788cbbd19034d01f2708f389131a291b07d58a /drivers/acpi/battery.c
parentb1b8aca480a26efb21168e311e8025a22b042591 (diff)
parentb54eebd673861136291b97e409a0f248b96e74ae (diff)
downloadlinux-1a8f46100b657f533ce677e79bc27c6794c91c46.tar.xz
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: don't check n_sectors during revalidation if zero pata_via: Add Arima W730-K8 and other rebadgings pata_sis: Add the FSC Amilo and friends pata_pdc2027x: PLL detection fixes libata: fix n_sectors failure handling during revalidation
Diffstat (limited to 'drivers/acpi/battery.c')
0 files changed, 0 insertions, 0 deletions