Date: Fri, 29 Feb 2008 15:39:58 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Matthew Wilcox <matthew@wil.cx>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
       Haavard Skinnemoen <hskinnemoen@atmel.com>, Greg KH <greg@kroah.com>,
       Mark Fasheh <mark.fasheh@oracle.com>
Subject: linux-next: semaphore update merge conflicts
Message-Id: <20080229153958.fc34e281.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
 micalg="PGP-SHA1";
 boundary="Signature=_Fri__29_Feb_2008_15_39_58_+1100_xYLvEupO09x=JdZs"
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1347
Lines: 42

--Signature=_Fri__29_Feb_2008_15_39_58_+1100_xYLvEupO09x=JdZs
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Willy,

Not as bad as I thought it might be!  :-)

The merge had the following conflicts:

	Documentation/feature-removal-schedule.txt
		Conflicts with the ocfs2 tree - trivial to fix.
	arch/avr32/kernel/semaphore.c
		the avr32 tree appeared to just change spaces to tabs
		in this file so I removed it (as your changes did).
	include/linux/memory.h
		the driver-core changed the semaphore in here to a mutex,
		so the change from asm/semaphore.h to linux/semaphore.h
		is no longer needed.

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

--Signature=_Fri__29_Feb_2008_15_39_58_+1100_xYLvEupO09x=JdZs
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFHx4yrTgG2atn1QN8RAg+oAJ92y0ksAUmZSMwIhL1d1tZoxYb36gCgjuGm
YsQJardJ6xvQCbGLJWMQcsQ=
=ClHQ
-----END PGP SIGNATURE-----

--Signature=_Fri__29_Feb_2008_15_39_58_+1100_xYLvEupO09x=JdZs--
--
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/