| commit | 4b903e30bb24db592f3d52b9dd80744c3556705c | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Jan 01 22:54:40 2014 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Wed Jan 01 22:54:40 2014 -0500 |
| tree | 62e0e1cda157923e01d3f4d817f6e5568579deae | |
| parent | 63d515c3192882bc41394a34246e5de247574054 [diff] | |
| parent | 43779f8dfb0051b2ecd5f17ea7ad089443278e82 [diff] |
Merge branch 'r8152' Hayes Wang says: ==================== support new chip Remove the trailing "/* CRC */" for patch #3. Change the return value type of rtl_ops_init() from int to boolean for patch #4. Replace VENDOR_ID_SAMSUNG with SAMSUNG_VENDOR_ID for patch #6. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>