The patch titled clocksource: small acpi_pm cleanup has been added to the -mm tree. Its filename is clocksource-small-acpi_pm-cleanup.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: clocksource: small acpi_pm cleanup From: Daniel Walker <dwalker@xxxxxxxxxx> corrects two white space errors, and flags acpi_pm_good as __devinitdata. Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxx> Acked-by: John Stultz <johnstul@xxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/clocksource/acpi_pm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/clocksource/acpi_pm.c~clocksource-small-acpi_pm-cleanup drivers/clocksource/acpi_pm.c --- a/drivers/clocksource/acpi_pm.c~clocksource-small-acpi_pm-cleanup +++ a/drivers/clocksource/acpi_pm.c @@ -78,11 +78,11 @@ static struct clocksource clocksource_ac #ifdef CONFIG_PCI -static int acpi_pm_good; +static int __devinitdata acpi_pm_good; static int __init acpi_pm_good_setup(char *__str) { - acpi_pm_good = 1; - return 1; + acpi_pm_good = 1; + return 1; } __setup("acpi_pm_good", acpi_pm_good_setup); _ Patches currently in -mm which might be from dwalker@xxxxxxxxxx are clocksource-add-usage-of-config_sysfs.patch clocksource-small-cleanup-2.patch clocksource-small-acpi_pm-cleanup.patch profile-likely-unlikely-macros.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html