From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 14 Nov 2005 02:22:49 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
X-Git-Tag: v2.6.15-omap2~95^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ee90f62b3e69d0cd9f8edc6b95f07b1a8c38aaf4;p=linux-2.6-omap-h63xx.git

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

ee90f62b3e69d0cd9f8edc6b95f07b1a8c38aaf4