commit b0bc65729070b9cbdbb53ff042984a3c545a0e34
author Linus Torvalds <torvalds@linux-foundation.org> Sun Mar 08 11:51:04 2015 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Sun Mar 08 11:51:04 2015 -0700
tree 1f2d4bbb22209a21fbdbaa3279ff7b6e8062e681
parent 2cf3afcd4cbe0e32b8722fc291e9255de1b4d6c6
parent ddbd2b7ad99a418c60397901a0f3c997d030c65e

Merge tag 'cc-4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull "code of conflict" from Greg KH:
 "This file tries to set the rational basis for our code reviews, gives
  some advice on how to conduct them, and provides an excalation channel
  for any kernel developers if they so desire it"

[ Let's see how this works ]

* tag 'cc-4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  Code of Conflict