Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
commite6364cd3a1a3e7c3e9a80bad15698afe6cc7ee75
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 22 Feb 2008 00:21:52 +0000 (21 16:21 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 22 Feb 2008 00:21:52 +0000 (21 16:21 -0800)
treece8d5b1ba0e246c32b232a09a713cf49d999971d
parentb8967d8883aadf36351b568c1f1301ad3f46fc3d
parent120fc3d77acfd91f3521737a440d42839c475982
Merge git://git./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