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)
commit12e94471b2be5ef9b55b10004a3a2cd819490036
treef84ae818687dc7c35bd54f11bfb9717278d28a4e
parent79315068f4560f3f7bd6e9790190dcb43059770c
parentcb655d0f3d57c23db51b981648e452988c0223f9
Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6
MAINTAINERS