Merge branch 'imx-drm-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into stagin...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 6 May 2014 13:26:31 +0000 (06:26 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 6 May 2014 13:26:31 +0000 (06:26 -0700)
commitc4784756a53f7b17056f5d86fe0eb9740d235578
tree849beeea92941632ed609292eb1ad9ce7c6a4855
parenta3476ac678dfec74075ce98396db7cb1d448fd4b
parent1e6d486be4ea3f17c99c933703f53a6d566292a9
Merge branch 'imx-drm-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into staging-next

imx-drm fixes from Russell
drivers/staging/imx-drm/ipu-v3/ipu-common.c
drivers/staging/imx-drm/ipu-v3/ipu-dc.c