]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Pull bugfix into test branch
authorLen Brown <len.brown@intel.com>
Sat, 16 Dec 2006 06:01:18 +0000 (01:01 -0500)
committerLen Brown <len.brown@intel.com>
Sat, 16 Dec 2006 06:01:18 +0000 (01:01 -0500)
commitcfee47f99bc14a6d7c6b0be2284db2cef310a815
tree2974594b06534c199ea9c4b39492d5a708bb539a
parent7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c
parent9185cfa92507d07ac787bc73d06c42222eec7239
Pull bugfix into test branch

Conflicts:

kernel/power/disk.c
drivers/acpi/dock.c
kernel/power/disk.c
kernel/power/main.c