Merge tag 'v2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
Chris Metcalf [Thu, 26 May 2011 15:52:04 +0000 (11:52 -0400)]
1  2 
Makefile

diff --cc Makefile
Simple merge