From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from ra.tuxdriver.com ([70.61.120.52]:4994 "EHLO ra.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750843AbYGHVIF (ORCPT ); Tue, 8 Jul 2008 17:08:05 -0400 Date: Tue, 8 Jul 2008 16:30:44 -0400 From: "John W. Linville" To: Stephen Rothwell Cc: David Miller , linux-next@vger.kernel.org, linux-wireless@vger.kernel.org Subject: linux-next: pending wireless/wireless-current merge conflict 2008-07-08 Message-ID: <20080708203044.GA6381@tuxdriver.com> (sfid-20080708_230809_683297_E6D44239) References: <20080702220212.GA31582@tuxdriver.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20080702220212.GA31582@tuxdriver.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: I just sent a pull request for Dave that will result in a merge conflict in linux-next. I have a sample merge available here: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test Just a heads-up... :-) John P.S. These are one-liners (including the one from yesterday). Nevertheless, it can't hurt to provide a reference "just in case"... :-) -- John W. Linville linville@tuxdriver.com