- linux 3.17 fixes from upstream
- rel 2