Merge branches 'x86-fixes-for-linus' and 'x86-uv-for-linus' of git://git.kernel.org...
[pandora-kernel.git] / kernel / perf_event.c
Simple merge