]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge git://git.infradead.org/users/dwmw2/random-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Aug 2008 16:14:49 +0000 (09:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Aug 2008 16:14:49 +0000 (09:14 -0700)
* git://git.infradead.org/users/dwmw2/random-2.6:
  [MTD] Fix !CONFIG_BLOCK compile for mtdsuper.c
  firmware: silence __fw_modbuild and __fw_modinst 'Nothing to be done' messages


Trivial merge