linux-kernel - Re: [git pull] PCMCIA updates and fixes for 2.6.28

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <alpine.LFD.2.00.0810131413170.3288@nehalem.linux-foundation.org>
Date:	Mon, 13 Oct 2008 14:14:03 -0700 (PDT)
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Dominik Brodowski <linux@...inikbrodowski.net>
cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-pcmcia@...ts.infradead.org,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [git pull] PCMCIA updates and fixes for 2.6.28



On Mon, 13 Oct 2008, Dominik Brodowski wrote:
> 
> There's a small merge conflict due to Alan's bugfix to drivers/pcmcia/ds.c.
> Could you either fix this up or explain me how to prepare the merge for you?

I fixed it up, thanks,

		Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/