From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 12 Oct 2007 22:03:35 +0000 (-0700)
Subject: Merge branch 'isdn-cleanups' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=42f04b6d4c8c69ccffc10863418c5b5f100a8554;p=powerpc.git

Merge branch 'isdn-cleanups' of /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
---

42f04b6d4c8c69ccffc10863418c5b5f100a8554