From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933109Ab1FABNd (ORCPT ); Tue, 31 May 2011 21:13:33 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:46338 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933005Ab1FABNc (ORCPT ); Tue, 31 May 2011 21:13:32 -0400 Date: Wed, 1 Jun 2011 11:13:20 +1000 From: Stephen Rothwell To: Chris Ball Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Shawn Guo , Anton Vorontsov , Grant Likely Subject: linux-next: manual merge of the mmc tree with Linus' tree Message-Id: <20110601111320.07b07b7f.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.1.1 (GTK+ 2.24.4; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Wed__1_Jun_2011_11_13_20_+1000_J7AGBdET1Xn5F9EW" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Wed__1_Jun_2011_11_13_20_+1000_J7AGBdET1Xn5F9EW Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Chris, Today's linux-next merge of the mmc tree got a conflict in drivers/mmc/host/sdhci-of-core.c between commit b1608d69cb80 ("drivercore: revert addition of of_match to struct device") from Linus' tree and commit e2d0d7dc5542 ("mmc: sdhci: make sdhci-of device drivers self registered") from the mmc tree. The latter removes the file, so I did that (I *think* that the change from the former is no longer needed, but someone should check). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Wed__1_Jun_2011_11_13_20_+1000_J7AGBdET1Xn5F9EW Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAEBAgAGBQJN5ZIwAAoJEDMEi1NhKgbs7UIH/RmjlRj3dKaJaecVeC/9QMM9 LVWlGwuimZ3jcoEpATkouyQBoeE/c+0IlIsomw6qwZbr+L0zyZ+IBkhcFJVGLisV eF5WBdMJPjO8qcTq5DIJdo5Ucsr1xWUe97CSMhkEPtoyGYzpZxnso1WD3wYnumaj 4wCW6I+l+9xEVId4XIpRjlZE4BevQ6j/F+Hc9PSj8cufm4uXCF38xI+jpCvWbhbB xUv2/o98C1/GhXbT+HvEzJd68KhTnZa2nCeDlIJ13nFtvccA/sXJO8pUvqsBJBuh x9A9rs001/T43ViQxOWOGLw2bzLdVOYyOOG6QWc888DCAj4u2qIH+VTZeCKKDfA= =Z1Lv -----END PGP SIGNATURE----- --Signature=_Wed__1_Jun_2011_11_13_20_+1000_J7AGBdET1Xn5F9EW--