From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Aug 2010 15:49:42 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6
X-Git-Tag: MMI-PSA29.97-13-9~23085
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=66eddbfcc1f6610fa7c73c8d20a57eaf8e284e2f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge git://git./linux/kernel/git/czankel/xtensa-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
  xtensa: Disable PCI and nfsroot on simulation target
  xtensa: Add missing include in coprocessor.h
  xtensa: Fix the network driver for the simulator target
  xtensa: Shuffle include statements to fix linker script
  xtensa: Add -mforce-no-pic option is supported
  xtensa: Fixes due to bss boundary symbol name changes.
  xtensa: Fix linker script patch-up
  xtensa: Fix FLUSH_DCACHE macro for some variants.
---

66eddbfcc1f6610fa7c73c8d20a57eaf8e284e2f