Excluded uart2
Merge branch 'trik-linux-3.6.7-code-cleanup' into trik-linux-3.6.7-usb-rework