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)
commit071f4924844c435a3ae0cdbab7d7df2f1da85713
treed7f339e8195c83b5e1aecc68e8173b7085d70e85
parentd9c566198bfdf72a041322a093fdc1a2dc231170
parentf1136d022af8f07a97f59c6d07483bdb82ffbd8e
Merge git://git.infradead.org/users/dwmw2/random-2.6

* 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