tree 6ef5df2b67b7070836261c974b706c44884cfa0f
parent b7e72ba03be900a7b2e7b3b02e1bb646dff03c46
parent b3a242b75361936ab9a42c42c44ea35e79a9d4cd
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1169578931 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1169578931 -0800

Merge branch 'ftape' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6

* 'ftape' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  more ftape removal