diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-19 21:12:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-19 21:12:00 -0800 |
| commit | 4657190936883adb819f81957e33439d447c0035 (patch) | |
| tree | 70342debfb779a8b10d2a8440c1ae99593806079 /drivers/net/tokenring/lanstreamer.c | |
| parent | 4a29cc2e503b33a1e96db4c3f9a94165f153f259 (diff) | |
| parent | 9007c9a2b03ea325ee593a161dbf01dbb8222d7e (diff) | |
| download | linux-4657190936883adb819f81957e33439d447c0035.tar.gz linux-4657190936883adb819f81957e33439d447c0035.tar.bz2 linux-4657190936883adb819f81957e33439d447c0035.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] SB1: Check for -mno-sched-prolog if building corelis debug kernel.
[MIPS] Sibyte: Fix race in sb1250_gettimeoffset().
[MIPS] Sibyte: Fix interrupt timer off by one bug.
[MIPS] Sibyte: Fix M_SCD_TIMER_INIT and M_SCD_TIMER_CNT wrong field width.
[MIPS] Protect more of timer_interrupt() by xtime_lock.
[MIPS] Work around bad code generation for <asm/io.h>.
[MIPS] Simple patch to power off DBAU1200
[MIPS] Fix DBAu1550 software power off.
[MIPS] local_r4k_flush_cache_page fix
[MIPS] SB1: Fix interrupt disable hazard.
[MIPS] Get rid of the IP22-specific code in arclib.
Update MAINTAINERS entry for MIPS.
Diffstat (limited to 'drivers/net/tokenring/lanstreamer.c')
0 files changed, 0 insertions, 0 deletions