summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tty] diable setfont if we enable cjk font in kernelHEADmaster2.6.38-utf8microcai2011-03-221-0/+5
* add-cjk-font-that-has-65536-charsmicrocai2011-03-226-1/+139820
* fix-tty-console-stupid-255-512-glyph-limitationsmicrocai2011-03-2219-59/+289
* Linux 2.6.38v2.6.38Linus Torvalds2011-03-141-1/+1
* Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowell...Linus Torvalds2011-03-143-5/+6
|\
| * MN10300: atomic_read() should ensure it emits a loadDavid Howells2011-03-141-1/+1
| * MN10300: The SMP_ICACHE_INV_FLUSH_RANGE IPI command does not existDavid Howells2011-03-141-2/+2
| * MN10300: Proper use of macros get_user() in the case of incremented pointersTkhai Kirill2011-03-141-2/+3
* | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2011-03-1422-305/+331
|\ \
| * | MIPS: Alchemy: Fix reset for MTX-1 and XXS1500Florian Fainelli2011-03-142-4/+4
| * | MIPS: MTX-1: Make au1000_eth probe all PHY addressesFlorian Fainelli2011-03-141-0/+9
| * | MIPS: Jz4740: Add HAVE_CLKMaurus Cuelenaere2011-03-141-0/+1
| * | MIPS: Move idle task creation to work queueMaksim Rayskiy2011-03-141-2/+29
| * | MIPS, Perf-events: Use unsigned delta for right shift in event updateDeng-Cheng Zhu2011-03-141-1/+1
| * | MIPS, Perf-events: Work with the new callchain interfaceDeng-Cheng Zhu2011-03-141-57/+6
| * | MIPS, Perf-events: Fix event check in validate_event()Deng-Cheng Zhu2011-03-141-2/+3
| * | MIPS, Perf-events: Work with the new PMU interfaceDeng-Cheng Zhu2011-03-142-119/+158
| * | MIPS, Perf-events: Work with irq_workDeng-Cheng Zhu2011-03-143-12/+3
| * | MIPS: Fix always CONFIG_LOONGSON_UART_BASE=yYoichi Yuasa2011-03-141-1/+4
| * | MIPS: Loongson: Fix potentially wrong string handlingStefan Weil2011-03-141-1/+2
| * | MIPS: Fix GCC-4.6 'set but not used' warning in arch/mips/mm/init.cDavid Daney2011-03-141-1/+1
| * | MIPS: Fix GCC-4.6 'set but not used' warning in ieee754int.hDavid Daney2011-03-141-2/+2
| * | MIPS: Remove unused code from arch/mips/kernel/syscall.cDavid Daney2011-03-141-2/+1
| * | MIPS: Fix GCC-4.6 'set but not used' warning in signal*.cDavid Daney2011-03-142-2/+2
| * | MIPS: MSP: Fix MSP71xx bpci interrupt handler return valueAnoop P A2011-03-141-2/+2
| * | MIPS: Select R4K timer lib for all MSP platformsAnoop P A2011-03-143-5/+3
| * | MIPS: Loongson: Remove ad-hoc cmdline defaultRobert Millan2011-03-141-5/+0
| * | MIPS: Clear the correct flag in sysmips(MIPS_FIXADE, ...).Stefan Oberhumer2011-03-141-1/+1
| * | MIPS: Add an unreachable return statement to satisfy buggy GCCs.David Daney2011-03-141-0/+2
| * | MIPS, Tracing: Fix set_graph_function of function graph tracerWu Zhangjin2011-03-141-2/+9
| * | MIPS, Tracing: Clean up ftrace_make_nop()Wu Zhangjin2011-03-141-32/+38
| * | MIPS, Tracing: Clean up prepare_ftrace_return()Wu Zhangjin2011-03-141-27/+25
| * | MIPS, Tracing: Substitute in_kernel_space() for in_module()Wu Zhangjin2011-03-141-27/+27
| * | MIPS, Tracing: Speed up function graph tracerWu Zhangjin2011-03-141-7/+7
| * | MIPS: Replace deprecated spinlock initializationThomas Gleixner2011-03-141-2/+2
| |/
* | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-03-149-37/+45
|\ \
| * | x86: ce4100: Set pci ops via callback instead of module initSebastian Andrzej Siewior2011-03-143-3/+12
| * | x86/mm: Fix pgd_lock deadlockAndrea Arcangeli2011-03-105-30/+22
| * | x86/mm: Handle mm_fault_error() in kernel spaceAndrey Vagin2011-03-101-0/+7
| * | x86: Don't check for BIOS corruption in first 64K when there's no need toNaga Chumbalkar2011-03-091-4/+4
* | | Revert "oom: oom_kill_process: fix the child_points logic"Linus Torvalds2011-03-141-8/+3
* | | oom: oom_kill_process: fix the child_points logicOleg Nesterov2011-03-141-3/+8
* | | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2011-03-1415-91/+178
|\ \ \
| * | | NFS: NFSROOT should default to "proto=udp"Chuck Lever2011-03-111-15/+14
| * | | nfs4: remove duplicated #includeHuang Weiyi2011-03-111-1/+0
| * | | NFSv4: nfs4_state_mark_reclaim_nograce() should be staticTrond Myklebust2011-03-112-4/+2
| * | | NFSv4: Fix the setlk error handlerTrond Myklebust2011-03-111-9/+4
| * | | NFSv4.1: Fix the handling of the SEQUENCE status bitsTrond Myklebust2011-03-111-3/+8
| * | | NFSv4/4.1: Fix nfs4_schedule_state_recovery abusesTrond Myklebust2011-03-114-34/+52
| * | | NFSv4.1 reclaim complete must wait for completionAndy Adamson2011-03-101-0/+3