| commit | c93fc2873edcd3eae0ed11ba288a77f3ef62e92b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Nov 20 13:13:48 2008 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Nov 20 13:13:48 2008 -0800 |
| tree | 25b71493b3edf8e8fae4b219e1c8b1911eb41d60 | |
| parent | e3b4ae79e91447bbd883df12d52ef2be9b12be61 [diff] | |
| parent | a24e849c019f15796984be9fe301fa9ead6f0f9e [diff] |
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