diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2011-04-27 20:52:22 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-27 20:52:22 (GMT) |
| commit | 15ecd039b7182d725f4294e01f2fb12c3a88db17 (patch) | |
| tree | 66ba7a844dacbf061a2aa62396f49640a81213cb /lib/prio_heap.c | |
| parent | da0420bee24a1ba54e55a61e95b1a53205d7e62d (diff) | |
| download | linux-fsl-qoriq-15ecd039b7182d725f4294e01f2fb12c3a88db17.tar.xz | |
r8169: fix merge conflict fix.
- 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>
Diffstat (limited to 'lib/prio_heap.c')
0 files changed, 0 insertions, 0 deletions