Merge branch 'master' into for-linus

This commit is contained in:
Rafael J. Wysocki
2009-08-10 23:40:50 +02:00
208 changed files with 4140 additions and 1793 deletions

View File

@@ -159,8 +159,6 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
#else /* ARM_ARCH_6 */
#include <asm/system.h>
#ifdef CONFIG_SMP
#error SMP not supported on pre-ARMv6 CPUs
#endif