summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-21 07:04:40 (GMT)
committerOlof Johansson <olof@lixom.net>2012-11-21 07:04:40 (GMT)
commitfbac7d7d6c1f873c89d88ca6ab8a2891ac837796 (patch)
tree7e5a205ff54f6a7416ffe3b5aad646092f78bee2 /drivers/media
parent8a6ff8a0a2bc51b29681aab093b349c9eb32acf5 (diff)
parent2abb74eaf6e73cb42e87bdc9e9c2535ce485e614 (diff)
downloadlinux-fsl-qoriq-fbac7d7d6c1f873c89d88ca6ab8a2891ac837796.tar.xz
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
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions