doc: sl-mx8mm: Fix mistake in merge conflict resolution
[platform/kernel/u-boot.git] / doc / README.i2c
2015-08-30 Tom RiniMerge branch 'master' of git://git.denx.de/u-boot-video
2015-08-06 Tom RiniMerge git://git.denx.de/u-boot-dm
2015-08-06 Simon Glassi2c: Add a mux for GPIO-based I2C bus arbitration