Linux 4.1-rc7
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Jun 2015 03:23:50 +0000 (20:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Jun 2015 03:23:50 +0000 (20:23 -0700)
Makefile

diff --cc Makefile
Simple merge