projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 199bc9f 13c5939)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 21:53:14 +0000 (13:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 21:53:14 +0000 (13:53 -0800)
commit50b767d0baee51be5b11703cdb2a5202f5b67582
tree8846eb54ce902831ca84cd3915f0c7b4bc9f2b5etree | snapshot
parent199bc9ff5ca5e4b3bcaff8927b2983c65f34c263commit | diff
parent13c5939e42dc11da61e00fef7f6cca2a6824a59fcommit | diff
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
John Crispins staging tree