From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Sep 2009 15:11:23 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pcmcia-2.6
X-Git-Tag: v2.6.32-rc1~669
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0950efd1a1490e869d19ec631eed75ef57772f8b;p=karo-tx-linux.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pcmcia-2.6:
  pcmcia: document return value of pcmcia_loop_config
  pcmcia: dtl1_cs: fix pcmcia_loop_config logic
  pcmcia: drop non-existant includes
  pcmcia: disable prefetch/burst for OZ6933
  pcmcia: fix incorrect argument order to list_add_tail()
  pcmcia: drivers/pcmcia/pcmcia_resource.c: Remove unnecessary semicolons
  pcmcia: Use phys_addr_t for physical addresses
  pcmcia: drivers/pcmcia: Make static
---

0950efd1a1490e869d19ec631eed75ef57772f8b