From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Dec 2008 00:31:05 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.28-rc9~17
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=a3dd15444baa9c7522c8457ab564c41219dfb44c;p=linux-2.6-omap-h63xx.git

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

a3dd15444baa9c7522c8457ab564c41219dfb44c