From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 5 May 2010 22:48:13 +0000 (-0700)
Subject: Merge branch 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
X-Git-Tag: v5.15~29703
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=722154e4cacf015161efe60009ae9be23d492296;p=mirror_ubuntu-kernels.git

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

* 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  [MTD] Remove zero-length files mtdbdi.c and internal.ho
---

722154e4cacf015161efe60009ae9be23d492296