diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 12:53:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 12:53:33 -0700 |
| commit | e61467e9b6c88e97560873603cf9aceaf7435480 (patch) | |
| tree | 2b0a75dd5a263f82d520bdfb28da71210471c998 /drivers/watchdog/cpu5wdt.c | |
| parent | c732acd96085347027b11961463a243c568d9aab (diff) | |
| parent | 09d9327b3420002c9952a81db37effec9dc1135e (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:
CHAR: Delete old and now unused M48T35 RTC driver for SGI IP27.
CHAR: Delete old and now unused DS1286 driver.
MIPS: Sort out CPU type to name translation.
MIPS: Use the new byteorder headers
MIPS: Probe for watch registers on cores of all vendors, not just MTI.
MIPS: Switch FPU emulator trap to BREAK instruction.
MIPS: SMP: Do not initialize __cpu_number_map/__cpu_logical_map for CPU 0.
MIPS: Consider value of c0_ebase when computing value of exception base.
MIPS: Clean up MIPSxx-optimized bitop functions
MIPS: New feature test macro cpu_has_mips_r
MIPS: RBTX4927: Add GPIO-LED support
MIPS: TXx9: Fix RBTX4939 ethernet address initialization
Diffstat (limited to 'drivers/watchdog/cpu5wdt.c')
0 files changed, 0 insertions, 0 deletions