On Mon, Nov 30, 2009 at 12:54:48PM -0800, Allan, Bruce W wrote:

quoted

-----Original Message-----
From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org]
On Behalf Of David Miller
Sent: Sunday, November 29, 2009 1:17 AM
To: netdev@vger.kernel.org
Cc: Kirsher, Jeffrey T; linville@tuxdriver.com; amit@netxen.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!

Your merge conflict fix-ups for e1000e look good to me.  Thanks!

The wireless bits seem alright too...

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.