From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 5 Jun 2006 19:30:28 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
X-Git-Tag: v2.6.17-rc6~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=364212e0df05efee43d87270b476fc5c9ad2c651;p=platform%2Fkernel%2Flinux-3.10.git

Merge /linux/kernel/git/brodo/pcmcia-fixes-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6:
  [PATCH] pcmcia: fix zeroing of cm4000_cs.c data
  [PATCH] pcmcia: missing pcmcia_get_socket() result check
---

364212e0df05efee43d87270b476fc5c9ad2c651