tree 1495a9238c7ee207d384737d3b777c0e21b75771
parent 353d5c30c666580347515da609dd74a2b8e9b828
parent 94da210af4978b94cb70318bd1b282a73c50b175
author Linus Torvalds <torvalds@linux-foundation.org> 1251143625 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1251143625 -0700

Merge branch 'fixes' of git://git.marvell.com/orion

* '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