[U-Boot] [PULL] u-boot-atmel/master -> u-boot-arm/master

[Andreas Bießmann]

Dear Albert Aribaud,

please pull the following fix ups from u-boot-atmel/master into
u-boot-arm/master.

The following changes since commit d2c7074b9593d822e2359a09c21747248fdf5fac:

  ARM: OMAP5: clocks: Update MPU settings for OPP_NOM (2013-12-12 17:43:39 -0500)

are available in the git repository at:

  git://git.denx.de/u-boot-atmel.git master

for you to fetch changes up to d51a2a2d63d83207b56a7aef7a191d081058d6ae:

  arm: atmel: at91sam9x5: move CONFIG_SYS_NO_FLASH to proper position (2013-12-17 17:21:18 +0100)

----------------------------------------------------------------
Bo Shen (3):
      arm: atmel: at91sam9x5: cleanup cs configure for spi
      arm: atmel: at91sam9x5: cleanup unneeded undef
      arm: atmel: at91sam9x5: move CONFIG_SYS_NO_FLASH to proper position

 board/atmel/at91sam9x5ek/at91sam9x5ek.c |    1 -
 include/configs/at91sam9x5ek.h          |   13 +++----------
 2 files changed, 3 insertions(+), 11 deletions(-)