Merge tag 'v3.18-rc4' into x86/cleanups, to refresh the tree before pulling new changes.
[cascardo/linux.git] / arch / arm / oprofile /
drwxr-xr-x   ..
-rw-r--r-- 374 Makefile
-rw-r--r-- 3060 common.c