]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite25a6b86a075d774a6bf79a017658b32c4d65915
tree62e0e1cda157923e01d3f4d817f6e5568579deae
parent8674667d46ae5d927c20fb922577efba6afc81a6
parent6fe8548f7d395bc6de91375ab1a82aab60a77d40
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>