Linux 3.18-rc4
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Nov 2014 22:55:29 +0000 (14:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Nov 2014 22:55:29 +0000 (14:55 -0800)
Makefile

diff --cc Makefile
Simple merge