diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-08 11:51:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-08 11:51:04 -0700 |
| commit | b0bc65729070b9cbdbb53ff042984a3c545a0e34 (patch) | |
| tree | 1f2d4bbb22209a21fbdbaa3279ff7b6e8062e681 /net/ipv6/ip6_output.c | |
| parent | Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux (diff) | |
| parent | Code of Conflict (diff) | |
| download | linux-dev-b0bc65729070b9cbdbb53ff042984a3c545a0e34.tar.xz linux-dev-b0bc65729070b9cbdbb53ff042984a3c545a0e34.zip | |
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
Diffstat (limited to 'net/ipv6/ip6_output.c')
0 files changed, 0 insertions, 0 deletions