Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorFelix Blyakher <felixb@sgi.com>
Tue, 24 Mar 2009 19:25:34 +0000 (14:25 -0500)
committerFelix Blyakher <felixb@sgi.com>
Tue, 24 Mar 2009 19:25:34 +0000 (14:25 -0500)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge