Compare commits

..

No commits in common. "a7fa81578f1fb0959412f15ad9b68fb21205ce1e" and "4f197cbcad8b368ff008f32c22e8b27613d6f78e" have entirely different histories.

View file

@ -1,19 +1,6 @@
<<<<<<< HEAD
<<<<<<< HEAD
//si, bueno, testx
//dossPxa
=======
<<<<<<< Updated upstream
=======
//si, bueno, testx
>>>>>>> Stashed changes
>>>>>>> 0ff6488 (linus comes into play)
=======
//si, bueno, testx
//dossPxa
>>>>>>> f35615e (ya)
/*
* THREADIN THE LINUS: https://linux.die.net/man/2/sched_setaffinity
*/