Blackfin arch: fix merge errors during 2.6.26 upgrade
[h-e-n] / virt /
drwxr-xr-x   ..
drwxr-xr-x - kvm