Merge 4.3-rc3 into staging-next
commitbcabc6f32888435932364702ebf368164dea6678
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Sep 2015 23:52:40 +0000 (29 01:52 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Sep 2015 23:52:40 +0000 (29 01:52 +0200)
tree34e88561ca4acf1b663e972ea48e7f3e3f4c9efc
parent60d6a21b1ec25629e93f11464fae3b2045c3370f
parent9ffecb10283508260936b96022d4ee43a7798b4c
Merge 4.3-rc3 into staging-next

We want the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/staging/fbtft/fb_uc1611.c
drivers/staging/fbtft/fb_watterott.c
drivers/staging/fbtft/fbtft-core.c
drivers/staging/fbtft/flexfb.c