lkml.org 
[lkml]   [2011]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH net-next] r8169: fix merge conflict fix.
From
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.


\
 
 \ /
  Last update: 2011-04-27 22:55    [W:0.045 / U:0.248 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site