01 Oct, 2016

1 commit


28 Feb, 2015

1 commit

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

    Acked-by: Alex Deucher
    Acked-by: Arjan van de Ven
    Acked-by: Arnaldo Carvalho de Melo
    Acked-by: Arnd Bergmann
    Acked-by: Benjamin Herrenschmidt
    Acked-by: Chris Ball
    Acked-by: Chris Mason
    Acked-by: Chris Metcalf
    Acked-by: Dan Carpenter
    Acked-by: Daniel Vetter
    Acked-by: Dave Airlie
    Acked-by: David Herrmann
    Acked-by: Fabio Estevam
    Acked-by: Felipe Balbi
    Acked-by: Geert Uytterhoeven
    Acked-by: Gerd Hoffmann
    Acked-by: Grant Likely
    Acked-by: Guenter Roeck
    Acked-by: H Hartley Sweeten
    Acked-by: Hannes Reinecke
    Acked-by: Hans Verkuil
    Acked-by: Hans de Goede
    Acked-by: Hugh Dickins
    Acked-by: Ingo Molnar
    Acked-by: Jaegeuk Kim
    Acked-by: James Bottomley
    Acked-by: Jens Axboe
    Acked-by: Jes Sorensen
    Acked-by: Johan Hedberg
    Acked-by: Johan Hovold
    Acked-by: Johannes Berg
    Acked-by: John W. Linville
    Acked-by: Jonathan Corbet
    Acked-by: Josh Triplett
    Acked-by: Julia Lawall
    Acked-by: Kees Cook
    Acked-by: Kevin Hilman
    Acked-by: Konrad Rzeszutek Wilk
    Acked-by: Kristen Carlson Accardi
    Acked-by: Kyungmin Park
    Acked-by: Laurent Pinchart
    Acked-by: Linus Walleij
    Acked-by: Luis R. Rodriguez
    Acked-by: Magnus Damm
    Acked-by: Mark Brown
    Acked-by: Mauro Carvalho Chehab
    Acked-by: Maxime Ripard
    Acked-by: Mimi Zohar
    Acked-by: NeilBrown
    Acked-by: Olof Johansson
    Acked-by: Paul E. McKenney
    Acked-by: Rafael J. Wysocki
    Acked-by: Rik van Riel
    Acked-by: Sachin Prabhu
    Acked-by: Shuah Khan
    Acked-by: Simon Horman
    Acked-by: Stephen Rothwell
    Acked-by: Stephen Warren
    Acked-by: Steven Rostedt
    Acked-by: Takashi Iwai
    Acked-by: Tejun Heo
    Acked-by: Theodore Ts'o
    Acked-by: Tony Luck
    Acked-by: Will Deacon
    Acked-by: Willy Tarreau
    Acked-by: Zefan Li
    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman