2 Commits

Author	SHA1	Message	Date
Jesper Juhl	18fd7315cc	Freescale STMP37XX/STMP378X Application UART driver: remove duplicate 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-15 18:35:42 +01:00
Sascha Hauer	f19693a17c	Merge commit 'v2.6.38-rc4' into imx-for-2.6.39 ... Conflicts: arch/arm/mach-mxs/clock-mx28.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>	2011-02-11 08:33:14 +01:00