At some point during rebases these were shuffled around. Put them in the
right order again (sorted by unit-address).
Signed-off-by: Thierry Reding <treding@nvidia.com>