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

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