Re: [PATCH] iwlwifi: pcie: fix merge damage
From: Johannes Berg <johannes@sipsolutions.net>
Date: 2013-10-02 09:41:50
On Mon, 2013-09-30 at 11:02 +0200, Johannes Berg wrote:
From: Johannes Berg <redacted> The merge b35c8097 seems to have lost commit eabc4ac5d, put the code back.
I'm rebasing my tree on -rc1, which actually includes the merge commit, so it still makes sense for me to include this commit - I've done that now. Sorry for the confusion. johannes