tree 425f824849d5e8b0c7ffc36f9d70c1b21ba10695
parent 7cf7669143db087e5cb36d1e07143938ff467147
parent 0c98b19fe571ede1f14bd95b855bcbe2cca99bcf
author Linus Torvalds <torvalds@linux-foundation.org> 1202139766 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1202139766 -0800

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.