commit 42f04b6d4c8c69ccffc10863418c5b5f100a8554
author Linus Torvalds <torvalds@woody.linux-foundation.org> Fri Oct 12 15:03:35 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Fri Oct 12 15:03:35 2007 -0700
tree 5c5ee032aa5a88f212fcd2a7c1a5cbccc858cb3b
parent 71a380d668189778416d37cde5521575a45c5a17
parent 4b5a9b3d8e857249f2670f4419ce764be02e11db

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

* 'isdn-cleanups' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  [ISDN] HiSax diva: split setup into three smaller functions
  [ISDN] HiSax sedlbauer: move ISAPNP and PCI code into functions of their own
  [ISDN] HiSax elsa: split huge setup function into four smaller functions
  [ISDN] HiSax avm_pci: split setup into three smaller functions
  [ISDN] Remove CONFIG_PCI ifdefs from 100% PCI source code