Merge "Remove debugging code for a fixed 3.6 kernel bug."