Merge branch 'for-linus' of git://github.com/at91linux/linux-2.6-at91
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Nov 2009 19:15:25 +0000 (11:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Nov 2009 19:15:25 +0000 (11:15 -0800)
* '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


Trivial merge