tree 0571fdb4d7201376c03f474e2023144de62e8f1c
parent 7004405cb85cdc10074740705963d9ce3e887f47
parent 1ada1441e73a0f51296bfae527acbeae61ff0d52
author Linus Torvalds <torvalds@linux-foundation.org> 1229387465 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1229387465 -0800

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5348/1: fix documentation wrt location of the alignment trap interface
  [ARM] Ensure linux/hardirqs.h is included where required
  [ARM] fix kernel-doc syntax
  [ARM] arch/arm/common/sa1111.c: Correct error handling code
  [ARM] 5341/2: there is no copy_page on nommu ARM