Merge branch 'linus' into x86/urgent
Merge reason: pull in latest, to be able to revert a patch there.
Signed-off-by: 
Ingo Molnar <mingo@elte.hu>
Showing
- Documentation/debugging-via-ohci1394.txt 4 additions, 4 deletionsDocumentation/debugging-via-ohci1394.txt
- Documentation/filesystems/ext3.txt 12 additions, 4 deletionsDocumentation/filesystems/ext3.txt
- Documentation/infiniband/user_mad.txt 2 additions, 2 deletionsDocumentation/infiniband/user_mad.txt
- Documentation/infiniband/user_verbs.txt 1 addition, 1 deletionDocumentation/infiniband/user_verbs.txt
- Documentation/scsi/hptiop.txt 20 additions, 1 deletionDocumentation/scsi/hptiop.txt
- Documentation/sound/alsa/HD-Audio-Models.txt 1 addition, 0 deletionsDocumentation/sound/alsa/HD-Audio-Models.txt
- MAINTAINERS 29 additions, 1 deletionMAINTAINERS
- Makefile 3 additions, 45 deletionsMakefile
- arch/arm/include/asm/bitops.h 3 additions, 3 deletionsarch/arm/include/asm/bitops.h
- arch/arm/kernel/time.c 1 addition, 0 deletionsarch/arm/kernel/time.c
- arch/arm/kernel/traps.c 41 additions, 35 deletionsarch/arm/kernel/traps.c
- arch/arm/mach-bcmring/core.c 2 additions, 2 deletionsarch/arm/mach-bcmring/core.c
- arch/arm/mach-bcmring/include/mach/system.h 1 addition, 1 deletionarch/arm/mach-bcmring/include/mach/system.h
- arch/arm/mach-ep93xx/Kconfig 35 additions, 9 deletionsarch/arm/mach-ep93xx/Kconfig
- arch/arm/mach-ep93xx/Makefile.boot 9 additions, 0 deletionsarch/arm/mach-ep93xx/Makefile.boot
- arch/arm/mach-ep93xx/clock.c 119 additions, 47 deletionsarch/arm/mach-ep93xx/clock.c
- arch/arm/mach-ep93xx/core.c 23 additions, 8 deletionsarch/arm/mach-ep93xx/core.c
- arch/arm/mach-ep93xx/edb93xx.c 24 additions, 7 deletionsarch/arm/mach-ep93xx/edb93xx.c
- arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h 22 additions, 20 deletionsarch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
- arch/arm/mach-ep93xx/include/mach/gpio.h 4 additions, 12 deletionsarch/arm/mach-ep93xx/include/mach/gpio.h
Loading
Please register or sign in to comment