From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Aug 2008 00:03:56 +0000 (-0700)
Subject: Merge git://git.infradead.org/users/dwmw2/random-2.6
X-Git-Tag: v2.6.27-rc2~62
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=c635fd3d3de9dec4729135add72c2ff32595605b

Merge git://git.infradead.org/users/dwmw2/random-2.6

* git://git.infradead.org/users/dwmw2/random-2.6:
  drivers/video/console/promcon.c: fix build error
  Fix IHEX firmware generation/loading
---

c635fd3d3de9dec4729135add72c2ff32595605b