Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 23 Apr 2006 16:43:21 +0000 (09:43 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 23 Apr 2006 16:43:21 +0000 (09:43 -0700)
commitcb6aef2879b769644b35cffe9844c81c63809c8e
treeccaab997f764e155226da1b600dabbe0b65f4ad7
parent950709a8961e2dde05bc55dca29b2d2e54a6d3ec
parent48b950ff241fca03a6969a5eb6a42a02722678d4
Merge git://git./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