aboutsummaryrefslogtreecommitdiff
path: root/arch/arm26/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-26 16:50:48 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-26 16:50:48 -0700
commit6cd236e0057704d1f5c77908374079e021c83928 (patch)
tree302e002d62dcd4663aef7e9a98ca4b019e3e5c98 /arch/arm26/kernel
parent2c9dbda360d96819456f845ea92e20e4e9d0ed36 (diff)
parent8e15a0e35fdaf19e1aeb7923571e928bd6123cfd (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] Count timer interrupts correctly. [MIPS] SMTC and non-SMTC kernel and modules are incompatible [MIPS] EMMA2RH: Disable GEN_RTC, it can't possibly work. [MIPS] Remove a duplicated local variable in test_and_clear_bit() [MIPS] use compat_siginfo in rt_sigframe_n32 [MIPS] 20K: Handle WAIT related bugs according to errata information [MIPS] AP/SP requires shadow registers, auto enable support. [MIPS] Fix pb1500 reg B access [MIPS] Alchemy: Fix wrong cast [MIPS] remove "support for" from system type entry [MIPS] add io_map_base to pci_controller on Cobalt [MIPS] __ucmpdi2 arguments are unsigned long long.
Diffstat (limited to 'arch/arm26/kernel')
0 files changed, 0 insertions, 0 deletions