projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1fde08 9baeb7e)
Merge branch 'for-linus' of git://github.com/at91linux/linux-2.6-at91
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 May 2011 04:27:57 +0000 (21:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 May 2011 04:27:57 +0000 (21:27 -0700)
* '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


Trivial merge
Linux Kernel tree with some unpolished code for Colibri/Apalis modules