Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-13 00:20:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux-stable/arch/arm
History
Lee Jones e6fada59d4 ARM: ux500: Re-enable SMSC911x platform code registration during non-DT boots 
The patch to disable SMSC911x registration was applied twice in the upstream
kernel by mistake. Git interpreted this as 'take the same entry from a
similar struct' which was close by. This was the wrong thing to do. This patch
rectifies this error and re-enables SMSC911x registration when Device Tree is
not enabled.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-06-01 02:04:18 +02:00
..
boot
ARM: ux500: PRCMU related configuration and layout corrections for Device Tree
2012-06-01 02:04:14 +02:00
common
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-05-25 09:18:59 -07:00
configs
rtc: rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC
2012-05-29 16:22:33 -07:00
include/asm
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-05-29 18:21:44 -07:00
kernel
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-05-29 18:21:44 -07:00
lib
ARM: Remove support for ARMv3 ARM610 and ARM710 CPUs
2012-05-05 05:50:50 +01:00
mach-at91
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-05-25 09:31:59 -07:00
mach-bcmring
ARM: bcmring: fix UART declarations
2012-04-18 21:21:45 -07:00
mach-clps711x
ARM: clps711x: Cleanup IRQ handling
2012-05-15 21:20:59 +02:00
mach-cns3xxx
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
mach-davinci
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
mach-dove
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
mach-ebsa110
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
mach-ep93xx
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
mach-exynos
Merge branch 'late/soc' into devel-late
2012-05-30 16:06:46 -07:00
mach-footbridge
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
mach-gemini
ARM: remove bunch of now unused mach/io.h files
2012-03-06 21:34:44 -06:00
mach-h720x
ARM: A few more platform fixes for include file fallout
2012-03-30 17:00:34 -07:00
mach-highbank
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
mach-imx
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
mach-integrator
Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and 'versatile' into for-linus
2012-05-21 15:15:10 +01:00
mach-iop13xx
ARM: PCI: get rid of pci_std_swizzle()
2012-05-13 17:12:16 +01:00
mach-iop32x
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
mach-iop33x
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
mach-ixp4xx
Merge branches 'fixes' and 'fixes2' into devel-late
2012-05-30 16:16:12 -07:00
mach-kirkwood
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
mach-ks8695
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
mach-l7200/include/mach
…
mach-lpc32xx
GPIO driver changes for v3.5 merge window
2012-05-24 14:01:46 -07:00
mach-mmp
arm-soc: board specific changes
2012-05-22 13:32:53 -07:00
mach-msm
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
mach-mv78xx0
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
mach-mxs
arm-soc: device tree conversions, part 2
2012-05-26 12:57:47 -07:00
mach-netx
ARM: __io abuse cleanup
2012-03-13 21:25:21 -05:00
mach-nomadik
ARM: nomadik: enable PINCTRL_NOMADIK where needed
2012-05-15 14:42:57 +02:00
mach-omap1
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
mach-omap2
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
mach-orion5x
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
mach-picoxcell
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
mach-pnx4008
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
mach-prima2
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
mach-pxa
arm-soc: board specific changes
2012-05-22 13:32:53 -07:00
mach-realview
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
mach-rpc
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
mach-s3c24xx
Merge branch 'late/soc' into devel-late
2012-05-30 16:06:46 -07:00
mach-s3c64xx
Merge branch 'late/board' into devel-late
2012-05-30 16:06:56 -07:00
mach-s3c2410
Disintegrate asm/system.h for ARM
2012-03-28 18:30:01 +01:00
mach-s3c2412
Disintegrate asm/system.h for ARM
2012-03-28 18:30:01 +01:00
mach-s3c2440
Disintegrate asm/system.h for ARM
2012-03-28 18:30:01 +01:00
mach-s5p64x0
ARM: S5P64X0: Use common macro to define resources on dev-audio.c
2012-05-12 16:12:30 +09:00
mach-s5pc100
ARM: S5PC100: Use common macro to define resources on dev-audio.c
2012-05-12 16:12:30 +09:00
mach-s5pv210
USB 3.5-rc1 pull request
2012-05-22 15:50:46 -07:00
mach-sa1100
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-05-29 18:21:44 -07:00
mach-shark
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
mach-shmobile
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
mach-spear3xx
arm-soc: soc-specific pinctrl changes
2012-05-22 09:39:42 -07:00
mach-spear6xx
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
mach-spear13xx
pinctrl: Add SPEAr13xx pinctrl drivers
2012-05-14 17:34:07 +02:00
mach-tegra
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
mach-u300
ARM: u300: bump all IRQ numbers by one
2012-04-20 09:52:58 +02:00
mach-ux500
ARM: ux500: Re-enable SMSC911x platform code registration during non-DT boots
2012-06-01 02:04:18 +02:00
mach-versatile
Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and 'versatile' into for-linus
2012-05-21 15:15:10 +01:00
mach-vexpress
Merge branch 'late/soc' into devel-late
2012-05-30 16:06:46 -07:00
mach-vt8500
ARM: remove bunch of now unused mach/io.h files
2012-03-06 21:34:44 -06:00
mach-w90x900
ARM: A few more platform fixes for include file fallout
2012-03-30 17:00:34 -07:00
mach-zynq
ARM: remove bunch of now unused mach/io.h files
2012-03-06 21:34:44 -06:00
mm
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-05-25 09:18:59 -07:00
net
ARM: 7259/3: net: JIT compiler for packet filters
2012-03-24 09:38:56 +00:00
nwfpe
Merge branch 'master' into for-next
2012-04-08 21:48:52 +02:00
oprofile
…
plat-iop
ARM: PCI: provide a default bus scan implementation
2012-05-13 17:12:17 +01:00
plat-mxc
arm-soc: sweeping late_initcall cleanup
2012-05-26 13:14:01 -07:00
plat-nomadik
ARM: nomadik: enable PINCTRL_NOMADIK where needed
2012-05-15 14:42:57 +02:00
plat-omap
arm-soc: cleanups, part 2
2012-05-26 12:31:49 -07:00
plat-orion
arm-soc: clock driver changes
2012-05-26 12:42:29 -07:00
plat-pxa
Input: pxa27x_keypad add choice to set direct_key_mask
2012-04-27 16:50:05 +08:00
plat-s3c24xx
ARM: S3C24XX: move common clock init into common.c
2012-05-12 16:22:18 +09:00
plat-samsung
Merge branch 'late/soc' into devel-late
2012-05-30 16:06:46 -07:00
plat-spear
arm-soc: soc-specific pinctrl changes
2012-05-22 09:39:42 -07:00
plat-versatile
ARM: 7389/2: plat-versatile: modernize FPGA IRQ controller
2012-05-04 16:53:37 +01:00
tools
ARM: Update mach-types
2012-04-26 08:46:02 +01:00
vfp
Merge branch 'misc' into for-linus
2012-05-21 15:15:24 +01:00
Kconfig
Merge branches 'fixes' and 'fixes2' into devel-late
2012-05-30 16:16:12 -07:00
Kconfig-nommu
…
Kconfig.debug
arm-soc: device tree conversions, part 2
2012-05-26 12:57:47 -07:00
Makefile
arm-soc: soc specific changes, part 2
2012-05-26 13:05:55 -07:00