diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-12 09:25:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-12 09:25:10 -0700 |
| commit | 8c57a8fa4e9226a44c4e98327852936df3b6791b (patch) | |
| tree | 683ee9cf0eb5e249ac41c64ef711ca9a8f2b6fbf /arch/um/kernel/time.c | |
| parent | 0789d8fccb5673001b54536d8f2f87f5db0d646f (diff) | |
| parent | 0a7c808fccc86418acf0e0b4b119094fb56af952 (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: IP27: Enable RAID5 module
MIPS: TXx9: update defconfigs
MIPS: NEC VR5500 processor support fixup
MIPS: Fix build of non-CONFIG_SYSVIPC version of sys_32_ipc
Diffstat (limited to 'arch/um/kernel/time.c')
0 files changed, 0 insertions, 0 deletions