Make device detection robust.

I am not 100% sure that "mmc0:0001" is suitable for all devices.
Merge branch 'master' into linux-3.0