Merge branch 'master' into for-linus

This commit is contained in:
Rafael J. Wysocki
2009-08-18 23:37:37 +02:00
149 changed files with 1893 additions and 870 deletions

View File

@@ -201,7 +201,8 @@ static struct tagtable __tagtable_##fn __tag = { tag, fn }
struct membank {
unsigned long start;
unsigned long size;
int node;
unsigned short node;
unsigned short highmem;
};
struct meminfo {