Acked-by:
Acked-by:
Posted Mar 10, 2015 12:29 UTC (Tue) by meuh (guest, #22042)Parent article: The kernel's code of conflict
The commit (for the list of 'Acked-by:'):
https://git.kernel.org/cgit/linux/kernel/git/torvalds/lin...
And the merge (for the note from Linus):
https://git.kernel.org/cgit/linux/kernel/git/torvalds/lin...
