projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63d515c 43779f8)
Merge branch 'r8152'
authorDavid S. Miller <davem@davemloft.net>
Thu, 2 Jan 2014 03:54:40 +0000 (22:54 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 2 Jan 2014 03:54:40 +0000 (22:54 -0500)
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>

Trivial merge