diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-24 03:15:05 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-24 03:15:05 +0100 |
| commit | be64c970f601d5bb439b6cc88ea2bd208b3422a0 (patch) | |
| tree | 8bf588711019bfef8fe111e2ac6283910ffe725e /drivers/net/e1000/e1000_main.c | |
| parent | Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/air... (diff) | |
| parent | Merge branch 'pcc' into release (diff) | |
| download | linux-be64c970f601d5bb439b6cc88ea2bd208b3422a0.tar.xz linux-be64c970f601d5bb439b6cc88ea2bd208b3422a0.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:
ACPI: Be in TS_POLLING state during mwait based C-state entry
ACPI: Fix regression where _PPC is not read at boot even when ignore_ppc=0
acer-wmi: Respect current backlight level when loading
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
0 files changed, 0 insertions, 0 deletions