Merge branch 'fortglx/3.0/tip/timers/ptp' of git://git.linaro.org/people/jstultz/linux into timers/urgent

This commit is contained in:
Thomas Gleixner 2011-06-06 21:12:32 +02:00
commit f6509b5f00