Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Freescale STMP37XX/STMP378X Application UART driver: remove duplicate ↵ | Jesper Juhl | 2011-02-15 |
| | | | | | | | | | | 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> | ||
* | Merge commit 'v2.6.38-rc4' into imx-for-2.6.39 | Sascha Hauer | 2011-02-11 |
Conflicts: arch/arm/mach-mxs/clock-mx28.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> |