Merge branch 'v3.6-rc7' into tty-next

Browse source

This is to sync up on Linus's branch to get the other tty and core changes.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Greg Kroah-Hartman 2012-07-16 12:32:42 -07:00

parent 40c9f61eae 84a1caf145

commit 467a3ca5ca

584 changed files with 4901 additions and 3069 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

21

Documentation/ABI/testing/sysfs-block-rssd

View file

17

Documentation/ABI/testing/sysfs-class-mtd

View file

2

Documentation/DocBook/media/v4l/controls.xml

View file

4

Documentation/DocBook/media/v4l/pixfmt.xml

View file

2

Documentation/DocBook/media/v4l/v4l2.xml

View file

5

Documentation/DocBook/media/v4l/vidioc-create-bufs.xml

View file

2

Documentation/DocBook/media/v4l/vidioc-dqevent.xml

View file

7

Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml

View file

129

Documentation/device-mapper/verity.txt

View file

1

Documentation/devicetree/bindings/input/fsl-mma8450.txt

View file

4

Documentation/devicetree/bindings/mfd/mc13xxx.txt

View file

4

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt

View file

2

Documentation/devicetree/bindings/net/fsl-fec.txt

View file

4

Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt

View file

1

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

57

Documentation/prctl/no_new_privs.txt

View file

6

Documentation/stable_kernel_rules.txt

View file

17

Documentation/virtual/kvm/api.txt

View file

7

MAINTAINERS

View file

2

Makefile

View file

1

arch/arm/configs/omap2plus_defconfig

View file

2

arch/arm/include/asm/atomic.h

View file

18

arch/arm/include/asm/domain.h

View file

5

arch/arm/include/asm/thread_info.h

View file

4

arch/arm/kernel/kprobes-test-arm.c

View file

2

arch/arm/kernel/perf_event.c

View file

3

arch/arm/kernel/ptrace.c

View file

46

arch/arm/kernel/signal.c

View file

2

arch/arm/kernel/signal.h

View file

2

arch/arm/kernel/traps.c

View file

2

arch/arm/kernel/vmlinux.lds.S

View file

1

arch/arm/mach-dove/include/mach/bridge-regs.h

View file

1

arch/arm/mach-dove/include/mach/dove.h

View file

8

arch/arm/mach-exynos/Kconfig

View file

13

arch/arm/mach-exynos/pm_domains.c

View file

9

arch/arm/mach-imx/clk-imx35.c

View file

6

arch/arm/mach-imx/clk-imx6q.c

View file

2

arch/arm/mach-imx/mach-imx27_visstrim_m10.c

View file

29

arch/arm/mach-mmp/include/mach/gpio-pxa.h

View file

1

arch/arm/mach-mv78xx0/include/mach/bridge-regs.h

View file

2

arch/arm/mach-mv78xx0/include/mach/mv78xx0.h

View file

11

arch/arm/mach-mxs/mach-apx4devkit.c

View file

5

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

View file

2

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

View file

5

arch/arm/mach-omap2/clock44xx_data.c

View file

4

arch/arm/mach-omap2/clockdomain.h

View file

1

arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c

View file

2

arch/arm/mach-omap2/clockdomains44xx_data.c

View file

32

arch/arm/mach-omap2/omap_hwmod.c

View file

28

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

View file

2

arch/arm/mach-omap2/twl-common.c

View file

15

arch/arm/mach-pxa/hx4700.c

View file

2

arch/arm/mach-s3c24xx/clock-s3c2440.c

View file

1

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

View file

1

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

View file

1

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

View file

3

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

View file

8

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

View file

7

arch/arm/mach-shmobile/intc-r8a7779.c

View file

10

arch/arm/mach-shmobile/platsmp.c

View file

2

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

View file

12

arch/arm/mach-ux500/board-mop500.c

View file

2

arch/arm/mach-ux500/timer.c

View file

1

arch/arm/mach-versatile/pci.c

View file

2

arch/arm/mm/dma-mapping.c

View file

2

arch/arm/mm/mm.h

View file

74

arch/arm/mm/mmu.c

View file

2

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

View file

8

arch/arm/plat-samsung/adc.c

View file

3

arch/arm/plat-samsung/devs.c

View file

2

arch/arm/plat-samsung/include/plat/map-s3c.h

View file

2

arch/arm/plat-samsung/include/plat/watchdog-reset.h

View file

1

arch/arm/plat-samsung/s5p-clock.c

View file

3

arch/h8300/include/asm/pgtable.h

View file

3

arch/h8300/include/asm/uaccess.h

View file

2

arch/h8300/kernel/signal.c

View file

1

arch/h8300/kernel/time.c

View file

7

arch/m68k/platform/coldfire/clk.c

View file

4

arch/mips/pci/pci-lantiq.c

View file

3

arch/mn10300/include/asm/ptrace.h

View file

2

arch/mn10300/include/asm/thread_info.h

View file

11

arch/mn10300/include/asm/timex.h

View file

10

arch/mn10300/kernel/cevt-mn10300.c

View file

2

arch/mn10300/kernel/internal.h

View file

4

arch/mn10300/kernel/irq.c

View file

1

arch/mn10300/kernel/traps.c

View file

1

arch/mn10300/mm/dma-alloc.c

View file

4

arch/mn10300/unit-asb2303/include/unit/timex.h

View file

1

arch/mn10300/unit-asb2303/smc91111.c

View file

4

arch/mn10300/unit-asb2305/include/unit/timex.h

View file

1

arch/mn10300/unit-asb2305/unit-init.c

View file

4

arch/mn10300/unit-asb2364/include/unit/timex.h

View file

11

arch/powerpc/include/asm/hw_irq.h

View file

97

arch/powerpc/kernel/entry_64.S

View file

50

arch/powerpc/kernel/irq.c

View file

4

arch/powerpc/kernel/prom_init.c

View file

2

arch/powerpc/kvm/book3s_hv_rmhandlers.S

View file

1

arch/powerpc/kvm/book3s_pr_papr.c

View file

4

arch/powerpc/mm/numa.c

View file

2

arch/powerpc/net/bpf_jit_64.S

View file

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