From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Jan 2009 23:57:34 +0000 (-0800)
Subject: Merge branch 'for_2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/kkeil... 
X-Git-Tag: v2.6.29-rc2~107
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ddb4a9dd6af72cc2c57a82d54d104d53c86384c2;p=~shefty%2Frdma-dev.git

Merge branch 'for_2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6

* 'for_2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6:
  Fix small typo
  misdn: indentation and braces disagree - add braces
  misdn: one handmade ARRAY_SIZE converted
  drivers/isdn/hardware/mISDN: move a dereference below a NULL test
  indentation & braces disagree - add braces
  Make parameter debug writable
  BUGFIX: used NULL pointer at ioctl(sk,IMGETDEVINFO,&devinfo) when devinfo.id not registered
---

ddb4a9dd6af72cc2c57a82d54d104d53c86384c2