diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-02 14:07:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-02 14:07:57 -0700 |
commit | 628506c8de058f94297dae1f8ef8caaea29c4369 (patch) | |
tree | 634ea85f4bc826a7a5b6720f9c12a1b84a05cbea /drivers/acpi/battery.c | |
parent | 370504cf7c68b953de55c41d5e0be97d30f3cf00 (diff) | |
parent | c3887cd7253299cac2a6dc5ea792613a5ba5bf6a (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
[x86 setup] Document grub < 0.93 as broken
[x86 setup] EDD: add missing =m constraint
[x86 setup] video setup: Fix VBE DDC reading
Diffstat (limited to 'drivers/acpi/battery.c')
0 files changed, 0 insertions, 0 deletions