Merge branch 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6 into next/soc

Browse source

* 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6: (604 commits)
  ARM: LPC32xx: defconfig update: Cleanup (EXPERIMENTAL)
  ARM: LPC32xx: defconfig update: Remove the museum NAND option
  ARM: LPC32xx: defconfig update: Default drivers and cleanup
  ARM: LPC32xx: defconfig update: gpio and keys
  + Linux 3.9-rc4

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/Kconfig

...

This commit is contained in:

Olof Johansson 2013-04-02 18:33:58 -07:00

parent 5f03dc2002 17e7979f83

commit 06b851e58b

635 changed files with 5768 additions and 3251 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

8

CREDITS

View file

6

Documentation/devicetree/bindings/mfd/ab8500.txt

View file

3

Documentation/devicetree/bindings/tty/serial/of-serial.txt

View file

2

Documentation/hwmon/lm75

View file

2

Documentation/i2c/busses/i2c-diolan-u2c

View file

65

Documentation/input/alps.txt

View file

77

Documentation/networking/tuntap.txt

View file

2

Documentation/sound/alsa/ALSA-Configuration.txt

View file

2

Documentation/sound/alsa/seq_oss.html

View file

2

Documentation/trace/ftrace.txt

View file

60

MAINTAINERS

View file

2

Makefile

View file

7

arch/Kconfig

View file

2

arch/alpha/Kconfig

View file

22

arch/arm/Kconfig

View file

2

arch/arm/Kconfig.debug

View file

2

arch/arm/boot/Makefile

View file

8

arch/arm/boot/dts/armada-370-rd.dts

View file

5

arch/arm/boot/dts/armada-370-xp.dtsi

View file

4

arch/arm/boot/dts/armada-xp.dtsi

View file

28

arch/arm/boot/dts/at91sam9x5.dtsi

View file

2

arch/arm/boot/dts/bcm2835.dtsi

View file

3

arch/arm/boot/dts/dbx5x0.dtsi

View file

5

arch/arm/boot/dts/dove.dtsi

View file

9

arch/arm/boot/dts/exynos4.dtsi

View file

6

arch/arm/boot/dts/exynos5440.dtsi

View file

2

arch/arm/boot/dts/href.dtsi

View file

2

arch/arm/boot/dts/hrefv60plus.dts

View file

3

arch/arm/boot/dts/imx53-mba53.dts

View file

2

arch/arm/boot/dts/kirkwood-dns320.dts

View file

1

arch/arm/boot/dts/kirkwood-dns325.dts

View file

1

arch/arm/boot/dts/kirkwood-dockstar.dts

View file

1

arch/arm/boot/dts/kirkwood-dreamplug.dts

View file

1

arch/arm/boot/dts/kirkwood-goflexnet.dts

View file

1

arch/arm/boot/dts/kirkwood-ib62x0.dts

View file

1

arch/arm/boot/dts/kirkwood-iconnect.dts

View file

1

arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts

View file

1

arch/arm/boot/dts/kirkwood-km_kirkwood.dts

View file

1

arch/arm/boot/dts/kirkwood-lschlv2.dts

View file

1

arch/arm/boot/dts/kirkwood-lsxhl.dts

View file

1

arch/arm/boot/dts/kirkwood-mplcec4.dts

View file

1

arch/arm/boot/dts/kirkwood-ns2-common.dtsi

View file

1

arch/arm/boot/dts/kirkwood-nsa310.dts

View file

2

arch/arm/boot/dts/kirkwood-openblocks_a6.dts

View file

1

arch/arm/boot/dts/kirkwood-topkick.dts

View file

5

arch/arm/boot/dts/kirkwood.dtsi

View file

2

arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts

View file

2

arch/arm/boot/dts/snowball.dts

View file

3

arch/arm/boot/dts/socfpga.dtsi

View file

1

arch/arm/boot/dts/tegra20.dtsi

View file

1

arch/arm/boot/dts/tegra30.dtsi

View file

21

arch/arm/configs/lpc32xx_defconfig

View file

1

arch/arm/configs/mxs_defconfig

View file

2

arch/arm/configs/omap2plus_defconfig

View file

25

arch/arm/include/asm/xen/events.h

View file

2

arch/arm/kernel/smp.c

View file

33

arch/arm/lib/memset.S

View file

1

arch/arm/mach-at91/board-foxg20.c

View file

1

arch/arm/mach-at91/board-stamp9g20.c

View file

8

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

View file

20

arch/arm/mach-at91/irq.c

View file

10

arch/arm/mach-at91/pm.c

View file

3

arch/arm/mach-davinci/dma.c

View file

1

arch/arm/mach-footbridge/Kconfig

View file

1

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

View file

2

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

View file

18

arch/arm/mach-imx/headsmp.S

View file

5

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

View file

15

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

View file

1

arch/arm/mach-ixp4xx/vulcan-setup.c

View file

25

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

View file

1

arch/arm/mach-mmp/gplugd.c

View file

2

arch/arm/mach-mxs/icoll.c

View file

10

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

View file

1

arch/arm/mach-mxs/mm.c

View file

1

arch/arm/mach-mxs/ocotp.c

View file

2

arch/arm/mach-omap1/common.h

View file

6

arch/arm/mach-omap2/Kconfig

View file

2

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

View file

2

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

View file

1

arch/arm/mach-omap2/common.h

View file

6

arch/arm/mach-omap2/gpmc.c

View file

9

arch/arm/mach-omap2/mux.c

View file

1

arch/arm/mach-pxa/raumfeld.c

View file

36

arch/arm/mach-s5pv210/clock.c

View file

2

arch/arm/mach-s5pv210/mach-goni.c

View file

1

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

View file

2

arch/arm/mach-spear3xx/spear3xx.c

View file

5

arch/arm/mm/dma-mapping.c

View file

2

arch/arm/net/bpf_jit_32.c

View file

7

arch/arm/plat-orion/addr-map.c

View file

2

arch/arm/plat-spear/Kconfig

View file

1

arch/arm64/Kconfig

View file

11

arch/arm64/Kconfig.debug

View file

1

arch/arm64/configs/defconfig

View file

2

arch/arm64/include/asm/ucontext.h

View file

2

arch/arm64/kernel/arm64ksyms.c

View file

1

arch/arm64/kernel/signal32.c

View file

2

arch/avr32/Kconfig

View file

2

arch/blackfin/Kconfig

View file

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