Merge 3.5-rc4 into tty-next

Browse source

This is to pick up the serial port and tty changes in Linus's tree to allow
everyone to sync up.

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

...

This commit is contained in:

Greg Kroah-Hartman 2012-06-26 16:04:29 -07:00

parent fe89def79c 6b16351acb

commit fc915c8b93

625 changed files with 6553 additions and 3028 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

1

.mailmap

View file

31

Documentation/ABI/testing/sysfs-bus-iio

View file

2

Documentation/arm/SPEAr/overview.txt

View file

22

Documentation/hwmon/coretemp

View file

44

Documentation/networking/stmmac.txt

View file

36

MAINTAINERS

View file

6

Makefile

View file

2

arch/arm/Kconfig

View file

4

arch/arm/boot/dts/mmp2-brownstone.dts

View file

2

arch/arm/boot/dts/omap2.dtsi

View file

2

arch/arm/boot/dts/spear1310-evb.dts

View file

2

arch/arm/boot/dts/spear1310.dtsi

View file

2

arch/arm/boot/dts/spear1340-evb.dts

View file

2

arch/arm/boot/dts/spear1340.dtsi

View file

2

arch/arm/boot/dts/spear13xx.dtsi

View file

2

arch/arm/boot/dts/spear300-evb.dts

View file

2

arch/arm/boot/dts/spear300.dtsi

View file

2

arch/arm/boot/dts/spear310-evb.dts

View file

2

arch/arm/boot/dts/spear310.dtsi

View file

2

arch/arm/boot/dts/spear320-evb.dts

View file

2

arch/arm/boot/dts/spear320.dtsi

View file

2

arch/arm/boot/dts/spear3xx.dtsi

View file

16

arch/arm/common/dmabounce.c

View file

1

arch/arm/include/asm/futex.h

View file

2

arch/arm/include/asm/hardware/sp810.h

View file

1

arch/arm/kernel/entry-armv.S

View file

2

arch/arm/kernel/kprobes-thumb.c

View file

6

arch/arm/mach-highbank/Makefile

View file

1

arch/arm/mach-highbank/core.h

View file

14

arch/arm/mach-highbank/highbank.c

View file

27

arch/arm/mach-highbank/smc.S

View file

1

arch/arm/mach-imx/Kconfig

View file

3

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

View file

4

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

View file

2

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

View file

3

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

View file

3

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

View file

6

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

View file

12

arch/arm/mach-imx/clk-imx51-imx53.c

View file

22

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

View file

95

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

View file

2

arch/arm/mach-imx/crm-regs-imx5.h

View file

42

arch/arm/mach-imx/hotplug.c

View file

1

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

View file

1

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

View file

36

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

View file

2

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

View file

4

arch/arm/mach-imx/mm-imx3.c

View file

2

arch/arm/mach-imx/mm-imx5.c

View file

3

arch/arm/mach-kirkwood/board-iconnect.c

View file

9

arch/arm/mach-kirkwood/common.c

View file

1

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

View file

1

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

View file

7

arch/arm/mach-mmp/irq.c

View file

6

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

View file

28

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

View file

6

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

View file

2

arch/arm/mach-omap2/clock3xxx_data.c

View file

5

arch/arm/mach-omap2/clock44xx_data.c

View file

11

arch/arm/mach-omap2/cm.h

View file

4

arch/arm/mach-omap2/cminst44xx.c

View file

4

arch/arm/mach-omap2/display.c

View file

3

arch/arm/mach-omap2/dsp.c

View file

11

arch/arm/mach-omap2/id.c

View file

1

arch/arm/mach-omap2/irq.c

View file

4

arch/arm/mach-omap2/mux.c

View file

11

arch/arm/mach-omap2/mux.h

View file

2

arch/arm/mach-omap2/omap_hwmod.c

View file

8

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

View file

3

arch/arm/mach-omap2/omap_l3_smx.c

View file

6

arch/arm/mach-omap2/omap_phy_internal.c

View file

1

arch/arm/mach-omap2/pm34xx.c

View file

14

arch/arm/mach-omap2/prm2xxx_3xxx.c

View file

67

arch/arm/mach-omap2/serial.c

View file

6

arch/arm/mach-omap2/usb-musb.c

View file

2

arch/arm/mach-omap2/usb-tusb6010.c

View file

2

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

View file

22

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

View file

1

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

View file

2

arch/arm/mach-spear13xx/include/mach/debug-macro.S

View file

2

arch/arm/mach-spear13xx/include/mach/dma.h

View file

2

arch/arm/mach-spear13xx/include/mach/generic.h

View file

2

arch/arm/mach-spear13xx/include/mach/gpio.h

View file

2

arch/arm/mach-spear13xx/include/mach/irqs.h

View file

2

arch/arm/mach-spear13xx/include/mach/spear.h

View file

2

arch/arm/mach-spear13xx/include/mach/timex.h

View file

2

arch/arm/mach-spear13xx/include/mach/uncompress.h

View file

2

arch/arm/mach-spear13xx/spear1310.c

View file

2

arch/arm/mach-spear13xx/spear1340.c

View file

2

arch/arm/mach-spear13xx/spear13xx.c

View file

2

arch/arm/mach-spear3xx/include/mach/debug-macro.S

View file

2

arch/arm/mach-spear3xx/include/mach/generic.h

View file

2

arch/arm/mach-spear3xx/include/mach/gpio.h

View file

2

arch/arm/mach-spear3xx/include/mach/irqs.h

View file

2

arch/arm/mach-spear3xx/include/mach/misc_regs.h

View file

2

arch/arm/mach-spear3xx/include/mach/spear.h

View file

2

arch/arm/mach-spear3xx/include/mach/timex.h

View file

2

arch/arm/mach-spear3xx/include/mach/uncompress.h

View file

2

arch/arm/mach-spear3xx/spear300.c

View file

2

arch/arm/mach-spear3xx/spear310.c

View file

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