summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'tracing/ftrace', 'tracing/fastboot', 'tracing/nmisafe' and 't...Ingo Molnar2008-11-0812-47/+70
|\ \
| | * Merge branch 'io-mappings-for-linus-2' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2008-11-037-11/+70
| | |\
| | | * io mapping: clean up #ifdefsKeith Packard2008-11-031-0/+4
| | | * x86: add iomap_atomic*()/iounmap_atomic() on 32-bit using fixmapsKeith Packard2008-10-316-11/+66
| * | | ftrace: fix hardirq header for non ftrace archsSteven Rostedt2008-11-035-36/+0Star
* | | | ftrace: add quick function trace stopSteven Rostedt2008-11-063-0/+12
|/ / /
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'tracing/ftrace', 'tracing/markers', 'tracing/mmiotrace', 'tra...Ingo Molnar2008-11-039-8/+165
|\ \ \ \ \ | |_|_|/ / |/| | | |
| | | * | ftrace: nmi safe code clean upsSteven Rostedt2008-10-316-21/+21
| | | * | ftrace: nmi update statisticsSteven Rostedt2008-10-301-2/+24
| | | * | ftrace: nmi safe code modificationSteven Rostedt2008-10-306-1/+141
| | * | | trace: add the MMIO-tracer to the tracer menu, cleanupPekka Paalanen2008-10-273-7/+2Star
| |/ / /
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2008-11-023-5/+13
|\ \ \ \
| * | | | sparc64: Fix PCI resource mapping on sparc64Max Dmitrichenko2008-11-021-1/+9
| * | | | sparc64: Kill annoying warning when building compat_binfmt_elf.oDavid S. Miller2008-11-021-2/+2
| * | | | sparc32: kernel/trace/trace.c wants DIE_OOPSAl Viro2008-11-021-0/+1
| * | | | sparc64: Fix __copy_{to,from}_user_inatomic defines.Hugh Dickins2008-11-021-2/+2
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-11-021-0/+26
|\ \ \ \ \
| * \ \ \ \ Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jga...David S. Miller2008-10-311-0/+26
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | gianfar: Fix race in TBI/SerDes configurationTrent Piepho2008-10-311-0/+26
| | | |/ / | | |/| |
* | | | | sparc32: kernel/trace/trace.c wants DIE_OOPSAl Viro2008-11-011-0/+1
* | | | | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2008-11-012-1/+2
|\ \ \ \ \
| * | | | | x86: fix AMDC1E and XTOPOLOGY conflict in cpufeatureVenki Pallipadi2008-10-311-1/+1
| * | | | | x86: build fixIngo Molnar2008-10-311-0/+1
| |/ / / /
* | | | | x86: Clean up late e820 resource allocationLinus Torvalds2008-11-011-3/+5
* | | | | Merge branch 'link_removal' of git://www.jni.nu/crisLinus Torvalds2008-11-017-246/+115Star
|\ \ \ \ \
| * | | | | [CRIS] Remove links from CRIS buildJesper Nilsson2008-10-315-178/+81Star
| * | | | | [CRIS] Merge asm-offsets.c for both arches into one file.Jesper Nilsson2008-10-313-69/+35Star
* | | | | | Merge branch 'cris_move' of git://www.jni.nu/crisLinus Torvalds2008-11-01353-95/+62520
|\| | | | |
| * | | | | [CRIS] Move header files from include to arch/cris/include.Jesper Nilsson2008-10-29353-95/+62520
| | |/ / / | |/| | |
* | | | | saner FASYNC handling on file closeAl Viro2008-11-011-5/+0Star
* | | | | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/...Linus Torvalds2008-10-3156-864/+1434
|\ \ \ \ \
| * | | | | Revert "powerpc: Sync RPA note in zImage with kernel's RPA note"Paul Mackerras2008-10-314-145/+52Star
| * | | | | Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/galak/pow...Paul Mackerras2008-10-311-39/+0Star
| |\ \ \ \ \
| | * | | | | powerpc: Remove duplicate DMA entry from mpc8313erdb device treeMike Dyer2008-10-311-39/+0Star
| * | | | | | powerpc: Fix compile errors with CONFIG_BUG=nPaul Mackerras2008-10-311-0/+2
| * | | | | | powerpc: Fix format string warning in arch/powerpc/boot/main.cJon Smirl2008-10-311-1/+1
| * | | | | | powerpc: Fix bug in kernel copy of libfdt's fdt_subnode_offset_namelen()David Gibson2008-10-311-3/+6
| * | | | | | powerpc/cell/OProfile: Fix on-stack array size in activate spu profiling func...Carl Love2008-10-311-3/+10
| * | | | | | powerpc/mpic: Fix regression caused by change of default IRQ affinityKumar Gala2008-10-314-6/+61
| * | | | | | powerpc: Update remaining dma_mapping_ops to use map/unmap_pageMark Nelson2008-10-318-99/+104
| * | | | | | powerpc/pci: Fix unmapping of IO space on 64-bitBenjamin Herrenschmidt2008-10-311-1/+1
| * | | | | | powerpc/pci: Properly allocate bus resources for hotplug PHBsNathan Fontenot2008-10-313-55/+59
| * | | | | | OF-device: Don't overwrite numa_node in device registrationJeremy Kerr2008-10-311-1/+0Star
| * | | | | | powerpc: Fix swapcontext system for VSX + old ucontext sizeMichael Neuling2008-10-312-39/+30Star
| * | | | | | powerpc: Fix compiler warning for the relocatable kernelMichael Neuling2008-10-311-3/+3
| * | | | | | powerpc: Work around ld bug in older binutilsPaul Mackerras2008-10-311-0/+2
| * | | | | | powerpc/ppc64/kdump: Better flag for running relocatableMilton Miller2008-10-311-11/+19
| * | | | | | powerpc: Use is_kdump_kernel()Milton Miller2008-10-314-8/+7Star
| * | | | | | powerpc: Kexec exit should not use magic numbersMilton Miller2008-10-313-19/+5Star
| * | | | | | Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/p...Paul Mackerras2008-10-3119-425/+1053
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |