Sync with heftig/linux-zen