Merge ../linux-2.6

This commit is contained in:
Paul Mackerras
2006-03-09 14:32:05 +11:00
270 changed files with 3169 additions and 2217 deletions

View File

@@ -93,4 +93,4 @@
(((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)))
#define pud_ERROR(e) \
printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pud_val(e))
printk("%s:%d: bad pud %08lx.\n", __FILE__, __LINE__, pud_val(e))