summaryrefslogtreecommitdiff
path: root/drivers/tty/serial/mxs-auart.c
AgeCommit message (Collapse)Author
2011-02-15Freescale STMP37XX/STMP378X Application UART driver: remove duplicate ↵Jesper Juhl
linux/device.h include Do not include linux/device.h twice in drivers/tty/serial/mxs-auart.c . Once is enough. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-02-11Merge commit 'v2.6.38-rc4' into imx-for-2.6.39Sascha Hauer
Conflicts: arch/arm/mach-mxs/clock-mx28.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>