Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 4 Apr 2013 09:49:32 +0000 (11:49 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 4 Apr 2013 09:49:32 +0000 (11:49 +0200)
commitbe08abc2429c2e9cbce3d0abc1d315171d683520
tree9c3f8c892cf8918c9a5b4cd0b9b29558b0aff0e7
parent5eaa215607c8668bfa6a7183407eba8fec63d648
parentd36b39bf0d1dbe4ef03f7fc1f20b2e52eb90acf5
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
MAINTAINERS
boards.cfg
drivers/spi/mxc_spi.c