diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 16:03:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 16:03:40 -0400 |
| commit | e6bf0bf374101efc802a55beadc08eae97b75580 (patch) | |
| tree | af1507a3fe2b88803d2e18b64687ac808f5c3e89 /kernel/posix-timers.c | |
| parent | 9b5a4a676a4d6126664c3df5a11f6fe87da63133 (diff) | |
| parent | 8db0201026fbb45c383176f539dc8af2a6871ab8 (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] Fix wreckage after removal of tickadj; convert to GENERIC_TIME.
[MIPS] DECstation defconfig update
[MIPS] Fix size of zones_size and zholes_size array
[MIPS] BCM1480: Mask pending interrupts against c0_status.im.
[MIPS] SB1250: Interrupt handler fixes
[MIPS] Remove IT8172-based platforms, ITE 8172G and Globespan IVR support.
[MIPS] Remove Atlas and SEAD from feature-removal-schedule.
[MIPS] Remove Jaguar and Ocelot family from feature list.
[MIPS] BCM1250: TRDY timeout tweaks for Broadcom SiByte systems
[MIPS] Remove dead DECstation boot code
[MIPS] Let gcc align 'struct pt_regs' on 8 bytes boundary
Diffstat (limited to 'kernel/posix-timers.c')
0 files changed, 0 insertions, 0 deletions