Messages in this thread | | | Date | Thu, 11 Sep 2008 16:09:52 -0700 (PDT) | Subject | Re: pull request: wireless-2.6 2008-09-11 | From | David Miller <> |
| |
From: "John W. Linville" <linville@tuxdriver.com> Date: Thu, 11 Sep 2008 16:35:53 -0400
> BTW, this (obviously) introduces a merge conflict between > wireless-2.6 and wireless-next-2.6. The solution is trivial -- just > take the wireless-next-2.6 version of the affected files. Still, I > have a sample merge available here: > > git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git merge-test
Ok, I just did the merge, please double check my work.
Thanks!
| |