From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 28 Nov 2007 23:59:50 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=cae2f9c46d69edb1aee565917735d79aba3a3267;p=openwrt%2Fstaging%2Fblogic.git

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
---

cae2f9c46d69edb1aee565917735d79aba3a3267