From: Linus Torvalds Date: Tue, 5 Dec 2006 23:52:06 +0000 (-0800) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 X-Git-Tag: v2.6.20-rc1~34^2~20^2~42 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf83c2a315637dee8a8b5c2221ce5030cc38c6db;p=linux-2.6 Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: [PATCH] pcmcia: at91_cf update [PATCH] pcmcia: fix m32r_cfc.c compilation [PATCH] pcmcia: ds.c debug enhancements [PATCH] pcmcia: at91_cf update [PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation [PATCH] pcmcia: remove prod_id indirection [PATCH] pcmcia: remove manf_id and card_id indirection [PATCH] pcmcia: IDs for Elan serial PCMCIA devcies [PATCH] pcmcia: allow for four multifunction subdevices [PATCH] pcmcia: handle __copy_from_user() return value in ioctl [PATCH] pcmcia: multifunction card handling fixes [PATCH] pcmcia: allow shared IRQs on pd6729 sockets [PATCH] pcmcia: start over after CIS override [PATCH] cm4000_cs: fix return value check [PATCH] pcmcia: yet another IDE ID [PATCH] pcmcia: Add an id to ide-cs.c --- bf83c2a315637dee8a8b5c2221ce5030cc38c6db