From: Linus Torvalds Date: Mon, 4 Feb 2008 15:42:46 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 X-Git-Tag: v2.6.25-rc1~1066 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6cc48eeea438b9d9e05943beebc31c52e76d32f;p=linux-2.6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: Driver core: Remove unneeded get_{device,driver}() calls. Driver core: Update some prototypes in platform.txt driver core: convert to use class_find_device api PM: Export device_pm_schedule_removal nozomi: finish constification nozomi: constify driver nozomi driver update Add ja_JP translation of stable_kernel_rules.txt kobject: kerneldoc comment fix kobject: Always build in kernel/ksysfs.o. --- a6cc48eeea438b9d9e05943beebc31c52e76d32f