Linux 3.18-rc3
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Nov 2014 23:01:51 +0000 (15:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Nov 2014 23:01:51 +0000 (15:01 -0800)
Makefile

diff --cc Makefile
Simple merge