Merge branch 'core' of git://amd64.org/linux/rric into perf/core