Merge branch 'opw-next' into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 22 Nov 2013 22:28:31 +0000 (14:28 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 22 Nov 2013 22:28:31 +0000 (14:28 -0800)
commit82d939ecf0469f0af048724fdbca544f02baed7f
tree8596e5b265fe4279c6afd9ca75f304aacac6d15f
parent6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae
parent4f317748f2660cb62bcf43aac368aa42dbeb2b78
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>
drivers/staging/bcm/Bcmchar.c
drivers/staging/dwc2/platform.c
drivers/staging/imx-drm/imx-drm-core.c
drivers/staging/lustre/lustre/llite/namei.c
drivers/staging/media/lirc/lirc_serial.c
drivers/staging/media/lirc/lirc_zilog.c
drivers/staging/rtl8188eu/os_dep/osdep_service.c