| commit | bfd412db9e7b0d8f7b9c09d12d07aa2ac785f1d0 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 05 21:27:57 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 05 21:27:57 2011 -0700 |
| tree | 3eacbc74953999bc57137f04333bf94e7a052823 | |
| parent | a1fde08c74e90accd62d4cfdbf580d2ede938fe7 [diff] | |
| parent | 9baeb7e47aed8e399d15d2ea8c032efe3680f20b [diff] |
Merge branch 'for-linus' of git://github.com/at91linux/linux-2.6-at91 * 'for-linus' of git://github.com/at91linux/linux-2.6-at91: at91: Add ARCH_ID and basic cpu macros definition for 5series chips family. arm: at91: fix compiler warning for eb01 board build arm: at91: minimal defconfig for at91x40 SoC ARM: at91: AT91CAP9 has a macb device