Merge branch 'for_linus' of git://github.com/at91linux/linux-2.6-at91
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Oct 2010 17:03:40 +0000 (10:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Oct 2010 17:03:40 +0000 (10:03 -0700)
commitf99d055398d53c8f769d5153b3fdce1d2556e7ff
tree3f0fb0b13b70179bf2c58d6fb5bfc7641c925de7
parent2c518959f082c549d6c6dd9b5380aec40c3eb07f
parent24cecc1be62c37231fda15054a3d4d235ada38c5
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: rtc: enable built-in RTC in Kconfig for at91sam9g45 family
  at91/atmel-mci: inclusion of sd/mmc driver in at91sam9g45 chip and board
  AT91: pm: make sure that r0 is 0 when dealing with cache operations
  AT91: pm: use plain cpu_do_idle() for "wait for interrupt"
  AT91: reset: extend alternate reset procedure to several chips
  AT91: reset routine cleanup, remove not needed icache flush
  AT91: trivial: align comment of at91sam9g20_reset with one more tab
  AT91: Fix AT91SAM9G20 reset as per the errata in the data sheet
  AT91: add board support for Pcontrol_G20