Merge branch 'isdn-fix' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 19 Jul 2007 01:38:25 +0000 (18:38 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 19 Jul 2007 01:38:25 +0000 (18:38 -0700)
commit589f1e81bde732dd0b1bc5d01b6bddd4bcb4527b
treeb7dee3b229edc4a5110be4c6b02f6c7bc6d5a165
parentce524c8360d60cc6d3f77986bd58c4448d2b1e3a
parent9ee0be05dc69b61e5a869bffebd638b31898dae2
Merge branch 'isdn-fix' of /linux/kernel/git/jgarzik/misc-2.6

* 'isdn-fix' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  ISDN HiSax: uninitialized return in hisax_cs_setup