Subject: Re: [PATCH net-next] r8169: fix merge conflict fix.

From: David Miller <[email-masked]>
Date: Wed, 27 Apr 2011 13:52:40 -0700 (PDT)

From: Francois Romieu <[email-masked]>
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 <[email-masked]>
> Cc: Realtek linux nic maintainers <[email-masked]>

Applied, thanks.