From: Linus Torvalds Date: Mon, 22 Dec 2008 22:52:00 +0000 (-0800) Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux... X-Git-Tag: v2.6.28~11 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c47a75a45fa3a9d98b61f7e31983ffab2c44404f;p=linux-2.6-omap-h63xx.git 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: don't cond_resched() when irqs_disabled() ACPI: fix 2.6.28 acpi.debug_level regression --- c47a75a45fa3a9d98b61f7e31983ffab2c44404f