]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a6ff8a 2abb74e)
Merge tag 'at91-header' of git://github.com/at91linux/linux-at91 into next/headers
authorOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 07:04:40 +0000 (23:04 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 07:04:40 +0000 (23:04 -0800)
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


Trivial merge
local clone of linux.git