Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
commitcae2f9c46d69edb1aee565917735d79aba3a3267
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 28 Nov 2007 23:59:50 +0000 (28 15:59 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 28 Nov 2007 23:59:50 +0000 (28 15:59 -0800)
tree203ab78f46b6362859d53717eae7c60a437f07cc
parent09f345da758fca1222b0971b65b2fddbdf78bb83
parent8118a859dc7abd873193986c77a8d9bdb877adc8
Merge git://git./linux/kernel/git/gregkh/driver-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  sysfs: fix off-by-one error in fill_read_buffer()
  kobject: two typo fixes
  UIO: add UIO documentation target to DocBook Makefile
  UIO: fix up the UIO documentation
  create /sys/.../power when CONFIG_PM is set
  allow LEGACY_PTYS to be set to 0