From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 4 Mar 2012 00:33:51 +0000 (-0800)
Subject: Merge tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
X-Git-Tag: submit/tizen_common/20140905.094502~5858
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=233ba2c5ffcf83f3dee3f4451724273f76cb7d8b;p=sdk%2Femulator%2Femulator-kernel.git

Merge tag 'parisc-fixes' of git://git./linux/kernel/git/jejb/parisc-2.6

PARISC fixes from James Bottomley:
 "This is a set of build fixes to get the cross compiled architecture
  testbeds building again"

* tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
  [PARISC] don't unconditionally override CROSS_COMPILE for 64 bit.
  [PARISC] include <linux/prefetch.h> in drivers/parisc/iommu-helpers.h
  [PARISC] fix compile break caused by iomap: make IOPORT/PCI mapping functions conditional
---

233ba2c5ffcf83f3dee3f4451724273f76cb7d8b