Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 7 Oct 2010 02:11:17 +0000 (19:11 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 7 Oct 2010 02:11:17 +0000 (19:11 -0700)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge