| commit | fc52693f8f54485af29be1adc90ce2bd54ad325f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 04 15:54:18 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 04 15:54:18 2011 -0700 |
| tree | 95ffbab75003d6da6a516a8956734bb7e3e5cb62 | |
| parent | aababb9766f0e874da26a17acbbec867bf9501f0 [diff] | |
| parent | 64393b3ae4e3cc86e2d622f682d736ec973364b6 [diff] |
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