commit r46299 broke the mvebu target because one patch does not apply any more. This commit closes #20070. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 46303