Merge branch 'next/soc-exynos5250-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers

Browse source

* 'next/soc-exynos5250-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (201 commits)
  gpio/samsung: use ioremap() for EXYNOS4 GPIOlib
  gpio/samsung: add support GPIOlib for EXYNOS5250
  ARM: EXYNOS: add support GPIO for EXYNOS5250
(update to v3.3-rc7)

Conflicts:
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c

The dummy clock for the pxa rtc in those files keeps getting added and
removed in various trees. Apparently removing is the correct solution.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

...

This commit is contained in:

Arnd Bergmann 2012-03-15 20:50:16 +00:00

parent e594a97c8c d39c815278

commit 4788d72ce6

223 changed files with 1854 additions and 824 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

6

Documentation/devicetree/bindings/gpio/led.txt

View file

1

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

26

Documentation/hwmon/jc42

View file

3

Documentation/input/alps.txt

View file

6

Documentation/kernel-parameters.txt

View file

6

MAINTAINERS

View file

2

Makefile

View file

2

arch/alpha/include/asm/futex.h

View file

2

arch/arm/Kconfig

View file

1

arch/arm/boot/.gitignore vendored

View file

2

arch/arm/include/asm/pmu.h

View file

1

arch/arm/kernel/ecard.c

View file

45

arch/arm/kernel/perf_event.c

View file

22

arch/arm/kernel/perf_event_v6.c

View file

11

arch/arm/kernel/perf_event_v7.c

View file

20

arch/arm/kernel/perf_event_xscale.c

View file

2

arch/arm/mach-ep93xx/vision_ep9307.c

View file

15

arch/arm/mach-exynos/common.c

View file

241

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

View file

4

arch/arm/mach-exynos/include/mach/map.h

View file

2

arch/arm/mach-exynos/mach-universal_c210.c

View file

1

arch/arm/mach-omap2/id.c

View file

3

arch/arm/mach-omap2/mailbox.c

View file

3

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

View file

2

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

View file

1

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

View file

1

arch/arm/mach-pxa/generic.h

View file

7

arch/arm/mach-pxa/mfp-pxa2xx.c

View file

3

arch/arm/mach-pxa/pxa25x.c

View file

3

arch/arm/mach-pxa/pxa27x.c

View file

1

arch/arm/mach-pxa/pxa3xx.c

View file

1

arch/arm/mach-pxa/pxa95x.c

View file

2

arch/arm/mach-s3c2440/common.h

View file

2

arch/arm/mach-s3c2440/mach-anubis.c

View file

2

arch/arm/mach-s3c2440/mach-at2440evb.c

View file

2

arch/arm/mach-s3c2440/mach-gta02.c

View file

2

arch/arm/mach-s3c2440/mach-mini2440.c

View file

2

arch/arm/mach-s3c2440/mach-nexcoder.c

View file

2

arch/arm/mach-s3c2440/mach-osiris.c

View file

2

arch/arm/mach-s3c2440/mach-rx1950.c

View file

2

arch/arm/mach-s3c2440/mach-rx3715.c

View file

2

arch/arm/mach-s3c2440/mach-smdk2440.c

View file

13

arch/arm/mach-s3c2440/s3c2440.c

View file

12

arch/arm/mach-s3c2440/s3c244x.c

View file

2

arch/arm/mach-ux500/Kconfig

View file

2

arch/arm/mach-vexpress/Kconfig

View file

4

arch/arm/mm/proc-v7.S

View file

10

arch/arm/plat-omap/include/plat/irqs.h

View file

2

arch/arm/plat-s3c24xx/dma.c

View file

2

arch/arm/plat-samsung/devs.c

View file

6

arch/arm/plat-spear/time.c

View file

4

arch/c6x/include/asm/processor.h

View file

2

arch/mips/alchemy/common/time.c

View file

2

arch/mips/ath79/dev-wmac.c

View file

4

arch/mips/configs/nlm_xlp_defconfig

View file

4

arch/mips/configs/nlm_xlr_defconfig

View file

2

arch/mips/configs/powertv_defconfig

View file

20

arch/mips/include/asm/mach-au1x00/gpio-au1300.h

View file

3

arch/mips/include/asm/page.h

View file

1

arch/mips/kernel/smp-bmips.c

View file

2

arch/mips/kernel/traps.c

View file

1

arch/mips/kernel/vmlinux.lds.S

View file

36

arch/mips/mm/fault.c

View file

5

arch/mips/pci/pci.c

View file

10

arch/mips/pmc-sierra/yosemite/ht-irq.c

View file

2

arch/mips/txx9/generic/7segled.c

View file

14

arch/x86/ia32/ia32_aout.c

View file

4

arch/x86/lib/delay.c

View file

4

arch/x86/mm/hugetlbpage.c

View file

22

arch/x86/pci/acpi.c

View file

2

drivers/block/floppy.c

View file

487

drivers/gpio/gpio-samsung.c

View file

2

drivers/gpu/drm/gma500/cdv_device.c

View file

1

drivers/gpu/drm/gma500/framebuffer.c

View file

9

drivers/gpu/drm/gma500/gtt.c

View file

3

drivers/gpu/drm/radeon/r600.c

View file

8

drivers/gpu/drm/radeon/r600_blit_shaders.c

View file

1

drivers/gpu/drm/radeon/r600d.h

View file

2

drivers/gpu/drm/radeon/radeon_connectors.c

View file

18

drivers/gpu/drm/radeon/radeon_display.c

View file

6

drivers/gpu/drm/radeon/radeon_encoders.c

View file

11

drivers/gpu/drm/radeon/radeon_fb.c

View file

2

drivers/gpu/drm/radeon/radeon_mode.h

View file

3

drivers/hid/hid-ids.h

View file

9

drivers/hid/hid-input.c

View file

1

drivers/hid/usbhid/hid-quirks.c

View file

5

drivers/hwmon/Kconfig

View file

30

drivers/hwmon/jc42.c

View file

3

drivers/hwmon/pmbus/pmbus_core.c

View file

10

drivers/hwmon/pmbus/zl6100.c

View file

2

drivers/input/evdev.c

View file

6

drivers/input/misc/twl4030-vibra.c

View file

7

drivers/input/mouse/alps.c

View file

2

drivers/input/tablet/Kconfig

View file

2

drivers/input/tablet/wacom_wac.c

View file

2

drivers/iommu/amd_iommu_init.c

View file

2

drivers/md/dm-flakey.c

View file

23

drivers/md/dm-io.c

View file

2

drivers/md/dm-ioctl.c

View file

17

drivers/md/dm-raid.c

View file

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