Merge branch 'akpm' (fixes from Andrew)
[linux-2.6.git] / drivers / powercap / 
treebe0ad14228ab9321a0041278e30089383ea7f771
drwxr-xr-x   ..
-rw-r--r-- 1072 Kconfig
-rw-r--r-- 82 Makefile
-rw-r--r-- 36554 intel_rapl.c
-rw-r--r-- 19273 powercap_sys.c