From: Chris Ball <cjb@laptop.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
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 [thread overview]
Message-ID: <87lifb3mvh.fsf@octavius.laptop.org> (raw)
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 <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
reply other threads:[~2012-10-12 12:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lifb3mvh.fsf@octavius.laptop.org \
--to=cjb@laptop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®