Merge commit 'v2.6.32'
Conflicts: arch/avr32/mach-at32ap/include/mach/cpu.h
This commit is contained in:
@@ -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 */
|
||||
|
Reference in New Issue
Block a user