tree 5fc7d94ed307dc5d31babc1cc802ccf3fb04507c
parent 9ddfd92909ac969758684e309e62198f549786a3
parent d8951adeba05719b9efd7ce875a3294ffdbb37ea
author Linus Torvalds <torvalds@linux-foundation.org> 1257275725 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1257275725 -0800

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: at91sam9g45 family: identify several chip versions
  avr32: add two new at91 to cpu.h definition