Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Dec 2010 05:34:16 +0000 (21:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Dec 2010 05:34:16 +0000 (21:34 -0800)
commite5fcdb7ed856b714c878ad470040fe832cbe462b
tree9a4105597bbc8ad3cc2fb8e8adca87678977a62e
parent7bddaaca472a08bb8a80b653855a1e921b440578
parent093d804611b9a38fe59753b37c29f840518406a9
Merge branch 'tty-linus' of git://git./linux/kernel/git/gregkh/tty-2.6

* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  n_gsm: gsm_data_alloc buffer allocation could fail and it is not being checked
  n_gsm: Fix message length handling when building header