Merge branch 'master' into usb-next

Browse source

We have USB fixes now in Linus's tree that we need to properly sort out
with reverts and the like in the usb-next branch, so merge them together
and do it by hand.

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

...

This commit is contained in:

Greg Kroah-Hartman 2013-09-23 13:24:10 -07:00

parent c8f2efc8f6 9d23108df3

commit dc4fea795b

460 changed files with 4054 additions and 2269 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

14

Documentation/arm64/tagged-pointers.txt

View file

14

Documentation/filesystems/vfs.txt

View file

6

Documentation/networking/bonding.txt

View file

4

Documentation/scheduler/sched-design-CFS.txt

View file

1

arch/arm/boot/dts/Makefile

View file

262

arch/arm/boot/dts/am335x-bone-common.dtsi

View file

256

arch/arm/boot/dts/am335x-bone.dts

View file

17

arch/arm/boot/dts/am335x-boneblack.dts

View file

6

arch/arm/boot/dts/imx27.dtsi

View file

2

arch/arm/boot/dts/imx51.dtsi

View file

4

arch/arm/boot/dts/imx6q-pinfunc.h

View file

2

arch/arm/boot/dts/omap3-beagle-xm.dts

View file

14

arch/arm/boot/dts/omap3-igep.dtsi

View file

46

arch/arm/boot/dts/omap4-panda-common.dtsi

View file

39

arch/arm/boot/dts/omap4-sdp.dts

View file

7

arch/arm/boot/dts/omap5.dtsi

View file

2

arch/arm/configs/multi_v7_defconfig

View file

1

arch/arm/mach-imx/clk-fixup-mux.c

View file

2

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

View file

4

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

View file

9

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

View file

11

arch/arm/mach-imx/system.c

View file

2

arch/arm/mach-omap2/cclock44xx_data.c

View file

2

arch/arm/mach-omap2/cpuidle44xx.c

View file

4

arch/arm/mach-omap2/gpmc.c

View file

2

arch/arm/mach-omap2/mux34xx.c

View file

2

arch/arm/mach-omap2/omap-smp.c

View file

2

arch/arm/mach-omap2/omap_device.c

View file

2

arch/arm/mach-sa1100/collie.c

View file

2

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

View file

2

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

View file

10

arch/arm/mach-u300/Kconfig

View file

1

arch/arm/mach-ux500/cache-l2x0.c

View file

2

arch/arm64/include/asm/hwcap.h

View file

21

arch/arm64/kernel/process.c

View file

2

arch/arm64/kernel/setup.c

View file

2

arch/arm64/mm/fault.c

View file

3

arch/mips/Makefile

View file

3

arch/mips/alchemy/common/usb.c

View file

4

arch/mips/bcm63xx/cpu.c

View file

2

arch/mips/boot/dts/include/dt-bindings

View file

1

arch/mips/cavium-octeon/csrc-octeon.c

View file

1

arch/mips/dec/prom/init.c

View file

6

arch/mips/include/asm/cpu-features.h

View file

1

arch/mips/include/asm/cpu-info.h

View file

203

arch/mips/include/asm/cpu-type.h

View file

38

arch/mips/include/asm/cpu.h

View file

4

arch/mips/include/asm/mach-au1x00/au1000.h

View file

2

arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h

View file

2

arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h

View file

2

arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h

View file

7

arch/mips/include/asm/mipsregs.h

View file

12

arch/mips/include/asm/pci.h

View file

33

arch/mips/include/asm/timex.h

View file

3

arch/mips/include/asm/vga.h

View file

58

arch/mips/kernel/cpu-probe.c

View file

3

arch/mips/kernel/idle.c

View file

1

arch/mips/kernel/time.c

View file

3

arch/mips/kernel/traps.c

View file

6

arch/mips/mm/c-octeon.c

View file

48

arch/mips/mm/c-r4k.c

View file

1

arch/mips/mm/dma-default.c

View file

1

arch/mips/mm/page.c

View file

3

arch/mips/mm/sc-mips.c

View file

1

arch/mips/mm/tlb-r4k.c

View file

1

arch/mips/mm/tlbex.c

View file

5

arch/mips/mti-malta/malta-time.c

View file

3

arch/mips/mti-sead3/sead3-time.c

View file

3

arch/mips/netlogic/xlr/fmn-config.c

View file

1

arch/mips/oprofile/common.c

View file

1

arch/mips/pci/pci-bcm1480.c

View file

3

arch/mips/sibyte/bcm1480/setup.c

View file

3

arch/mips/sibyte/sb1250/setup.c

View file

3

arch/mips/sni/setup.c

View file

2

arch/tile/Kconfig

View file

90

arch/tile/gxio/iorpc_mpipe.c

View file

15

arch/tile/gxio/iorpc_mpipe_info.c

View file

28

arch/tile/gxio/iorpc_trio.c

View file

8

arch/tile/gxio/iorpc_usb_host.c

View file

8

arch/tile/gxio/usb_host.c

View file

24

arch/tile/include/arch/mpipe.h

View file

6

arch/tile/include/arch/mpipe_constants.h

View file

54

arch/tile/include/arch/mpipe_shm.h

View file

10

arch/tile/include/arch/trio_constants.h

View file

5

arch/tile/include/asm/page.h

View file

12

arch/tile/include/asm/pgtable_32.h

View file

4

arch/tile/include/asm/pgtable_64.h

View file

52

arch/tile/include/gxio/iorpc_mpipe.h

View file

12

arch/tile/include/gxio/iorpc_mpipe_info.h

View file

28

arch/tile/include/gxio/iorpc_trio.h

View file

8

arch/tile/include/gxio/iorpc_usb_host.h

View file

8

arch/tile/include/gxio/usb_host.h

View file

2

arch/tile/kernel/compat.c

View file

55

arch/tile/kernel/futex_64.S

View file

3

arch/tile/kernel/setup.c

View file

4

arch/tile/kernel/unaligned.c

View file

2

arch/tile/mm/fault.c

View file

4

arch/tile/mm/init.c

View file

3

arch/tile/mm/pgtable.c

View file

5

arch/x86/Kconfig

View file

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