From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Dec 2010 01:57:57 +0000 (-0800)
Subject: Merge branch 'for_linus' of git://github.com/at91linux/linux-2.6-at91
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=22a5b566c8c442b0b35b3b106795e2f2b3578096;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

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/board-yl-9200: fix typo in video support
  atmel_spi: fix warning In function 'atmel_spi_dma_map_xfer'
  at91/picotux200: remove commenting usb device and dataflash support
  at91: rename rm9200ek and rm9200dk board file name
  at91rm9200ek: fix warning: 'ek_mmc_data' defined but not used
  at91rm9200dk: fix warning: 'dk_mmc_data' defined but not used
  at91: Convert remaining boards to new-style UART initialization
  at91: merge all at91rm9200 defconfig in one single file
---

22a5b566c8c442b0b35b3b106795e2f2b3578096