From: Olof Johansson Date: Mon, 5 Nov 2012 18:10:14 +0000 (-0800) Subject: Merge tag 'omap-for-v3.8/cleanup-headers-serial-take2-signed' of git://git.kernel... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1c7ebf17a4d874fe38226a4f5990cb7be702e331;p=linux-beck.git Merge tag 'omap-for-v3.8/cleanup-headers-serial-take2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/headers These changes remove plat/serial.h usage for omap2+. Note that this branch is based on a tty commit 3e9a6321 (tty/serial/8250: Make omap hardware workarounds local to 8250.h) merged with omap-for-v3.8/cleanup-headers-signed. The tty commit is needed to keep things compiling for omaps, and omap-for-v3.8/cleanup-headers-signed is needed to avoid multiple merge conflicts with the includes. I've verified with Greg KH that the tty commit above is immutable and OK to use as a base. By Tony Lindgren via Tony Lindgren * tag 'omap-for-v3.8/cleanup-headers-serial-take2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP: Split plat/serial.h for omap1 and omap2+ ARM: OMAP: Split uncompress.h to mach-omap1 and mach-omap2 --- 1c7ebf17a4d874fe38226a4f5990cb7be702e331