Merge git://git.infradead.org/~dwmw2/dwmw2-2.6.27
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Sep 2008 21:31:54 +0000 (14:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Sep 2008 21:31:54 +0000 (14:31 -0700)
* git://git.infradead.org/~dwmw2/dwmw2-2.6.27:
  Revert "[ARM] use the new byteorder headers"
  Fix conditional export of kvh.h and a.out.h to userspace.
  [MTD] [NAND] tmio_nand: fix base address programming


Trivial merge