summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-12-20 17:46:32 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-12-20 17:46:32 -0800
commit2954a9c4ce173441b4e48ea1d45efba6ea64f49d (patch)
tree493f847789ea0f7793e0adfb216236e4fb43f293 /include/acpi
parent7b7054599309955675efc71324c762ede0982d15 (diff)
parenta25b8487f71ce760e29d7a6e5bdcfe8eac52ac6b (diff)
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/acpi')
0 files changed, 0 insertions, 0 deletions