projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c70a1ce 8a93c49)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.osdl.org>
Wed, 10 Jan 2007 23:56:09 +0000 (15:56 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Wed, 10 Jan 2007 23:56:09 +0000 (15:56 -0800)
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      [MIPS] Alchemy:  Fix PCI-memory access
  [MIPS] Fix N32 SysV IPC routines
  [MIPS] PNX8550: Fix system timer initialization


Trivial merge
John Crispins staging tree