projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2cf3afc ddbd2b7)
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)
commitb0bc65729070b9cbdbb53ff042984a3c545a0e34
tree1f2d4bbb22209a21fbdbaa3279ff7b6e8062e681tree | snapshot (tar.gz zip)
parent2cf3afcd4cbe0e32b8722fc291e9255de1b4d6c6commit | diff
parentddbd2b7ad99a418c60397901a0f3c997d030c65ecommit | diff
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