Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sun, 14 Apr 2013 08:38:37 +0000 (10:38 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sun, 14 Apr 2013 08:38:37 +0000 (10:38 +0200)
commit8dc16cf9dd6196d99969d12741df186a61a2f9a3
tree9a708a8fc9cfaa2cedbcb60900d72c3807b3e522
parentf84a7b8f54db51172a50926be8b2224413977f75
parent0f1411bc8dade4472ca802f46f75714e67301bb0
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
drivers/spi/mxc_spi.c