Merge commit 'v2.6.30-rc6' into perfcounters/core

Merge reason: this branch was on an -rc4 base, merge it up to -rc6
              to get the latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-05-18 07:37:44 +02:00
786 changed files with 17787 additions and 9563 deletions

View File

@@ -57,7 +57,7 @@
int init_bootmem_done;
int mem_init_done;
unsigned long memory_limit;
phys_addr_t memory_limit;
#ifdef CONFIG_HIGHMEM
pte_t *kmap_pte;