tree 8e817996d940c84adbfac832f08c4db9378c0813
parent 1d7746cb411d8b10c0ac934cae6c58bd1ece9616
parent 0fd6b32b3b2f5c1bfd412de7b5fd040fb31b6712
author Linus Torvalds <torvalds@linux-foundation.org> 1273099693 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1273099693 -0700

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