From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 22 Feb 2008 00:21:52 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
X-Git-Tag: v2.6.25-rc3~96
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e6364cd3a1a3e7c3e9a80bad15698afe6cc7ee75;p=linux-2.6-omap-h63xx.git

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:
  modules: do not try to add sysfs attributes if !CONFIG_SYSFS
  POWERPC: fix typo in pseries/power.c
  PM: Remove unbalanced mutex_unlock() from dpm_resume()
  UIO: fix Greg's stupid changes
  stable_kernel_rules: fix must already be in mainline
  ide: mark "ide=reverse" option as obsolete
  Driver core: Fix error handling in bus_add_driver().
  driver-core: fix kernel-doc function parameters
  cpufreq: fix kobject reference count handling
  slabinfo: fall back from /sys/kernel/slab to /sys/slab
  Fix broken utf-8 encodings in ja_JP translation of stable_kernel_rules.txt
---

e6364cd3a1a3e7c3e9a80bad15698afe6cc7ee75