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: v3.0-rc6~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=fc52693f8f54485af29be1adc90ce2bd54ad325f;p=linux.git

Merge branch 'at91/fixes' of git://git.kernel.org/pub/scm/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