From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 17 Jul 2007 22:23:37 +0000 (-0700)
Subject: Merge branch 'isdn-cleanup' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: upstream/snapshot3+hdmi~32396
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=96a6099d2fb448cc06401386c7703a6ca015ac3d;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

96a6099d2fb448cc06401386c7703a6ca015ac3d