diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-07 04:53:12 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-07 04:53:12 +0100 |
| commit | c836b7716a97021128da43e6fdb61096d5c4156d (patch) | |
| tree | f05b96b16628fa001e5f118bff8452bc9717607d /fs/cifs | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha... (diff) | |
| parent | [MIPS] Fix EV64120 and Ocelot builds by providing a plat_timer_setup(). (diff) | |
| download | linux-c836b7716a97021128da43e6fdb61096d5c4156d.tar.xz linux-c836b7716a97021128da43e6fdb61096d5c4156d.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] Fix EV64120 and Ocelot builds by providing a plat_timer_setup().
[MIPS] EV64120: Fix PCI interrupt allocation.
[MIPS] Make irq number allocator generally available for fixing EV64120.
[MIPS] EV64120: Fix timer initialization for HZ != 100.
[MIPS] Ocelot 3: Fix MAC address detection after platform_device conversion.
[MIPS] Ocelot C: Fix MAC address detection after platform_device conversion.
[MIPS] SB1: On bootup only flush cache on local CPU.
[MIPS] Ocelot 3: Fix large number of warnings.
[MIPS] Ocelot C: Fix mapping of ioport address range.
[MIPS] Ocelot C: Fix warning about missmatching format string.
[MIPS] Ocelot C: fix eth registration after conversion to platform_device
[MIPS] Ocelot C: Fix large number of warnings.
Diffstat (limited to 'fs/cifs')
0 files changed, 0 insertions, 0 deletions