From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Nov 2009 21:53:14 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.32~53
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=50b767d0baee51be5b11703cdb2a5202f5b67582;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'upstream' of git://ftp.linux-mips.org/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
---

50b767d0baee51be5b11703cdb2a5202f5b67582