From: Olof Johansson <olof@lixom.net>
Date: Wed, 21 Nov 2012 07:04:40 +0000 (-0800)
Subject: Merge tag 'at91-header' of git://github.com/at91linux/linux-at91 into next/headers
X-Git-Tag: v3.8-rc1~145^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=fbac7d7d6c1f873c89d88ca6ab8a2891ac837796;p=linux.git

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
---

fbac7d7d6c1f873c89d88ca6ab8a2891ac837796