Revert "Revert "nf: xt_qtaguid: fix handling for cases where tunnels are used.""

This reverts commit 9aad059935341c4ce02a3f5806a76e824eba37d4.
Revert changes to ehci-omap

Revert "Backport all workarounds for usb resume on omap from 3.4"
This reverts commit 0f88bf6cd3e6400f899b4063f8a25e4fc261b9a2.

Revert "omap4-common: Update Workaround for OMAP errata i640"
This reverts commit 7e1a92bb0597e7c271b586eeb6e037b9c2e1b60f.

Revert "revert and re-enable usb_phy_resume_workaround"
This reverts commit 7061d669c7b7dcff4f83906c5f90a3abf6c74e27.

Revert "disable usb_phy_resume_workaround for now"
This reverts commit be675504e6db17acb8e5b8c07b9934fc59778705.

Revert "sync omap4_ehci_phy_hub_control and clean up usb_phy_resume_workaround"
This reverts commit 326a34f2b95961ca676d1390bff149ebc2a203fc.