]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
* '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


Trivial merge