Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

Browse source

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] ARC: Fix several compiler warnings.
  [MIPS] ISA: Fix typo
  [CHAR] ds1286: Fix handling of seconds in RTC_ALM_SET ioctl.

...

This commit is contained in:

Linus Torvalds 2007-03-07 19:04:21 -08:00

parent c91a32503d b2e569d876

commit 06aa5b4aae

3 changed files with 10 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

arch/mips/arc/init.c

View file

9

drivers/char/ds1286.c

View file

2

include/asm-mips/dma.h

View file