aboutsummaryrefslogtreecommitdiff
path: root/fs/cramfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-09 11:12:31 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-09 11:12:31 -0800
commitacac103e2d00c9bc7507838319c71a0f5dc50678 (patch)
tree562d193ec8dba3e3a174751951b4ea7e6d732c50 /fs/cramfs
parent5b39dba5029108800b94a5f4f96e3a05417103ac (diff)
parenta52500c917ead55dd78d9f37b8ca993f4f79f72a (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: Merge branches 'release' and 'buildfix' into release acer-wmi - Add documentation sonypi - Move sonypi.txt to Documentation/laptops sony-laptop - Move sony-laptop.txt to Documentation/laptops thinkpad-acpi - Move thinkpad-acpi.txt to Documentation/laptops Documentation - Create laptops sub-directory ACPI: thermal: buildfix for CONFIG_THERMAL=n cpuidle: build fix for non-x86 acer-wmi: Fix backlight on AMW0 (V1) laptops tc1100-wmi: Mark as experimental ACPI: SBS: Host controller must initialize before SBS.
Diffstat (limited to 'fs/cramfs')
0 files changed, 0 insertions, 0 deletions