From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 Dec 2010 05:34:16 +0000 (-0800)
Subject: Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v2.6.37-rc7~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e5fcdb7ed856b714c878ad470040fe832cbe462b;p=~emulex%2Finfiniband.git

Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/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
---

e5fcdb7ed856b714c878ad470040fe832cbe462b