tree 98967791a802b95d37bc4035d7bdd27cf260097e
parent 6e57559022a2c6e3decfb77a228f8a354ac23ba1
parent 66630f71e23a3b5fe778d38aea2f0c6d017602bf
author Linus Torvalds <torvalds@linux-foundation.org> 1281023382 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1281023382 -0700

Merge git://git.kernel.org/pub/scm/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.