commit ddb4a9dd6af72cc2c57a82d54d104d53c86384c2
author Linus Torvalds <torvalds@linux-foundation.org> Mon Jan 12 15:57:34 2009 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Jan 12 15:57:34 2009 -0800
tree 913f3e48e7a63dd4907141dcfe1d10ecdfc581e8
parent 87aa08b7fee79dac908c80f7593007243448ef89
parent 24dafdf00b630cb827875c187f2a493280cab078

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