6D has this feature, you can test with BackyardEOS.
There is no need to manually enable/disable the mirror lock either as it can be done electronically if the software suports it.
I believe it's for all newer xD and x0D models so both your cameras should support it.
