commit | 200d018eff4be3a1fb9823441cfcebb7de86a677 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.osdl.org> | Fri Dec 08 17:21:38 2006 -0800 |
committer | Linus Torvalds <torvalds@woody.osdl.org> | Fri Dec 08 17:21:38 2006 -0800 |
tree | 76dc7b8643da0fc19208067c44e3f346f11f6cc8 | |
parent | eb991b39385c7b04923d701764a34694ec54b53d [diff] | |
parent | f0647a52974daccbe20990fb6341f07792445fe0 [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: [PATCH] add STB810 support (Philips PNX8550-based) [MIPS] Qemu now has an ELF loader. [MIPS] Add GENERIC_HARDIRQS_NO__DO_IRQ for i8259 users [MIPS] Optimize csum_partial for 64bit kernel [MIPS] Optimize flow of csum_partial [MIPS] Make csum_partial more readable [MIPS] Rename SNI_RM200_PCI to just SNI_RM preparing for more RM machines