aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/de600.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-29 12:22:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-29 12:22:30 -0700
commit0acbbee440fadf45164cc9537ee7d528d045f2d6 (patch)
treecbdb4d3f7fa97fd657f2e8e3489591dc444b9f23 /drivers/net/de600.c
parent535e49f48e2fc95a6de8efb366ca8af35d424642 (diff)
parentc4e6a2e64e948de42473e9c829181d768b1258c3 (diff)
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: dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled. ACPI: don't walk tables if ACPI was disabled thermal: Create CONFIG_THERMAL_HWMON=n
Diffstat (limited to 'drivers/net/de600.c')
0 files changed, 0 insertions, 0 deletions