]> Pileus Git - ~andy/linux/commit
projects / ~andy / linux / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit4b903e30bb24db592f3d52b9dd80744c3556705c
tree62e0e1cda157923e01d3f4d817f6e5568579deaetree | snapshot
parent63d515c3192882bc41394a34246e5de247574054commit | diff
parent43779f8dfb0051b2ecd5f17ea7ad089443278e82commit | 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>
Andy's Linux Kernel repo