diff options
author | David S. Miller <davem@davemloft.net> | 2012-09-20 20:39:59 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-20 20:39:59 (GMT) |
commit | b85c715c2e6fabdd18c90df878ed2c6e6cd50fc2 (patch) | |
tree | 41f8cc32c03500c499e35e641f08f41a41f28ece /init/main.c | |
parent | aee77e4accbeb2c86b1d294cd84fec4a12dde3bd (diff) | |
parent | 450783747f42dfa3883920acfad4acdd93ce69af (diff) | |
download | linux-b85c715c2e6fabdd18c90df878ed2c6e6cd50fc2.tar.xz |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
Ben Hutchings says:
====================
1. Extension to PPS/PTP to allow for PHC devices where pulses are
subject to a variable but measurable delay.
2. PPS/PTP/PHC support for Solarflare boards with a timestamping
peripheral.
3. MTD support for updating the timestamping peripheral on those boards.
4. Fix for potential over-length requests to firmware.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions