Merge branch 'jffs-maint' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 27 Feb 2007 15:38:40 +0000 (07:38 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 27 Feb 2007 15:38:40 +0000 (07:38 -0800)
commit6c1586bc9356855159e5845c6e788aa6db333cb9
treed1e1fbafebfa45011d75e1840679d559af16affd
parent01363220f5d23ef68276db8974e46a502e43d01d
parent6eaf6fc81ab2fa8c264f819f57dc950b6ea9c651
Merge branch 'jffs-maint' of /linux/kernel/git/jgarzik/misc-2.6

* 'jffs-maint' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  remove the jffs MAINTAINERS entry