Merge branch 'drm-intel-fixes' into drm-intel-next

Browse source

Conflicts:
	drivers/gpu/drm/i915/intel_drv.h

...

This commit is contained in:

Chris Wilson 2010-12-02 23:36:21 +00:00

parent 60de2ba51e 5bddd17fec

commit b9e68670cc

504 changed files with 13388 additions and 6199 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

83

Documentation/ABI/testing/sysfs-bus-rbd

View file

4

Documentation/DocBook/sh.tmpl

View file

129

Documentation/driver-model/interface.txt

View file

8

Documentation/edac.txt

View file

32

Documentation/fb/00-INDEX

View file

5

Documentation/kernel-parameters.txt

View file

1

Documentation/networking/ip-sysctl.txt

View file

32

Documentation/sh/clk.txt

View file

13

MAINTAINERS

View file

2

Makefile

View file

2

arch/arm/boot/compressed/head.S

View file

2

arch/arm/boot/compressed/vmlinux.lds.in

View file

341

arch/arm/configs/at91rm9200_defconfig

View file

72

arch/arm/configs/at91rm9200dk_defconfig

View file

73

arch/arm/configs/at91rm9200ek_defconfig

View file

131

arch/arm/configs/ateb9200_defconfig

View file

47

arch/arm/configs/carmeva_defconfig

View file

112

arch/arm/configs/cpuat91_defconfig

View file

104

arch/arm/configs/csb337_defconfig

View file

98

arch/arm/configs/csb637_defconfig

View file

99

arch/arm/configs/ecbat91_defconfig

View file

61

arch/arm/configs/kafa_defconfig

View file

127

arch/arm/configs/kb9202_defconfig

View file

80

arch/arm/configs/onearm_defconfig

View file

242

arch/arm/configs/picotux200_defconfig

View file

137

arch/arm/configs/yl9200_defconfig

View file

2

arch/arm/include/asm/assembler.h

View file

4

arch/arm/include/asm/mmu.h

View file

3

arch/arm/include/asm/pgtable.h

View file

6

arch/arm/lib/findbit.S

View file

2

arch/arm/mach-aaec2000/include/mach/vmalloc.h

View file

4

arch/arm/mach-at91/Makefile

View file

45

arch/arm/mach-at91/at91rm9200_devices.c

View file

26

arch/arm/mach-at91/board-1arm.c

View file

21

arch/arm/mach-at91/board-kafa.c

View file

53

arch/arm/mach-at91/board-picotux200.c

View file

4

arch/arm/mach-at91/board-dk.c → arch/arm/mach-at91/board-rm9200dk.c

View file

4

arch/arm/mach-at91/board-ek.c → arch/arm/mach-at91/board-rm9200ek.c

View file

2

arch/arm/mach-at91/board-yl-9200.c

View file

6

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

View file

2

arch/arm/mach-bcmring/include/mach/vmalloc.h

View file

2

arch/arm/mach-clps711x/include/mach/vmalloc.h

View file

6

arch/arm/mach-davinci/dm355.c

View file

6

arch/arm/mach-davinci/dm365.c

View file

4

arch/arm/mach-davinci/dm644x.c

View file

2

arch/arm/mach-ebsa110/include/mach/vmalloc.h

View file

2

arch/arm/mach-footbridge/include/mach/vmalloc.h

View file

2

arch/arm/mach-h720x/include/mach/vmalloc.h

View file

6

arch/arm/mach-imx/eukrea_mbimx27-baseboard.c

View file

2

arch/arm/mach-integrator/include/mach/vmalloc.h

View file

2

arch/arm/mach-msm/include/mach/vmalloc.h

View file

4

arch/arm/mach-mx25/devices-imx25.h

View file

5

arch/arm/mach-mx3/mach-pcm037_eet.c

View file

2

arch/arm/mach-netx/include/mach/vmalloc.h

View file

2

arch/arm/mach-omap1/include/mach/vmalloc.h

View file

2

arch/arm/mach-omap2/include/mach/vmalloc.h

View file

7

arch/arm/mach-omap2/pm24xx.c

View file

10

arch/arm/mach-omap2/pm34xx.c

View file

7

arch/arm/mach-omap2/serial.c

View file

2

arch/arm/mach-pnx4008/include/mach/vmalloc.h

View file

2

arch/arm/mach-rpc/include/mach/vmalloc.h

View file

8

arch/arm/mach-s3c2410/h1940-bluetooth.c

View file

5

arch/arm/mach-s3c2416/irq.c

View file

5

arch/arm/mach-s3c2443/irq.c

View file

2

arch/arm/mach-s3c64xx/mach-mini6410.c

View file

2

arch/arm/mach-s3c64xx/mach-real6410.c

View file

1

arch/arm/mach-s5pv210/mach-smdkc110.c

View file

1

arch/arm/mach-s5pv210/mach-smdkv210.c

View file

2

arch/arm/mach-shark/include/mach/vmalloc.h

View file

147

arch/arm/mach-shmobile/board-ap4evb.c

View file

39

arch/arm/mach-shmobile/clock-sh7372.c

View file

6

arch/arm/mach-ux500/cpu.c

View file

2

arch/arm/mach-versatile/include/mach/vmalloc.h

View file

4

arch/arm/mm/ioremap.c

View file

8

arch/arm/plat-mxc/devices/platform-imx-dma.c

View file

1

arch/arm/plat-mxc/devices/platform-spi_imx.c

View file

89

arch/arm/plat-nomadik/timer.c

View file

3

arch/arm/plat-pxa/include/plat/sdhci.h

View file

6

arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c

View file

6

arch/arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c

View file

6

arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c

View file

2

arch/powerpc/mm/pgtable.c

View file

10

arch/s390/kernel/nmi.c

View file

14

arch/s390/lib/delay.c

View file

7

arch/sh/include/asm/processor_32.h

View file

2

arch/sh/kernel/cpu/sh4/clock-sh4-202.c

View file

2

arch/sh/kernel/sys_sh.c

View file

2

arch/sh/kernel/vsyscall/vsyscall-trapa.S

View file

12

arch/tile/Kconfig

View file

52

arch/tile/include/asm/cacheflush.h

View file

15

arch/tile/include/asm/io.h

View file

117

arch/tile/include/asm/pci-bridge.h

View file

107

arch/tile/include/asm/pci.h

View file

10

arch/tile/include/asm/processor.h

View file

300

arch/tile/include/hv/drv_xgbe_impl.h

View file

615

arch/tile/include/hv/drv_xgbe_intf.h

View file

122

arch/tile/include/hv/netio_errors.h

View file

2975

arch/tile/include/hv/netio_intf.h

View file

1

arch/tile/kernel/Makefile

View file

621

arch/tile/kernel/pci.c

View file

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