Merge branch 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 May 2010 22:48:13 +0000 (15:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 May 2010 22:48:13 +0000 (15:48 -0700)
commit722154e4cacf015161efe60009ae9be23d492296
tree8e817996d940c84adbfac832f08c4db9378c0813
parent1d7746cb411d8b10c0ac934cae6c58bd1ece9616
parent0fd6b32b3b2f5c1bfd412de7b5fd040fb31b6712
Merge branch 'zerolen' of git://git./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