Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorFelix Blyakher <felixb@sgi.com>
Wed, 18 Feb 2009 21:35:05 +0000 (15:35 -0600)
committerFelix Blyakher <felixb@sgi.com>
Wed, 18 Feb 2009 21:35:05 +0000 (15:35 -0600)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge