| commit | 2ba16c4f456eb63f54b1d8b065377d41a1cd6a14 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Dec 18 10:23:29 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Dec 18 10:23:29 2010 -0800 |
| tree | 9d3ac965a867d5b6e6950dee8efba7cb5d61621d | |
| parent | 46bdfe6a50b88942f5323f837a3afd93a1c86e60 [diff] | |
| parent | 081d835fa4ce70ad1e42ac76de850a49e23a1557 [diff] |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: MIPS: Fix build errors in sc-mips.c