From: Linus Torvalds Date: Thu, 13 Jan 2011 19:02:05 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... X-Git-Tag: firefly_0821_release~7613^2~2875 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=03a4491f5d6835028dbbcf36990599c5c9f6ff55;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git./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 --- 03a4491f5d6835028dbbcf36990599c5c9f6ff55