From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Mar 2010 15:51:36 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a2e28fc1164e56d37a56e3c53bd3e5a64462fd02;p=mv-sheeva.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:
  pcmcia: disable pcmcia ioctl for !ARM, prepare for removal
  pcmcia: CodingStyle fixes
  pcmcia: alchemy: fixup wrong comments
  pcmcia: remove irq_list parameter from pd6729
  yenta_socket: ENE CB712 CardBus bridge needs special treatment with Echo Audio Indigo soundcards
---

a2e28fc1164e56d37a56e3c53bd3e5a64462fd02