Linux 3.18
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Dec 2014 22:21:05 +0000 (14:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Dec 2014 22:21:05 +0000 (14:21 -0800)
Makefile

diff --cc Makefile
Simple merge