nuke old git patch, comment out conflicting arm patch, maybe merged.. svn path=/dists/trunk/linux-2.6/; revision=10656