tree 7e5a205ff54f6a7416ffe3b5aad646092f78bee2
parent 8a6ff8a0a2bc51b29681aab093b349c9eb32acf5
parent 2abb74eaf6e73cb42e87bdc9e9c2535ce485e614
author Olof Johansson <olof@lixom.net> 1353481480 -0800
committer Olof Johansson <olof@lixom.net> 1353481480 -0800
mergetag object 2abb74eaf6e73cb42e87bdc9e9c2535ce485e614
 type commit
 tag at91-header
 tagger Nicolas Ferre <nicolas.ferre@atmel.com> 1353343906 +0100
 
 One fix related to UART for the "headers move" branch
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJQqmPJAAoJEAf03oE53VmQbHEIAL7sxxa70NAZu0RnFq3iM0ic
 B+zycq2wtVkjp1i9qWh47+xeF88JRINmYRjh4WIlnTJ3uDvK70H/dA7DUGQP0pbB
 nTbaKInPnp1SOhyhfV1+3qxw8VNzNlvUQPunCP5ux9DJ1cwpfGn+d676I7l9skbe
 91VEd+e9Sl1wdD6CfhtXGgAbi/y6UINj6CREK/HLVPzb6W2R6yFWDhKZLJRHKMCt
 DxWXvHP8Vh+5/A9UoLtVR3PzG8yLCLN6Ty8ca25O2y/yTiEd+PpdfgwTS3tkBJ74
 JhRl5pXdE7GmSvGvVdh1V3RN4anEKueJkuHnXomZiLR2E8mYg9S5ZmrScwQKpM4=
 =B3yD
 -----END PGP SIGNATURE-----

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