summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-16 01:31:05 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-16 01:31:05 +0100
commita3dd15444baa9c7522c8457ab564c41219dfb44c (patch)
tree0571fdb4d7201376c03f474e2023144de62e8f1c /arch/um
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parent[ARM] 5348/1: fix documentation wrt location of the alignment trap interface (diff)
downloadlinux-a3dd15444baa9c7522c8457ab564c41219dfb44c.tar.xz
linux-a3dd15444baa9c7522c8457ab564c41219dfb44c.zip
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
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions