From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759580Ab2JLMSJ (ORCPT ); Fri, 12 Oct 2012 08:18:09 -0400 Received: from void.printf.net ([89.145.121.20]:57793 "EHLO void.printf.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758977Ab2JLMSH (ORCPT ); Fri, 12 Oct 2012 08:18:07 -0400 From: Chris Ball To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org Subject: [GIT PULL] MMC merge for 3.7-rc1, part 2 Date: Fri, 12 Oct 2012 08:17:54 -0400 Message-ID: <87lifb3mvh.fsf@octavius.laptop.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, Please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git tags/mmc-merge-for-3.7-rc1-part2 to receive two more changes for 3.7. There are no conflicts. Thanks. The following changes since commit 12250d843e8489ee00b5b7726da855e51694e792: Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux (2012-10-11 10:27:51 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git tags/mmc-merge-for-3.7-rc1-part2 for you to fetch changes up to 60fe5771be6aa3f37d5887aa01c04f733130a559: UAPI: (Scripted) Disintegrate include/linux/mmc (2012-10-11 17:27:54 -0400) ---------------------------------------------------------------- - Disintegrate UAPI, fix a mismerge that caused a build error. ---------------------------------------------------------------- David Howells (1): UAPI: (Scripted) Disintegrate include/linux/mmc Marek Vasut (1): mmc: mxs-mmc: Fix merge issue causing build error drivers/mmc/host/mxs-mmc.c | 2 +- include/linux/mmc/Kbuild | 1 - include/uapi/linux/mmc/Kbuild | 1 + include/{ => uapi}/linux/mmc/ioctl.h | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename include/{ => uapi}/linux/mmc/ioctl.h (100%) -- Chris Ball One Laptop Per Child