[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20080228.112229.135415548.davem@davemloft.net>
Date: Thu, 28 Feb 2008 11:22:29 -0800 (PST)
From: David Miller <davem@...emloft.net>
To: linville@...driver.com
Cc: netdev@...r.kernel.org, linux-wireless@...r.kernel.org
Subject: Re: pull request: wireless-2.6 2008-02-28
From: "John W. Linville" <linville@...driver.com>
Date: Thu, 28 Feb 2008 09:51:36 -0500
> This version drops the "Fix b43 drivers build for arm" patch, and adds a
> one-line build fix for SSB-attached PCI cores (found on bcm47xx mips).
Thanks.
> P.S. This will create a merge conflict with the code I already
> requested that you pull for net-2.6.26. The merge is easily resolved,
> since it is two "comment block + single statement" additions at the
> same place in the file. Just take both sets of changes, and order
> the "Evalue antenna setup" group _after_ the "Send a signal to the
> led" group. I have the conflict corrected in my wireless-testing
> tree for reference if you need it.
Understood.
> The following changes since commit d9595a7b9c777d45a74774f1428c263a0a47f4c0:
> David S. Miller (1):
> [AF_KEY]: Fix oops by converting to proc_net_*().
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master
Pulled and pushed back out, thanks John!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists