update nand from upstream

  from aml_nand-2014-06-18-f60aa09b10

Signed-off-by: KhasMek <Boushh@gmail.com>