OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
63d515c
43779f8
)
Merge branch 'r8152'
author
David S. Miller
<davem@davemloft.net>
Thu, 2 Jan 2014 03:54:40 +0000
(22:54 -0500)
committer
David 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