The following changes since commit 9eed48c8bec98425dbd995dd72c40e9ad7a8c26b:

Merge branch 'master' of http://git.denx.de/u-boot-sparc (2015-12-04 17:50:34 -0500)

are available in the git repository at:

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

for you to fetch changes up to f118fe5cf960702f5d57e4f60ec3e488215544dc:

altera_qspi: fix erase and write error code (2015-12-06 11:31:29 +0800)

---------------------------------------------------------------- Thomas Chou (2): altera_qspi: add lock unlock ops altera_qspi: fix erase and write error code

drivers/mtd/altera_qspi.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 2 deletions(-)