tree 9617681bd52cf63ae0797acc1ab13aefca2ed7d7
parent 82e68f7ffec3800425f2391c8c86277606860442
parent cf368d2f9aced8adc8bd6b1f04294a71551d5fce
author Linus Torvalds <torvalds@linux-foundation.org> 1217894636 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1217894636 -0700

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