git » linux-kernel » commit 50b767d

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

author Linus Torvalds
2009-11-30 21:53:14 UTC
committer Linus Torvalds
2009-11-30 21:53:14 UTC
parent 199bc9ff5ca5e4b3bcaff8927b2983c65f34c263
parent 13c5939e42dc11da61e00fef7f6cca2a6824a59f
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* '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