Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754437AbZCJJdm (ORCPT ); Tue, 10 Mar 2009 05:33:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753912AbZCJJd3 (ORCPT ); Tue, 10 Mar 2009 05:33:29 -0400 Received: from mailrelay010.isp.belgacom.be ([195.238.6.177]:17610 "EHLO mailrelay010.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754173AbZCJJd1 (ORCPT ); Tue, 10 Mar 2009 05:33:27 -0400 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApoEAPjPtUlR9cZI/2dsb2JhbADSdgeDfgY Date: Tue, 10 Mar 2009 10:33:24 +0100 From: Wim Van Sebroeck To: Stephen Rothwell Cc: linux-next@vger.kernel.org, LKML Subject: Re: linux-next: Tree for March 10 Message-ID: <20090310093324.GA26779@infomag.iguana.be> References: <20090310195534.8f8f3c7a.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090310195534.8f8f3c7a.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 517 Lines: 16 Hi Stephen, > Merging watchdog/master > CONFLICT (content): Merge conflict in drivers/watchdog/orion5x_wdt.c > CONFLICT (content): Merge conflict in drivers/watchdog/rc32434_wdt.c I redid the linux-2.6-watchdog-next tree. Should be fixed next time. Kind regards, Wim. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/