From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 May 2011 04:27:57 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://github.com/at91linux/linux-2.6-at91
X-Git-Tag: v3.0~875
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bfd412db9e7b0d8f7b9c09d12d07aa2ac785f1d0;p=platform%2Fkernel%2Flinux-amlogic.git

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
---

bfd412db9e7b0d8f7b9c09d12d07aa2ac785f1d0