git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19426a8 86ff9ba)
Merge branch 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 May 2011 15:59:42 +0000 (08:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 May 2011 15:59:42 +0000 (08:59 -0700)
* '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.

1  2 
drivers/Makefile patch | diff1 | diff2 | blob | history
include/linux/Kbuild patch | diff1 | diff2 | blob | history

diff --cc drivers/Makefile
Simple merge
diff --cc include/linux/Kbuild
Simple merge
Pandora Kernel Repository