tree 203ab78f46b6362859d53717eae7c60a437f07cc
parent 09f345da758fca1222b0971b65b2fddbdf78bb83
parent 8118a859dc7abd873193986c77a8d9bdb877adc8
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1196294390 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1196294390 -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:
  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