summaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-11-06 19:53:12 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-11-06 19:53:12 -0800
commitc836b7716a97021128da43e6fdb61096d5c4156d (patch)
treef05b96b16628fa001e5f118bff8452bc9717607d /fs/cifs
parent846cf85e7137320ea59c29353071f9cdd97b92bc (diff)
parent73f4388aedade209650ed629ab767d3e2b636f7b (diff)
downloadblackbird-op-linux-c836b7716a97021128da43e6fdb61096d5c4156d.tar.gz
blackbird-op-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
OpenPOWER on IntegriCloud