projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8dba8f9 17cf444)
Merge branch 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Mar 2010 20:42:00 +0000 (13:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Mar 2010 20:42:00 +0000 (13:42 -0700)
* 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  Delete zero-length file drivers/mtd/maps/omap_nor.c


Trivial merge
John Crispins staging tree