Re-base against kernel 3.16.1