Merge branch 'ib-iio-mfd-ti335x_dma' into togreg
authorJonathan Cameron <jic23@kernel.org>
Sat, 5 Nov 2016 17:38:00 +0000 (17:38 +0000)
committerJonathan Cameron <jic23@kernel.org>
Sat, 5 Nov 2016 17:38:00 +0000 (17:38 +0000)
commit25acb3986f3e14210f37eb5503beba8e35126a3e
treefb150e29c2ac679324cda6dac962b7a34b839c1a
parentbc3ae982e2fb498e2f5492497ea927a161380bc1
parentf438b9da75eb80eb6c4095a5b75324cc9a7f0570
Merge branch 'ib-iio-mfd-ti335x_dma' into togreg

A local branch created as Lee requested these two patches were applied
in a fashion that would later let him merge the same branch into MFD
if needed.