Revert "omap: usb: host: merge and adapt settings from 3.4 backpüoprt to 3.0.31"

This reverts commit e68f360d196fc45dddd80cff4f61ff0f837a457c.
Revert "nf: xt_qtaguid: fix handling for cases where tunnels are used."

This reverts commit 41d3350cc56d21093129eeffca69b7916bfa500f.