diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-23 20:19:32 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-23 20:19:32 +0100 |
commit | d227e87e6c939c6071def92bc7691ad774c733ff (patch) | |
tree | 31fbc74974da765322b26de321e0b33f2f7e1478 /drivers/hwmon/adm1025.c | |
parent | [PATCH] correct sys_shmget allocation check (diff) | |
parent | [MIPS] Vr41xx: Fix after GENERIC_HARDIRQS_NO__DO_IRQ change (diff) | |
download | linux-d227e87e6c939c6071def92bc7691ad774c733ff.tar.xz linux-d227e87e6c939c6071def92bc7691ad774c733ff.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] Vr41xx: Fix after GENERIC_HARDIRQS_NO__DO_IRQ change
[MIPS] SMTC: Instant IPI replay.
Diffstat (limited to 'drivers/hwmon/adm1025.c')
0 files changed, 0 insertions, 0 deletions