From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 23 Jan 2007 19:02:11 +0000 (-0800)
Subject: Merge branch 'ftape' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
X-Git-Tag: v3.12-rc1~31899
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6d7de67c5e4f2e9cdcf9b0a096380846e6a8278b;p=kernel%2Fkernel-generic.git

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
---

6d7de67c5e4f2e9cdcf9b0a096380846e6a8278b