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)
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  Driver-Core: extend devnode callbacks to provide permissions

1  2 
drivers/char/tty_io.c

Simple merge