Merge remote-tracking branch 'acme/perf/urgent' into perf/core
[pandora-kernel.git] / include / linux / jiffies.h
Simple merge