Merge branch 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ptp: Fix dp83640 build warning when building statically
  ptp: Added a clock driver for the National Semiconductor PHYTER.
  ptp: Added a clock driver for the IXP46x.
  ptp: Added a clock that uses the eTSEC found on the MPC85xx.
  ptp: Added a brand new class driver for ptp clocks.

diff --cc drivers/Makefile
Simple merge

diff --cc include/linux/Kbuild
Simple merge