diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 19:21:08 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 19:21:08 -0700 |
commit | f10f114f199dbcb9e1d6b5a0b36a34acf93f6179 (patch) | |
tree | 299058a338e245957bf9e132f5cbf222bd03cad6 /drivers/video/logo/logo_superh_vga16.ppm | |
parent | 0c326331c8b107abc0a160e8899d749150b8f76a (diff) | |
parent | dab969c00b8bee17a47057bbb91cd0a348cf6f76 (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:
[MIPS] time: Make c0_compare_int_usable more bullet proof
[MIPS] Kbuild: Use the new cc-cross-prefix feature.
[MIPS] Fix include wrapper symbol to something sane.
[MIPS] Malta: Delete dead code.
[MIPS] time: Add GT641xx timer0 clockevent driver
[MIPS] time: SMP-proofing of Sibyte clockevent/clocksource code.
[MIPS] time: SMP/NUMA-proofing of IP27 HUB RT timer code.
[MIPS] time: Fix calculation in clockevent_set_clock()
Diffstat (limited to 'drivers/video/logo/logo_superh_vga16.ppm')
0 files changed, 0 insertions, 0 deletions