From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 12 Jan 2006 22:00:47 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
X-Git-Tag: v2.6.16-rc1~177
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58cba4650a7a414eabd2b40cc9d8e45fcdf192d9;p=linux-2.6

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

58cba4650a7a414eabd2b40cc9d8e45fcdf192d9