tree e5358f8cee31ca38d82b97269e904cb8d0b546b1
parent 2cf812d732442e86c1e2018e23ad82f9bc594a38
parent cbe9352fa08f90aa03b4dbf1bbabfc95d196e562
author Linus Torvalds <torvalds@linux-foundation.org> 1249425583 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1249425583 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  tty-ldisc: be more careful in 'put_ldisc' locking
  tty-ldisc: turn ldisc user count into a proper refcount
  tty-ldisc: make refcount be atomic_t 'users' count