From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Mar 2015 18:51:04 +0000 (-0700)
Subject: Merge tag 'cc-4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char... 
X-Git-Tag: firefly_0821_release~176^2~2194
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b0bc65729070b9cbdbb53ff042984a3c545a0e34;p=firefly-linux-kernel-4.4.55.git

Merge tag 'cc-4.0-rc2' of git://git./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
---

b0bc65729070b9cbdbb53ff042984a3c545a0e34