summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 10:04:37 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 10:04:37 -0700
commit3d963f5bb1949af53a37acf36d3b12e97ca9b1e5 (patch)
tree9449490978cdb7858a7c713ee88f15ffc26a6d71 /drivers/acpi
parent5be1d85c208f135fc88f972f91b91a879b702b40 (diff)
parente13934563db047043ccead26412f552375cea90c (diff)
Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/acpi')
0 files changed, 0 insertions, 0 deletions