- upstream updates for linux 3.12 and 3.13
- rel 7