Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752298Ab1CUIVg (ORCPT ); Mon, 21 Mar 2011 04:21:36 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:35106 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751963Ab1CUIVf (ORCPT ); Mon, 21 Mar 2011 04:21:35 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; b=GGdT1U+zDv4GS7VYUDT6UtT7175z4m1bu/ZrRG0Yu6YDY03S4lgIAjNlb2I2ltrFPI v3qhQhJCBKTLdgsddvDu6ktPS+DfVAJYhtAzOD6huUbVOp7J+texbj1i7Bc7ZgU5/I8i yFhJO28nkveCacUQOxjpFVMWK5w97gmTJ4uX4= MIME-Version: 1.0 In-Reply-To: <20110321122615.8a639909.sfr@canb.auug.org.au> References: <20110321122615.8a639909.sfr@canb.auug.org.au> Date: Mon, 21 Mar 2011 09:21:34 +0100 X-Google-Sender-Auth: EdgmRxMGaDexlQYmvPAuHFm86SA Message-ID: Subject: Re: linux-next: manual merge of the mfd tree with Linus' tree From: Linus Walleij To: Stephen Rothwell , Samuel Ortiz Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Philippe Langlais Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 481 Lines: 14 2011/3/21 Stephen Rothwell : > I fixed them up (see below) and can carry the fix as necessary. Fix looks correct, Sam if you push this to the MFD tree before the pull request I'll be happy. Yours, Linus Walleij -- 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/