Messages in this thread | | | Date | Wed, 27 Apr 2011 13:52:40 -0700 (PDT) | Subject | Re: [PATCH net-next] r8169: fix merge conflict fix. | From | David Miller <> |
| |
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.
| |