Merge branch 'linus' into perf/core, to fix conflicts
[linux-2.6-microblaze.git] / arch / arm / mach-mediatek /
drwxr-xr-x   ..
-rw-r--r-- 162 Kconfig
-rw-r--r-- 42 Makefile
-rw-r--r-- 905 mediatek.c