From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 5 Jan 2006 23:55:49 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
X-Git-Tag: v2.6.16-rc1~474^2~21^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7906de1d774ca70d696d3047223bb3e5e759d92;p=linux-2.6

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

d7906de1d774ca70d696d3047223bb3e5e759d92