summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2006-06-2912-37/+52
|\
| * [MIPS] Add missing backslashes to macro definitions.Ralf Baechle2006-06-291-2/+2
| * [MIPS] Remove BSD and Sys V compat data types.Ralf Baechle2006-06-291-5/+5
| * [MIPS] ioc3.h: Uses u8, so include <linux/types.h>.Ralf Baechle2006-06-291-0/+2
| * [MIPS] au1xxx: fix PSC_SMBTXRX_RSR.Domen Puncer2006-06-291-1/+1
| * [MIPS] Fix FIXADDR_TOP for TX39/TX49.Atsushi Nemoto2006-06-291-0/+4
| * [MIPS] Fix configuration of R2 CPU features and multithreading.Ralf Baechle2006-06-291-12/+8
| * elf-em.h: Define and explain both EM_MIPS_RS3_LE and EM_MIPS_RS4_BE.Ralf Baechle2006-06-291-0/+5
| * [MIPS] Fix use of ehb instruction for non-R2 configurations.Ralf Baechle2006-06-293-11/+12
| * [MIPS] Define ARCH_HAS_IRQ_PER_CPU for all SMP systems.Ralf Baechle2006-06-292-6/+4
| * [MIPS] Wire up tee(2).Ralf Baechle2006-06-291-6/+9
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsaLinus Torvalds2006-06-293-13/+26
|\ \
| * | [ALSA] ak4xxx-adda - Code clean-upTakashi Iwai2006-06-281-14/+23
| * | [ALSA] Stereo controls for M-Audio Revolution cardsJani Alinikula2006-06-281-0/+2
| * | [ALSA] AD1888 mixer controls for DC modeJaya Kumar2006-06-281-0/+1
| * | [ALSA] Suppress irq handler mismatch messages in ALSA ISA driversTakashi Iwai2006-06-281-1/+2
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpcLinus Torvalds2006-06-2913-59/+663
|\ \ \
| * | | [POWERPC] todc: add support for Time-Of-Day-ClockMark A. Greer2006-06-291-0/+487
| * | | [POWERPC] Add tsi108 pci and platform device data register functionZang Roy-r619112006-06-291-0/+109
| * | | [POWERPC] Correct the MAX_CONTEXT definitionPaul Mackerras2006-06-291-1/+6
| * | | Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/gala...Paul Mackerras2006-06-281-4/+0
| |\ \ \
| | * | | powerpc: minor cleanups for mpc86xxKumar Gala2006-06-281-4/+0
| * | | | [POWERPC] Simplify the code defining the 64-bit CPU featuresPaul Mackerras2006-06-281-28/+20
| * | | | [POWERPC] update asm-powerpc/time.hStephen Rothwell2006-06-281-2/+4
| * | | | [POWERPC] Clean up it_lp_queue.hStephen Rothwell2006-06-281-20/+20
| * | | | [POWERPC] Add the use of the firmware soft-reset-nmi to kdump.David Wilder2006-06-281-0/+8
| * | | | [POWERPC] Add udbg support for RTAS consoleMichael Ellerman2006-06-281-1/+2
| * | | | [POWERPC] Setup RTAS values earlier, to enable rtas_call() earlierMichael Ellerman2006-06-281-0/+3
| * | | | [POWERPC] Make kexec_setup() a regular initcallMichael Ellerman2006-06-281-1/+0
| * | | | [POWERPC] powerpc: Initialise ppc_md htab pointers earlierMichael Ellerman2006-06-281-1/+0
| * | | | [POWERPC] kdump: Reserve the existing TCE mappings left by the first kernelHaren Myneni2006-06-282-0/+4
| * | | | [POWERPC] Remove obsolete #include <linux/config.h>.Jon Loeliger2006-06-281-1/+0
* | | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6Linus Torvalds2006-06-298-35/+61
|\ \ \ \ \
| * | | | | [PARISC] Move os_id_to_string() inside #ifndef __ASSEMBLY__Kyle McMartin2006-06-271-13/+12
| * | | | | [PARISC] Add os_id_to_string helperKyle McMartin2006-06-271-0/+13
| * | | | | [PARISC] OS_ID_LINUX == 0x0006Kyle McMartin2006-06-271-2/+1
| * | | | | [PARISC] Ensure Space ID hashing is turned offKyle McMartin2006-06-271-0/+1
| * | | | | [PARISC] Match show_cache_info with realityKyle McMartin2006-06-271-2/+2
| * | | | | [PARISC] Add is_compat_task() helperKyle McMartin2006-06-271-0/+11
| * | | | | [PARISC] PDC_CHASSIS is implemented on all machinesThibaut Varene2006-06-271-0/+1
| * | | | | [PARISC] Remove unconditional #define PIC in syscall macrosCarlos O'Donell2006-06-271-5/+0
| * | | | | [PARISC] Use MFIA in current_text_addr on pa2.0 processorsKyle McMartin2006-06-271-8/+6
| * | | | | [PARISC] Use FIXUP_BRANCH_CLOBBER to asm clobber listCarlos O'Donell2006-06-271-2/+7
| * | | | | [PARISC] Whitespace clean up in asm/pgtable.hKyle McMartin2006-06-271-4/+4
| * | | | | [PARISC] Ensure all ldcw uses are ldcw,co on pa2.0Kyle McMartin2006-06-272-12/+16
* | | | | | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6Linus Torvalds2006-06-296-49/+12
|\ \ \ \ \ \
| * | | | | | [S390] rework of channel measurement facility.Cornelia Huck2006-06-291-4/+0
| * | | | | | [S390] add PAV support to the dasd driver.Horst Hummel2006-06-291-3/+5
| * | | | | | [S390] preempt_count initialization.Heiko Carstens2006-06-291-0/+1
| * | | | | | [S390] __syscall_return error check.Heiko Carstens2006-06-291-3/+1