Linux 4.1-rc3
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 May 2015 22:12:29 +0000 (15:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 May 2015 22:12:29 +0000 (15:12 -0700)
Makefile

diff --cc Makefile
Simple merge