]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c83ac95 34366fb)
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)
commitf9563e14e288fcc54e773a0fc940674010fc9147
tree8846eb54ce902831ca84cd3915f0c7b4bc9f2b5etree | snapshot
parentc83ac95872c7f92fda807319171d31d8185f0e2ccommit | diff
parent34366fb0d05334225fd0b246d589b465c847ce1acommit | 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
Linux Kernel Source Tree.