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

@ -20,6 +20,8 @@
#define PPC_FEATURE_POWER5_PLUS 0x00020000
#define PPC_FEATURE_CELL 0x00010000
#define PPC_FEATURE_BOOKE 0x00008000
#define PPC_FEATURE_SMT 0x00004000
#define PPC_FEATURE_ICACHE_SNOOP 0x00002000
#ifdef __KERNEL__
#ifndef __ASSEMBLY__