Changes in README.mx6qsabrelite

e20cc2ca15b5b0644f51b6e58d530d70acd2bc00 - Merge branch 'master' of git://88.191.163.10/u-boot-arm

Sun, 18 Aug 2013 18:14:34 +0000

Merge branch 'master' of git://88.191.163.10/u-boot-armFixup an easy conflict over adding the clk_get prototype and USB_OTGdefines for am33xx having moved.Conflicts: arch/arm/include/asm/arch-am33xx/hardware.hSigned-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/board/boundary/nitrogen6x/README.mx6qsabrelite

9ed887caecb9ecb0c68773a1870d143b9f28d3da - Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Sat, 17 Aug 2013 16:24:13 +0000

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' List of files: /rk3399_rockchip-uboot/board/boundary/nitrogen6x/README.mx6qsabrelite

f8b1e86d4707718e52cf6466845e463c358627ee - mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x

Fri, 26 Jul 2013 14:37:17 +0000

mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6xmx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid thecode duplication and only use the nitrogen6x source code to make board codemaintainance easier.Tested booting a mainline device tree kernel on a mx6qsabrelite board.Signed-off-by: Fabio Estevam List of files: /rk3399_rockchip-uboot/board/boundary/nitrogen6x/README.mx6qsabrelite