Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Sep 2009 22:55:39 +0000 (15:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Sep 2009 22:55:39 +0000 (15:55 -0700)
commita57c21c7159e07c27e317ea3513dfb382be3f153
treed70427d2d2f44b9d973aa21e7eef93f30f17515d
parente11c675ede0d42a405ae595528bf0b29ce1ae56f
parente454cea20bdcff10ee698d11b8882662a0153a47
Merge git://git./linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  Driver-Core: extend devnode callbacks to provide permissions
drivers/char/tty_io.c