Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
commit59ed2f59e4ea6a32f9591e378da7935f713a7000
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Feb 2006 06:06:15 +0000 (1 22:06 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Feb 2006 06:06:15 +0000 (1 22:06 -0800)
treea1276a611dbb1bc44685ef8af363e99603e60047
parent9ad11ab48b1ad618bf47076e9e579f267f5306c2
parentb8e4d89357fc434618a59c1047cac72641191805
Merge branch 'release' of git://git./linux/kernel/git/lenb/linux-acpi-2.6
kernel/power/disk.c