tree b7933dced01add02249af35f5497e77cd11dbfdf
parent 94b6da5ab8293b04a300ba35c72eddfa94db8b02
parent 0025427eee4b5c005b4ac7a6489adc773e38611d
author Linus Torvalds <torvalds@linux-foundation.org> 1224778616 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1224778616 -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: Add config files for Diamond 232L - Rev B processor variant
  xtensa: Fix io regions
  xtensa: Add support for the Sonic Ethernet device for the XT2000 board.
  xtensa: replace remaining __FUNCTION__ occurrences
  xtensa: use newer __SPIN_LOCK_UNLOCKED macro
  XTENSA: warn about including <asm/rwsem.h> directly.