Merge branch 'ftape' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Jan 2007 19:02:11 +0000 (11:02 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Jan 2007 19:02:11 +0000 (11:02 -0800)
commit6d7de67c5e4f2e9cdcf9b0a096380846e6a8278b
tree6ef5df2b67b7070836261c974b706c44884cfa0f
parentb7e72ba03be900a7b2e7b3b02e1bb646dff03c46
parentb3a242b75361936ab9a42c42c44ea35e79a9d4cd
Merge branch 'ftape' of /linux/kernel/git/jgarzik/misc-2.6

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