]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Nov 2008 21:13:48 +0000 (13:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Nov 2008 21:13:48 +0000 (13:13 -0800)
commitc93fc2873edcd3eae0ed11ba288a77f3ef62e92b
tree25b71493b3edf8e8fae4b219e1c8b1911eb41d60
parente3b4ae79e91447bbd883df12d52ef2be9b12be61
parenta24e849c019f15796984be9fe301fa9ead6f0f9e
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