diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 22:13:48 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 22:13:48 +0100 |
| commit | c93fc2873edcd3eae0ed11ba288a77f3ef62e92b (patch) | |
| tree | 25b71493b3edf8e8fae4b219e1c8b1911eb41d60 /fs | |
| parent | Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | MIPS: csrc-r4k: Fix declaration depending on the wrong CONFIG_ symbol. (diff) | |
| download | linux-c93fc2873edcd3eae0ed11ba288a77f3ef62e92b.tar.xz linux-c93fc2873edcd3eae0ed11ba288a77f3ef62e92b.zip | |
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions