]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a3a7e71 9b48c1e)
Merge tag 'cc-4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Mar 2015 18:51:04 +0000 (11:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Mar 2015 18:51:04 +0000 (11:51 -0700)
commit170bf8c474efe56bb4f660a578f9b568ea0b2314
tree1f2d4bbb22209a21fbdbaa3279ff7b6e8062e681tree | snapshot
parenta3a7e718cbf5a82ffacdf9ac6879342be72df4a8commit | diff
parent9b48c1e2ee8e24d40283e066ec726298658d791bcommit | diff
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
Linux Kernel Source Tree.