Changes in MAINTAINERS

e89d623f099c44b0b166ccf46bce2e6a0b99c984 - Merge branch 'master' of git://git.denx.de/u-boot-arm

Sat, 11 Oct 2014 00:59:28 +0000

Merge branch 'master' of git://git.denx.de/u-boot-arm List of files: /rk3399_rockchip-uboot/board/bachmann/ot1200/MAINTAINERS

4b19b7448e63bab8af17abbb30acff00d8f0dc99 - Merge remote-tracking branch 'u-boot-imx/master'

Wed, 08 Oct 2014 19:20:49 +0000

Merge remote-tracking branch 'u-boot-imx/master'The single file conflict below is actually trivial.Conflicts: board/boundary/nitrogen6x/nitrogen6x.c List of files: /rk3399_rockchip-uboot/board/bachmann/ot1200/MAINTAINERS

39d0973300b83c08f3f5047245ebf1de883b31f2 - imx6: add Bachmann OT1200 board

Thu, 02 Oct 2014 11:33:46 +0000

imx6: add Bachmann OT1200 boardThis patch adds support for the OT1200 series of devices.Following components are used in u-boot:+ ethernet+ i2c+ emmc+ gpioFor more details see README.Changes v1 > v2 - make use of enable_cspi_clock(..) - fix usage of OUTPUT_40OHM define - added READMEChanges v2 > v3 - improve spelling in README - added own copy of mx6q_4x_mt41j128.cfgSigned-off-by: Christian Gmeiner List of files: /rk3399_rockchip-uboot/board/bachmann/ot1200/MAINTAINERS