netdev - MERGE check, net-next-2.6...

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-next>] [day] [month] [year] [list]

Message-Id: <20091129.011709.11078985.davem@davemloft.net>
Date:	Sun, 29 Nov 2009 01:17:09 -0800 (PST)
From:	David Miller <davem@...emloft.net>
To:	netdev@...r.kernel.org
CC:	jeffrey.t.kirsher@...el.com, linville@...driver.com,
	amit@...xen.com
Subject: MERGE check, net-next-2.6...


I just merged net-2.6 into net-next-2.6, there were several
conflicts.

They happened in e1000e, ath9k, generic ieee80211, and the
netxen driver.

Please check my work and send any necessary fixes.

Thanks!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html