Merge branch 'armadillo800eva' of git://git.kernel.org/pub/scm/linux/kernel/git/horms...