Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable

Browse source

Conflicts:
	arch/arm/common/gic.c
	arch/arm/plat-omap/include/plat/common.h

...

This commit is contained in:

Russell King 2011-12-05 23:20:17 +00:00

parent ba8bb18a03 ae72fd588a

commit 742eaa6a6e

683 changed files with 7734 additions and 5721 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

13

Documentation/ABI/testing/sysfs-block

View file

7

Documentation/DocBook/uio-howto.tmpl

View file

14

Documentation/blockdev/cciss.txt

View file

1

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

4

Documentation/filesystems/btrfs.txt

View file

36

Documentation/i2c/ten-bit-addresses

View file

2

Documentation/networking/ip-sysctl.txt

View file

105

Documentation/power/devices.txt

View file

40

Documentation/power/runtime_pm.txt

View file

14

Documentation/serial/serial-rs485.txt

View file

8

Documentation/sound/alsa/HD-Audio.txt

View file

39

MAINTAINERS

View file

2

Makefile

View file

20

arch/arm/Kconfig

View file

2

arch/arm/boot/Makefile

View file

15

arch/arm/common/gic.c

View file

12

arch/arm/common/pl330.c

View file

7

arch/arm/configs/at91cap9adk_defconfig → arch/arm/configs/at91cap9_defconfig

View file

47

arch/arm/configs/at91rm9200_defconfig

View file

16

arch/arm/configs/at91sam9260ek_defconfig → arch/arm/configs/at91sam9260_defconfig

View file

23

arch/arm/configs/at91sam9g20ek_defconfig → arch/arm/configs/at91sam9g20_defconfig

View file

7

arch/arm/configs/at91sam9g45_defconfig

View file

5

arch/arm/configs/at91sam9rlek_defconfig → arch/arm/configs/at91sam9rl_defconfig

View file

2

arch/arm/configs/ezx_defconfig

View file

2

arch/arm/configs/imote2_defconfig

View file

2

arch/arm/configs/magician_defconfig

View file

1

arch/arm/configs/omap1_defconfig

View file

13

arch/arm/configs/u300_defconfig

View file

14

arch/arm/configs/u8500_defconfig

View file

2

arch/arm/configs/zeus_defconfig

View file

179

arch/arm/include/asm/cti.h

View file

2

arch/arm/include/asm/hardware/cache-l2x0.h

View file

1

arch/arm/include/asm/mach/arch.h

View file

3

arch/arm/include/asm/perf_event.h

View file

25

arch/arm/include/asm/pmu.h

View file

2

arch/arm/include/asm/topology.h

View file

2

arch/arm/include/asm/unistd.h

View file

2

arch/arm/kernel/calls.S

View file

2

arch/arm/kernel/entry-armv.S

View file

2

arch/arm/kernel/head.S

View file

4

arch/arm/kernel/kprobes-arm.c

View file

27

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

View file

16

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

View file

102

arch/arm/kernel/kprobes-test.h

View file

35

arch/arm/kernel/machine_kexec.c

View file

30

arch/arm/kernel/perf_event.c

View file

32

arch/arm/kernel/perf_event_v6.c

View file

399

arch/arm/kernel/perf_event_v7.c

View file

16

arch/arm/kernel/perf_event_xscale.c

View file

1

arch/arm/kernel/pmu.c

View file

3

arch/arm/kernel/process.c

View file

6

arch/arm/kernel/setup.c

View file

2

arch/arm/kernel/topology.c

View file

26

arch/arm/lib/bitops.h

View file

4

arch/arm/lib/changebit.S

View file

4

arch/arm/lib/clearbit.S

View file

4

arch/arm/lib/setbit.S

View file

4

arch/arm/lib/testchangebit.S

View file

4

arch/arm/lib/testclearbit.S

View file

4

arch/arm/lib/testsetbit.S

View file

2

arch/arm/mach-bcmring/core.c

View file

1

arch/arm/mach-bcmring/dma.c

View file

2

arch/arm/mach-exynos/cpuidle.c

View file

4

arch/arm/mach-highbank/highbank.c

View file

13

arch/arm/mach-imx/Kconfig

View file

7

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

View file

1

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

View file

109

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

View file

7

arch/arm/mach-imx/src.c

View file

2

arch/arm/mach-mmp/gplugd.c

View file

2

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

View file

5

arch/arm/mach-mx5/cpu.c

View file

6

arch/arm/mach-mx5/mm.c

View file

2

arch/arm/mach-mxs/clock-mx28.c

View file

8

arch/arm/mach-omap1/Kconfig

View file

10

arch/arm/mach-omap1/board-ams-delta.c

View file

3

arch/arm/mach-omap1/clock.h

View file

53

arch/arm/mach-omap1/clock_data.c

View file

3

arch/arm/mach-omap1/devices.c

View file

1

arch/arm/mach-omap2/Kconfig

View file

5

arch/arm/mach-omap2/Makefile

View file

1

arch/arm/mach-omap2/cpuidle34xx.c

View file

159

arch/arm/mach-omap2/display.c

View file

29

arch/arm/mach-omap2/display.h

View file

0

arch/arm/mach-omap2/io.h

View file

6

arch/arm/mach-omap2/omap_hwmod.c

View file

17

arch/arm/mach-omap2/omap_hwmod_2420_data.c

View file

17

arch/arm/mach-omap2/omap_hwmod_2430_data.c

View file

5

arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c

View file

37

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

View file

24

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

View file

4

arch/arm/mach-omap2/omap_hwmod_common_data.c

View file

4

arch/arm/mach-omap2/omap_hwmod_common_data.h

View file

2

arch/arm/mach-omap2/omap_l3_noc.c

View file

6

arch/arm/mach-omap2/pm.c

View file

2

arch/arm/mach-omap2/smartreflex.c

View file

11

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

View file

3

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

View file

2

arch/arm/mach-pxa/balloon3.c

View file

2

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

View file

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