From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [obsolete] linux-next-git-rejects.patch removed from -mm tree Date: Tue, 02 Aug 2011 13:10:50 -0700 Message-ID: <201108022008.p72K8VCr010893@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:60355 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755090Ab1HBUJE (ORCPT ); Tue, 2 Aug 2011 16:09:04 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p72K8Wl7020263 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 2 Aug 2011 13:08:32 -0700 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: akpm@linux-foundation.org, mm-commits@vger.kernel.org The patch titled linux-next-git-rejects has been removed from the -mm tree. Its filename was linux-next-git-rejects.patch This patch was dropped because it is obsolete The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: linux-next-git-rejects From: Andrew Morton Signed-off-by: Andrew Morton --- arch/arm/mach-msm/io.c | 11 +---------- drivers/video/omap2/dss/rfbi.c | 3 --- 2 files changed, 1 insertion(+), 13 deletions(-) diff -puN arch/arm/mach-msm/io.c~linux-next-git-rejects arch/arm/mach-msm/io.c --- a/arch/arm/mach-msm/io.c~linux-next-git-rejects +++ a/arch/arm/mach-msm/io.c @@ -43,14 +43,11 @@ static struct map_desc msm_io_desc[] __initdata = { MSM_DEVICE(VIC), MSM_CHIP_DEVICE(CSR, MSM7X00), -<<<<<<< HEAD MSM_DEVICE(DMOV), MSM_CHIP_DEVICE(GPIO1, MSM7X00), MSM_CHIP_DEVICE(GPIO2, MSM7X00), -======= MSM_DEVICE(GPIO1), MSM_DEVICE(GPIO2), ->>>>>>> linux-next/akpm-end MSM_DEVICE(CLK_CTL), #ifdef CONFIG_MSM_DEBUG_UART MSM_DEVICE(DEBUG_UART), @@ -81,14 +78,11 @@ void __init msm_map_common_io(void) static struct map_desc qsd8x50_io_desc[] __initdata = { MSM_DEVICE(VIC), MSM_CHIP_DEVICE(CSR, QSD8X50), -<<<<<<< HEAD MSM_DEVICE(DMOV), MSM_CHIP_DEVICE(GPIO1, QSD8X50), MSM_CHIP_DEVICE(GPIO2, QSD8X50), -======= MSM_DEVICE(GPIO1), MSM_DEVICE(GPIO2), ->>>>>>> linux-next/akpm-end MSM_DEVICE(CLK_CTL), MSM_DEVICE(SIRC), MSM_DEVICE(SCPLL), @@ -145,14 +139,11 @@ void __init msm_map_msm8960_io(void) static struct map_desc msm7x30_io_desc[] __initdata = { MSM_DEVICE(VIC), MSM_CHIP_DEVICE(CSR, MSM7X30), -<<<<<<< HEAD MSM_DEVICE(DMOV), MSM_CHIP_DEVICE(GPIO1, MSM7X30), MSM_CHIP_DEVICE(GPIO2, MSM7X30), -======= - MSM_DEVICE(GPIO1), MSM_DEVICE(GPIO2), ->>>>>>> linux-next/akpm-end + MSM_DEVICE(GPIO1), MSM_DEVICE(CLK_CTL), MSM_DEVICE(CLK_CTL_SH2), MSM_DEVICE(AD5), diff -puN drivers/video/omap2/dss/rfbi.c~linux-next-git-rejects drivers/video/omap2/dss/rfbi.c --- a/drivers/video/omap2/dss/rfbi.c~linux-next-git-rejects +++ a/drivers/video/omap2/dss/rfbi.c @@ -33,12 +33,9 @@ #include #include #include -<<<<<<< HEAD #include #include -======= #include ->>>>>>> linux-next/akpm-end #include