summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 20:02:05 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 20:02:05 +0100
commit03a4491f5d6835028dbbcf36990599c5c9f6ff55 (patch)
treee2abb2baa5b71dcf1eb3786f339afbae5d27d7e4 /arch/ia64
parentMerge branch 'for-2.6.38/drivers' of git://git.kernel.dk/linux-2.6-block (diff)
parentfirewire: ohci: fix compilation on arches without PAGE_KERNEL_RO (diff)
downloadlinux-03a4491f5d6835028dbbcf36990599c5c9f6ff55.tar.xz
linux-03a4491f5d6835028dbbcf36990599c5c9f6ff55.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: ohci: fix compilation on arches without PAGE_KERNEL_RO
Diffstat (limited to 'arch/ia64')
0 files changed, 0 insertions, 0 deletions