tree 39b93f43b482c5b4cb9d99933384a8a7fcb85d71
parent 19426a8f810752b4218e59b1e2187f33e255f7bc
parent 86ff9baadf16c8a1b452d72f5585be63457d9b15
author Linus Torvalds <torvalds@linux-foundation.org> 1306339182 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1306339182 -0700

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

* '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.