Merge branches 'einj', 'intel_idle', 'misc', 'srat' and 'turbostat-ivb' into release

This commit is contained in:
Len Brown
2012-01-18 01:15:54 -05:00
12 changed files with 345 additions and 111 deletions
+1
View File
@@ -15,6 +15,7 @@ extern int pxm_to_node(int);
extern int node_to_pxm(int);
extern void __acpi_map_pxm_to_node(int, int);
extern int acpi_map_pxm_to_node(int);
extern unsigned char acpi_srat_revision;
#endif /* CONFIG_ACPI_NUMA */
#endif /* __ACP_NUMA_H */