Merge git://git.infradead.org/users/dwmw2/random-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Aug 2008 00:03:56 +0000 (17:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Aug 2008 00:03:56 +0000 (17:03 -0700)
commitc635fd3d3de9dec4729135add72c2ff32595605b
tree9617681bd52cf63ae0797acc1ab13aefca2ed7d7
parent82e68f7ffec3800425f2391c8c86277606860442
parentcf368d2f9aced8adc8bd6b1f04294a71551d5fce
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