From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 May 2011 15:59:42 +0000 (-0700)
Subject: Merge branch 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.0-rc1~164
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=22e12bbc9bc38c6d0bd541d061a0f547596fc19d;p=cascardo%2Flinux.git

Merge branch 'timers-ptp-for-linus' of git://git./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.
---

22e12bbc9bc38c6d0bd541d061a0f547596fc19d