From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Sep 2010 14:24:51 +0000 (-0700)
Subject: Merge branch 'at91-fixes-for-linus' of git://github.com/at91linux/linux-2.6-at91
X-Git-Tag: v2.6.36-rc4~20
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=6ccaa3172941c0a97c7f1c5155b1d32ecd27ec2f

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

6ccaa3172941c0a97c7f1c5155b1d32ecd27ec2f