merge linux-3.6.4-rt #1