diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-10 19:45:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-10 19:45:17 -0800 |
| commit | c34c15b02e0af7e235f84ca1471747ee1cbb1b87 (patch) | |
| tree | ea6a40c40601e8a1af8c21cd537340179427732d /arch/x86 | |
| parent | 3790ee4bd86396558eedd86faac1052cb782e4e1 (diff) | |
| parent | ba0f00b9fcb02b10cc9929fec660f86d1af6a41a (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] Malta: Enable tickless and highres timers.
[MIPS] Bigsur: Enable tickless and and highres timers.
qemu: do not enable IP7 blindly
[MIPS] Alchemy: Fix Au1x SD controller IRQ
[MIPS] Don't byteswap writes to display when running bigendian
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions