Merge branch 'at91-fixes-for-linus' of git://github.com/at91linux/linux-2.6-at91
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Sep 2010 14:24:51 +0000 (07:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Sep 2010 14:24:51 +0000 (07:24 -0700)
commit6ccaa3172941c0a97c7f1c5155b1d32ecd27ec2f
treef92588c8084f758c348120d712292d7f4a00edc7
parent3657423c02b639fcade37673f8541bd90c5e58e5
parent4deb22a6001eb0d4058295c3645c36190a0ec603
Merge branch 'at91-fixes-for-linus' of git://github.com/at91linux/linux-2.6-at91

* 'at91-fixes-for-linus' of git://github.com/at91linux/linux-2.6-at91:
  AT91: at91sam9261ek: remove C99 comments but keep information
  AT91: at91sam9261ek board: remove warnings related to use of SPI or SD/MMC
  AT91: dm9000 initialization update
  AT91: SAM9G45 - add a separate clock entry for every single TC block
  AT91: clock: peripheral clocks can have other parent than mck
  AT91: change dma resource index