From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 23 Apr 2006 16:43:21 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
X-Git-Tag: v2.6.17-rc3~28
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb6aef2879b769644b35cffe9844c81c63809c8e;p=linux-2.6

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

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6:
  [PATCH] pcmcia/pcmcia_resource.c: fix crash when using Cardbus cards
  [PATCH] vrc4171: update config
  [PATCH] pcmcia: fix oops in static mapping case
  [PATCH] pcmcia: remove unneeded forward declarations
  [PATCH] pcmcia: do not set dev_node to NULL too early
  [PATCH] pcmcia: fix comment for pcmcia_load_firmware
  [PATCH] pcmcia: unload second device first
  [PATCH] pcmcia: add new ID to pcnet_cs
---

cb6aef2879b769644b35cffe9844c81c63809c8e