aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLinus Torvalds2005-12-01 15:54:00 -0800
committerLinus Torvalds2005-12-01 15:54:00 -0800
commitdeda498710e190c7922c2634ed630ee64ce86c05 (patch)
tree4de8700e84390a50915760ac0da89bd145fed5b7 /drivers/acpi
parentca98f825ea05edb41346f12408caa30be8a287c6 (diff)
parentea86575eaf99a9262a969309d934318028dbfacb (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/acpi')
0 files changed, 0 insertions, 0 deletions