summaryrefslogtreecommitdiff
path: root/drivers/acpi/battery.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-15 01:33:13 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-15 01:33:13 +0300
commit66ef6aa63defa54b2c7e8edcc69e0641d2bb61ef (patch)
tree1f720d954d37da8b72da447fe53272b5541801ac /drivers/acpi/battery.c
parent1c00802d3f62769a88e46212fae6f38082d30731 (diff)
parent56b9aea3b740be7665be100872a913da9bdc653b (diff)
downloadlinux-66ef6aa63defa54b2c7e8edcc69e0641d2bb61ef.tar.xz
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6: intel_idle: recognize ARAT on WSM-EX
Diffstat (limited to 'drivers/acpi/battery.c')
0 files changed, 0 insertions, 0 deletions