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:
  Staging: octeon-ethernet: Assign proper MAC addresses.
  Staging: Octeon: Use symbolic values for irq numbers.
  MIPS: Octeon: Fix compile error in drivers/staging/octeon/ethernet-mdio.c

...

This commit is contained in:

Linus Torvalds 2009-11-30 13:53:14 -08:00

parent 199bc9ff5c 13c5939e42

commit 50b767d0ba

3 changed files with 43 additions and 14 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

2

drivers/staging/octeon/ethernet-mdio.c

View file

2

drivers/staging/octeon/ethernet-spi.c

View file

53

drivers/staging/octeon/ethernet.c

View file