Merge branch 'tracing/urgent' into tracing/core

Browse source

Merge reason: pick up both v2.6.30-rc1 [which includes tracing/urgent fixes]
              and pick up the current lineup of tracing/urgent fixes as well

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

...

This commit is contained in:

Ingo Molnar 2009-04-10 12:46:28 +02:00

parent dcef788eb9 93cfb3c9fd

commit 1cad1252ed

817 changed files with 76895 additions and 23724 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

18

Documentation/DMA-mapping.txt

View file

8

Documentation/DocBook/writing-an-alsa-driver.tmpl

View file

2

Documentation/blockdev/00-INDEX

View file

84

Documentation/blockdev/mflash.txt

View file

18

Documentation/cgroups/cpuacct.txt

View file

4

Documentation/devices.txt

View file

7

Documentation/fb/uvesafb.txt

View file

2

Documentation/filesystems/00-INDEX

View file

200

Documentation/filesystems/nilfs2.txt

View file

36

Documentation/hwmon/g760a

View file

52

Documentation/isdn/README.gigaset

View file

38

Documentation/kprobes.txt

View file

71

Documentation/sound/alsa/soc/jack.txt

View file

28

Documentation/sysctl/vm.txt

View file

0

Documentation/ftrace.txt → Documentation/trace/ftrace.txt

View file

0

Documentation/vm/kmemtrace.txt → Documentation/trace/kmemtrace.txt

View file

0

Documentation/tracers/mmiotrace.txt → Documentation/trace/mmiotrace.txt

View file

0

Documentation/tracepoints.txt → Documentation/trace/tracepoints.txt

View file

125

Documentation/video4linux/pxa_camera.txt

View file

21

Documentation/video4linux/v4l2-framework.txt

View file

20

MAINTAINERS

View file

4

Makefile

View file

6

arch/arm/configs/magician_defconfig

View file

1

arch/arm/include/asm/sizes.h

View file

2

arch/arm/mach-at91/include/mach/board.h

View file

4

arch/arm/mach-davinci/board-evm.c

View file

4

arch/arm/mach-davinci/usb.c

View file

8

arch/arm/mach-iop13xx/setup.c

View file

10

arch/arm/mach-iop13xx/tpmi.c

View file

10

arch/arm/mach-kirkwood/common.c

View file

3

arch/arm/mach-mx1/Makefile

View file

2

arch/arm/mach-mx1/devices.c

View file

18

arch/arm/mach-mx1/ksym_mx1.c

View file

35

arch/arm/mach-mx1/mx1_camera_fiq.S

View file

2

arch/arm/mach-mx3/clock.c

View file

23

arch/arm/mach-omap1/clock.c

View file

6

arch/arm/mach-orion5x/common.c

View file

9

arch/arm/mach-pxa/Kconfig

View file

1

arch/arm/mach-pxa/Makefile

View file

2

arch/arm/mach-pxa/cm-x2xx.c

View file

11

arch/arm/mach-pxa/colibri-pxa300.c

View file

10

arch/arm/mach-pxa/colibri-pxa320.c

View file

35

arch/arm/mach-pxa/colibri-pxa3xx.c

View file

5

arch/arm/mach-pxa/csb701.c

View file

2

arch/arm/mach-pxa/e740.c

View file

2

arch/arm/mach-pxa/e750.c

View file

2

arch/arm/mach-pxa/e800.c

View file

86

arch/arm/mach-pxa/em-x270.c

View file

7

arch/arm/mach-pxa/include/mach/colibri.h

View file

4

arch/arm/mach-pxa/include/mach/magician.h

View file

1

arch/arm/mach-pxa/include/mach/palmld.h

View file

1

arch/arm/mach-pxa/include/mach/palmt5.h

View file

68

arch/arm/mach-pxa/include/mach/palmte2.h

View file

2

arch/arm/mach-pxa/include/mach/palmtx.h

View file

1

arch/arm/mach-pxa/include/mach/pxa2xx_spi.h

View file

84

arch/arm/mach-pxa/magician.c

View file

6

arch/arm/mach-pxa/mioa701.c

View file

36

arch/arm/mach-pxa/palmld.c

View file

35

arch/arm/mach-pxa/palmt5.c

View file

466

arch/arm/mach-pxa/palmte2.c

View file

35

arch/arm/mach-pxa/palmtx.c

View file

2

arch/arm/mach-pxa/tosa.c

View file

3

arch/arm/mach-s3c2410/mach-bast.c

View file

3

arch/arm/mach-s3c2410/mach-n30.c

View file

3

arch/arm/mach-s3c2412/mach-jive.c

View file

11

arch/arm/mm/mmu.c

View file

8

arch/arm/plat-iop/adma.c

View file

25

arch/arm/plat-mxc/include/mach/i2c.h

View file

8

arch/arm/plat-mxc/include/mach/memory.h

View file

35

arch/arm/plat-mxc/include/mach/mx1_camera.h

View file

7

arch/arm/plat-s3c/dev-i2c0.c

View file

7

arch/arm/plat-s3c/dev-i2c1.c

View file

33

arch/arm/plat-s3c/include/plat/iic.h

View file

4

arch/avr32/boards/hammerhead/flash.c

View file

8

arch/avr32/mach-at32ap/at32ap700x.c

View file

5

arch/blackfin/include/asm/bfin5xx_spi.h

View file

10

arch/blackfin/mach-bf518/include/mach/bfin_serial_5xx.h

View file

36

arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h

View file

29

arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h

View file

37

arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h

View file

10

arch/blackfin/mach-bf538/include/mach/bfin_serial_5xx.h

View file

117

arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h

View file

29

arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h

View file

5

arch/cris/include/asm/ioctls.h

View file

8

arch/cris/include/asm/rs485.h

View file

1

arch/cris/include/asm/termios.h

View file

4

arch/ia64/include/asm/unistd.h

View file

2

arch/ia64/kernel/entry.S

View file

6

arch/ia64/kernel/pci-dma.c

View file

2

arch/ia64/sn/pci/pci_dma.c

View file

30

arch/mips/alchemy/common/platform.c

View file

4

arch/mips/alchemy/devboards/pb1200/platform.c

View file

12

arch/mips/nxp/pnx833x/common/platform.c

View file

8

arch/mips/nxp/pnx8550/common/platform.c

View file

8

arch/mips/pmc-sierra/msp71xx/msp_usb.c

View file

2

arch/mn10300/Kconfig

View file

2

arch/mn10300/kernel/irq.c

View file

23

arch/mn10300/oprofile/Kconfig

View file

3

arch/powerpc/Kconfig

View file

4

arch/powerpc/boot/dts/ksi8560.dts

View file

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