Merge branch 'perfcounters/urgent' into perfcounters/core

Browse source

Merge reason: We are going to modify a place modified by
              perfcounters/urgent.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

...

This commit is contained in:

Ingo Molnar 2009-09-02 21:42:56 +02:00

parent cd6feeeafd eced1dfcfc

commit f76bd108e5

416 changed files with 4783 additions and 2919 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

Documentation/filesystems/9p.txt

View file

26

Documentation/filesystems/afs.txt

View file

15

Documentation/filesystems/proc.txt

View file

2

Documentation/video4linux/CARDLIST.em28xx

View file

4

Documentation/video4linux/CARDLIST.saa7134

View file

18

MAINTAINERS

View file

2

Makefile

View file

5

REPORTING-BUGS

View file

2

arch/arm/configs/kirkwood_defconfig

View file

7

arch/arm/configs/rx51_defconfig

View file

3

arch/arm/include/asm/setup.h

View file

2

arch/arm/mach-ixp4xx/include/mach/io.h

View file

9

arch/arm/mach-kirkwood/ts219-setup.c

View file

2

arch/arm/mach-mx3/mx31moboard-devboard.c

View file

2

arch/arm/mach-mx3/mx31moboard-marxbot.c

View file

2

arch/arm/mach-mx3/mx31moboard.c

View file

9

arch/arm/mach-mx3/pcm037_eet.c

View file

2

arch/arm/mach-omap2/board-2430sdp.c

View file

2

arch/arm/mach-omap2/board-3430sdp.c

View file

2

arch/arm/mach-omap2/board-4430sdp.c

View file

2

arch/arm/mach-omap2/board-apollon.c

View file

2

arch/arm/mach-omap2/board-generic.c

View file

2

arch/arm/mach-omap2/board-h4.c

View file

2

arch/arm/mach-omap2/board-ldp.c

View file

7

arch/arm/mach-omap2/board-omap3beagle.c

View file

2

arch/arm/mach-omap2/board-omap3evm.c

View file

8

arch/arm/mach-omap2/board-omap3pandora.c

View file

11

arch/arm/mach-omap2/board-overo.c

View file

5

arch/arm/mach-omap2/board-rx51-peripherals.c

View file

6

arch/arm/mach-omap2/board-rx51.c

View file

2

arch/arm/mach-omap2/board-zoom2.c

View file

164

arch/arm/mach-omap2/clock.c

View file

6

arch/arm/mach-omap2/clock.h

View file

37

arch/arm/mach-omap2/clock24xx.c

View file

4

arch/arm/mach-omap2/clock24xx.h

View file

153

arch/arm/mach-omap2/clock34xx.c

View file

85

arch/arm/mach-omap2/clock34xx.h

View file

6

arch/arm/mach-omap2/cm.h

View file

5

arch/arm/mach-omap2/io.c

View file

6

arch/arm/mach-omap2/mmc-twl4030.c

View file

6

arch/arm/mach-omap2/mux.c

View file

3

arch/arm/mach-omap2/pm.h

View file

2

arch/arm/mach-omap2/pm24xx.c

View file

51

arch/arm/mach-omap2/pm34xx.c

View file

43

arch/arm/mach-omap2/prcm.c

View file

68

arch/arm/mach-omap2/sdrc.c

View file

199

arch/arm/mach-omap2/serial.c

View file

147

arch/arm/mach-omap2/sram34xx.S

View file

2

arch/arm/mach-u300/core.c

View file

118

arch/arm/mm/init.c

View file

9

arch/arm/mm/mmu.c

View file

8

arch/arm/plat-omap/cpu-omap.c

View file

4

arch/arm/plat-omap/dma.c

View file

127

arch/arm/plat-omap/gpio.c

View file

2

arch/arm/plat-omap/include/mach/clock.h

View file

5

arch/arm/plat-omap/include/mach/cpu.h

View file

3

arch/arm/plat-omap/include/mach/io.h

View file

4

arch/arm/plat-omap/include/mach/mux.h

View file

1

arch/arm/plat-omap/include/mach/prcm.h

View file

11

arch/arm/plat-omap/include/mach/sdrc.h

View file

1

arch/arm/plat-omap/include/mach/serial.h

View file

23

arch/arm/plat-omap/include/mach/sram.h

View file

34

arch/arm/plat-omap/sram.c

View file

2

arch/arm/plat-orion/include/plat/gpio.h

View file

2

arch/arm/plat-s3c24xx/clock-dclk.c

View file

4

arch/avr32/boards/favr-32/setup.c

View file

16

arch/avr32/lib/memcpy.S

View file

6

arch/m68k/amiga/config.c

View file

10

arch/m68k/include/asm/motorola_pgalloc.h

View file

3

arch/m68k/include/asm/pgtable_mm.h

View file

4

arch/m68k/include/asm/unistd.h

View file

2

arch/m68k/kernel/entry.S

View file

2

arch/m68knommu/kernel/syscalltable.S

View file

70

arch/microblaze/configs/mmu_defconfig

View file

91

arch/microblaze/configs/nommu_defconfig

View file

2

arch/microblaze/include/asm/hardirq.h

View file

2

arch/microblaze/kernel/intc.c

View file

9

arch/microblaze/kernel/irq.c

View file

2

arch/microblaze/kernel/syscall_table.S

View file

2

arch/microblaze/kernel/timer.c

View file

6

arch/microblaze/mm/init.c

View file

2

arch/mips/include/asm/page.h

View file

211

arch/powerpc/configs/ps3_defconfig

View file

4

arch/powerpc/platforms/ps3/time.c

View file

25

arch/s390/kernel/setup.c

View file

9

arch/sh/boards/mach-se/7724/setup.c

View file

70

arch/sh/kernel/cpu/shmobile/sleep.S

View file

74

arch/sparc/configs/sparc32_defconfig

View file

59

arch/sparc/configs/sparc64_defconfig

View file

12

arch/sparc/include/asm/pgtable_64.h

View file

42

arch/sparc/kernel/ktlb.S

View file

4

arch/sparc/kernel/smp_64.c

View file

22

arch/sparc/kernel/sun4d_smp.c

View file

26

arch/sparc/kernel/sun4m_smp.c

View file

4

arch/sparc/kernel/sys32.S

View file

4

arch/sparc/kernel/systbls_64.S

View file

7

arch/sparc/mm/fault_32.c

View file

7

arch/sparc/mm/fault_64.c

View file

43

arch/sparc/mm/init_64.c

View file

7

arch/sparc/mm/init_64.h

View file

Some files were not shown because too many files have changed in this diff Show more