commit 96a6099d2fb448cc06401386c7703a6ca015ac3d
author Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Jul 17 15:23:37 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Jul 17 15:23:37 2007 -0700
tree d44911dcfa789b3bd21c0b48ea423edc68398feb
parent e779220ec3d70843cef5e9f410d7a0c287f46718
parent 98fc4839aa00a02da83625e9fedad7a348c0af91

Merge branch 'isdn-cleanup' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6

* 'isdn-cleanup' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  [ISDN] HiSax hfc_pci: minor cleanups
  [ISDN] HiSax bkm_a4t: split setup into two smaller functions
  [ISDN] HiSax enternow: split setup into 3 smaller functions
  [ISDN] HiSax netjet_u: split setup into 3 smaller functions
  [ISDN] HiSax netjet_s: code movement, prep for hotplug
  [ISDN] HiSax: move card state alloc/setup code into separate functions
  [ISDN] HiSax: move card setup into separate function