Code of Conflict

This file provides a basic guide for how to handle conflict resolution
when it comes up in the development process.

Acked-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Arjan van de Ven <arjanvandeven@gmail.com>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Chris Ball <chris@printf.net>
Acked-by: Chris Mason <clm@fb.com>
Acked-by: Chris Metcalf <cmetcalf@ezchip.com>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Dave Airlie <airlied@redhat.com>
Acked-by: David Herrmann <dh.herrmann@gmail.com>
Acked-by: Fabio Estevam <festevam@gmail.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Grant Likely <grant.likely@linaro.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Hannes Reinecke <hare@suse.de>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Hugh Dickins <hughd@google.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Jaegeuk Kim <jaegeuk@kernel.org>
Acked-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Acked-by: Jens Axboe <axboe@kernel.dk>
Acked-by: Jes Sorensen <Jes.Sorensen@gmail.com>
Acked-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Johan Hovold <johan@kernel.org>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: John W. Linville <linville@tuxdriver.com>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Acked-by: Josh Triplett <josh@joshtriplett.org>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Kristen Carlson Accardi <kristen@linux.intel.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Acked-by: Magnus Damm <damm@opensource.se>
Acked-by: Mark Brown <broonie@kernel.org>
Acked-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Acked-by: NeilBrown <neilb@suse.de>
Acked-by: Olof Johansson <olof@lixom.net>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Rafael J. Wysocki <rafael@kernel.org>
Acked-by: Rik van Riel <riel@redhat.com>
Acked-by: Sachin Prabhu <sprabhu@redhat.com>
Acked-by: Shuah Khan <shuahkh@osg.samsung.com>
Acked-by: Simon Horman <horms@verge.net.au>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Theodore Ts'o <tytso@mit.edu>
Acked-by: Tony Luck <tony.luck@intel.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Willy Tarreau <w@1wt.eu>
Acked-by: Zefan Li <lizefan@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>