From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Jul 2011 22:54:18 +0000 (-0700)
Subject: Merge branch 'at91/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux... 
X-Git-Tag: firefly_0821_release~3680^2~5122
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fc52693f8f54485af29be1adc90ce2bd54ad325f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'at91/fixes' of git://git./linux/kernel/git/arm/linux-2.6-arm-soc

* 'at91/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-2.6-arm-soc:
  AT91: Change nand buswidth logic to match hardware default configuration
  at91: Use "pclk" as con_id on at91cap9 and at91rm9200
  at91: fix udc, ehci and mmc clock device name for cap9/9g45/9rl
  atmel_serial: fix internal port num
  at91: fix at91_set_serial_console: use platform device id
---

fc52693f8f54485af29be1adc90ce2bd54ad325f