From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: [PATCH net-next] r8169: fix merge conflict fix.
Date: Wed, 27 Apr 2011 13:52:40 -0700 (PDT)
Message-ID: <20110427.135240.112610984.davem@davemloft.net>
References: <20110427203640.GC19708@electric-eye.fr.zoreil.com>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20110427203640.GC19708@electric-eye.fr.zoreil.com>
Sender: linux-kernel-owner@vger.kernel.org
To: romieu@fr.zoreil.com
Cc: sfr@canb.auug.org.au, netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, nic_swsd@realtek.com
List-Id: linux-next.vger.kernel.org

From: Francois Romieu <romieu@fr.zoreil.com>
Date: Wed, 27 Apr 2011 22:36:40 +0200

> - use adequate MAC_VER id
>   (see 01dc7fec4025f6bb72b6b98ec88b375346b6dbbb)
> - remove duplicate rtl_firmware_info record
> - remove duplicate functions
> 
> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
> Cc: Realtek linux nic maintainers <nic_swsd@realtek.com>

Applied, thanks.