Merge commit 'v2.6.32'

Conflicts:
	arch/avr32/mach-at32ap/include/mach/cpu.h
This commit is contained in:
Haavard Skinnemoen
2009-12-14 19:23:03 +01:00
2398 changed files with 103293 additions and 31907 deletions

View File

@@ -33,5 +33,6 @@
#define cpu_is_at91cap9() (0)
#define cpu_is_at91sam9g10() (0)
#define cpu_is_at91sam9g45() (0)
#define cpu_is_at91sam9g45es() (0)
#endif /* __ASM_ARCH_CPU_H */