Linux v2.6.17-rc1 v2.6.17-rc1
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 3 Apr 2006 03:22:10 +0000 (20:22 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 3 Apr 2006 03:22:10 +0000 (20:22 -0700)
Close of the merge window..

Makefile

diff --cc Makefile
Simple merge