Linux 3.18-rc7
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Dec 2014 00:42:27 +0000 (16:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Dec 2014 00:42:27 +0000 (16:42 -0800)
Makefile

diff --cc Makefile
Simple merge