tree 41f8cc32c03500c499e35e641f08f41a41f28ece
parent aee77e4accbeb2c86b1d294cd84fec4a12dde3bd
parent 450783747f42dfa3883920acfad4acdd93ce69af
author David S. Miller <davem@davemloft.net> 1348173599 -0400
committer David S. Miller <davem@davemloft.net> 1348173599 -0400

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>