diff options
| author | David S. Miller <davem@davemloft.net> | 2014-10-14 20:45:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-14 20:45:17 +0200 |
| commit | f787d6c8dd52ded9874cbbc447a32515c80fa2bf (patch) | |
| tree | 57cb9578e7e20ab6700a715e67834d08b399a11a /kernel/cgroup.c | |
| parent | ipv6: remove aca_lock spinlock from struct ifacaddr6 (diff) | |
| parent | net: fec: ptp: Enable PPS output based on ptp clock (diff) | |
| download | linux-f787d6c8dd52ded9874cbbc447a32515c80fa2bf.tar.xz linux-f787d6c8dd52ded9874cbbc447a32515c80fa2bf.zip | |
Merge branch 'fec-ptp'
Luwei Zhou says:
====================
Enable FEC pps feather
Change from v2 to v3:
-Using the default channel 0 to be PPS channel not PTP_PIN_SET/GETFUNC interface.
-Using the linux definition of NSEC_PER_SEC.
Change from v1 to v2:
- Fix the potential 32-bit multiplication overflow issue.
- Optimize the hareware adjustment code to improve efficiency as Richard suggested
- Use ptp PTP_PIN_SET/GETFUNC interface to set PPS channel not device tree
and add PTP_PF_PPS enumeration
- Modify comments style
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/cgroup.c')
0 files changed, 0 insertions, 0 deletions