diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-04 01:33:51 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-04 01:33:51 +0100 |
commit | 233ba2c5ffcf83f3dee3f4451724273f76cb7d8b (patch) | |
tree | 559f7d1fdf647a03fc2b640168764e4a819d6576 /net | |
parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | [PARISC] don't unconditionally override CROSS_COMPILE for 64 bit. (diff) | |
download | linux-233ba2c5ffcf83f3dee3f4451724273f76cb7d8b.tar.xz linux-233ba2c5ffcf83f3dee3f4451724273f76cb7d8b.zip |
Merge tag 'parisc-fixes' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions