Merge branch 'opw-next' into staging-next

This pulls in all of the staging patches applied during the opw
application process, and some other staging patches that were submitted
during that period of time.  All of these are for 3.14-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/staging/bcm/Bcmchar.c
Simple merge

diff --cc drivers/staging/dwc2/platform.c
Simple merge

diff --cc drivers/staging/imx-drm/imx-drm-core.c
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/namei.c
Simple merge

diff --cc drivers/staging/media/lirc/lirc_serial.c
Simple merge

diff --cc drivers/staging/media/lirc/lirc_zilog.c
Simple merge

diff --cc drivers/staging/rtl8188eu/os_dep/osdep_service.c
Simple merge