netdev - [MERGE] net into net-next

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 for Android: free password hash cracker in your pocket

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

Message-Id: <20130205.142016.1293426562457111667.davem@davemloft.net>
Date:	Tue, 05 Feb 2013 14:20:16 -0500 (EST)
From:	David Miller <davem@...emloft.net>
To:	netdev@...r.kernel.org
CC:	linville@...driver.com
Subject: [MERGE] net into net-next

I just merged net into net-next.

Most of the conflicts were trivial, except perhaps the iwlwifi one
which is dealing with a revert that happened on the 'net' side.

John please double-check my work.  It's ironic that this happened
because you did a wireless mainline merge the last time you asked me
to pull into net-next exactly to avoid conflicts in this piece of code
:-)

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