tree 25b71493b3edf8e8fae4b219e1c8b1911eb41d60
parent e3b4ae79e91447bbd883df12d52ef2be9b12be61
parent a24e849c019f15796984be9fe301fa9ead6f0f9e
author Linus Torvalds <torvalds@linux-foundation.org> 1227215628 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1227215628 -0800

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: csrc-r4k: Fix declaration depending on the wrong CONFIG_ symbol.
  MIPS: csrc-r4k: Fix spelling mistake.
  MIPS: RB532: Provide functions for gpio configuration
  MIPS: IP22: Make indy_sc_ops variable static
  MIPS: RB532: GPIO register offsets are relative to GPIOBASE
  MIPS: Malta: Fix include paths in malta-amon.c