]> err.no Git - linux-2.6/commit
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Jul 2008 19:40:19 +0000 (12:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Jul 2008 19:40:19 +0000 (12:40 -0700)
commite9144754867b9ef431d54ea2a156f78feb196c34
treeae440455e4daeaeeb3552ca5e8a826e6821632d4
parenteb35c218d83ec0780d9db869310f2e333f628702
parent14defd90f5281da8a1bf43bc789efbafe5991cd8
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix 32bit kernels on R4k with 128 byte cache line size
  [MIPS] Atlas, decstation: Fix section mismatches triggered by defconfigs