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: ACPI: suspend: old debugging hacks sneaked back Freezer: Fix JFFS2 garbage collector freezing issue (rev. 2) HWMON: coretemp, suspend fix Freezer: Fix APM emulation breakage Freezer: Fix s2disk resume from initrd
Showing
- arch/x86/kernel/acpi/wakeup_32.S 0 additions, 4 deletionsarch/x86/kernel/acpi/wakeup_32.S
- drivers/char/apm-emulation.c 8 additions, 7 deletionsdrivers/char/apm-emulation.c
- drivers/hwmon/coretemp.c 2 additions, 3 deletionsdrivers/hwmon/coretemp.c
- fs/jffs2/background.c 1 addition, 1 deletionfs/jffs2/background.c
- init/do_mounts_initrd.c 9 additions, 3 deletionsinit/do_mounts_initrd.c
Loading
Please register or sign in to comment