From: Linus Torvalds Date: Fri, 11 Jun 2010 16:55:21 +0000 (-0700) Subject: Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f1f6ea352257e0df33cf0184ba777c293cb6f1d6;p=linux-beck.git Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: avoid validate_cis failure on CIS override pcmcia: dev_node removal bugfix pcmcia: yenta_socket.c Remove extra #ifdef CONFIG_YENTA_TI pcmcia: only keep saved I365_CSCINT flag if there is no PCI irq --- f1f6ea352257e0df33cf0184ba777c293cb6f1d6