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

[David Miller]

From: Francois Romieu <romieu@xxxxxxxxxxxxx>
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@xxxxxxxxxxxxx>
> Cc: Realtek linux nic maintainers <nic_swsd@xxxxxxxxxxx>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/