summaryrefslogtreecommitdiffstats
path: root/drivers/net/stnic.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-23 18:15:05 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-23 18:15:05 -0800
commitbe64c970f601d5bb439b6cc88ea2bd208b3422a0 (patch)
tree8bf588711019bfef8fe111e2ac6283910ffe725e /drivers/net/stnic.c
parent34e3f91b4e66e52b3e189b2f778bd37d68963ca8 (diff)
parentb2cb9dcb98cc7a3210e9138a05e0ae1863523a61 (diff)
downloadlinux-be64c970f601d5bb439b6cc88ea2bd208b3422a0.tar.bz2
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/stnic.c')
0 files changed, 0 insertions, 0 deletions