Linux 4.1-rc6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Jun 2015 02:01:07 +0000 (19:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Jun 2015 02:01:07 +0000 (19:01 -0700)
Makefile

diff --cc Makefile
Simple merge