From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 Oct 2008 19:52:53 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
X-Git-Tag: v2.6.28-rc3~37
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c732acd96085347027b11961463a243c568d9aab;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  fdomain_cs: Sort out modules with duplicate description
  pcmcia: Whine harder about use of EXCLUSIVE
  pcmcia: IRQ_TYPE_EXCLUSIVE is long obsoleted
---

c732acd96085347027b11961463a243c568d9aab