Merge branch 'fixes' of git://git.marvell.com/orion
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Aug 2009 19:53:45 +0000 (12:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Aug 2009 19:53:45 +0000 (12:53 -0700)
* 'fixes' of git://git.marvell.com/orion:
  [ARM] Orion NAND: Make asm volatile avoid GCC pushing ldrd out of the loop
  [ARM] Kirkwood: enable eSATA on QNAP TS-219P
  [ARM] Kirkwood: __init requires linux/init.h


Trivial merge