summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-05 10:10:14 -0800
committerOlof Johansson <olof@lixom.net>2012-11-05 10:10:14 -0800
commit1c7ebf17a4d874fe38226a4f5990cb7be702e331 (patch)
tree6f510bda0fb3c08d959100928ca2fb783c61739a /drivers/usb
parent6d06721570aa0c38d886e3036796d59983963a27 (diff)
parent3d82cbbb3aadb4f8a30e3f614e51be96574a0855 (diff)
downloadop-kernel-dev-1c7ebf17a4d874fe38226a4f5990cb7be702e331.zip
op-kernel-dev-1c7ebf17a4d874fe38226a4f5990cb7be702e331.tar.gz
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
Diffstat (limited to 'drivers/usb')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud