git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: da0420b)
r8169: fix merge conflict fix.
authorFrancois Romieu <romieu@fr.zoreil.com>
Wed, 27 Apr 2011 20:52:22 +0000 (13:52 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 27 Apr 2011 20:52:22 +0000 (13:52 -0700)
- 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>
Signed-off-by: David S. Miller <davem@davemloft.net>

No differences found
Pandora Kernel Repository