| commit | 50b767d0baee51be5b11703cdb2a5202f5b67582 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 30 13:53:14 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 30 13:53:14 2009 -0800 |
| tree | 8846eb54ce902831ca84cd3915f0c7b4bc9f2b5e | |
| parent | 199bc9ff5ca5e4b3bcaff8927b2983c65f34c263 [diff] | |
| parent | 13c5939e42dc11da61e00fef7f6cca2a6824a59f [diff] |
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