| commit | fbac7d7d6c1f873c89d88ca6ab8a2891ac837796 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Tue Nov 20 23:04:40 2012 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Tue Nov 20 23:04:40 2012 -0800 |
| tree | 7e5a205ff54f6a7416ffe3b5aad646092f78bee2 | |
| parent | 8a6ff8a0a2bc51b29681aab093b349c9eb32acf5 [diff] | |
| parent | 2abb74eaf6e73cb42e87bdc9e9c2535ce485e614 [diff] |
Merge tag 'at91-header' of git://github.com/at91linux/linux-at91 into next/headers From Nicolas Ferre: One fix related to UART for the "headers move" branch * tag 'at91-header' of git://github.com/at91linux/linux-at91: atmel: move ATMEL_MAX_UART to platform_data/atmel.h