merge to: http://repo.or.cz/w/wandboard.git/commit/cc865171a19a0e84dc26a4285faf7ca75ca8403d

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>