Linus Torvalds
b14a29982a
Merge branch 'omap-fixes-warnings' of git://git.linaro.org/people/rmk/linux-arm ...
This set of changes are fixing various section mismatch warnings which
look to be completely valid. Primerily, those which are fixed are those
which can cause oopses by manipulation of driver binding via sysfs. For
example: calling code marked __init from driver probe __devinit
functions.
Some of these changes will be reworked at the next merge window when the
underlying reasons are sorted out. In the mean time, I think it's
important to have this fixed for correctness.
Also included in this set are fixes to various error messages in OMAP -
including making them gramatically correct, fixing a few spelling
errors, and more importantly, making them greppable by unwrapping them.
Tony Lindgren has acked all these patches, put them out for testing a
week ago, and I've tested them on the platforms I have.
* 'omap-fixes-warnings' of git://git.linaro.org/people/rmk/linux-arm:
ARM: omap: resolve nebulous 'Error setting wl12xx data'
ARM: omap: fix wrapped error messages in omap_hwmod.c
ARM: omap: fix section mismatch warnings in mux.c caused by hsmmc.c
ARM: omap: fix section mismatch warning for sdp3430_twl_gpio_setup()
ARM: omap: fix section mismatch error for omap_4430sdp_display_init()
ARM: omap: fix section mismatch warning for omap_secondary_startup()
ARM: omap: preemptively fix section mismatch in omap4_sdp4430_wifi_mux_init()
ARM: omap: fix section mismatch warning in mux.c
ARM: omap: fix section mismatch errors in TWL PMIC driver
ARM: omap: fix uninformative vc/i2c configuration error message
ARM: omap: fix vc.c PMIC error message
ARM: omap: fix prm44xx.c OMAP44XX_IRQ_PRCM build error
2012-02-13 14:16:07 -08:00
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2012-01-16 14:34:54 -08:00
ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP
2012-01-23 10:20:05 +00:00
Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.
2012-01-23 14:50:30 -08:00
include /asm
ARM: 7302/1: Add TLB flushing for both entries in a PMD
2012-02-02 17:37:42 +00:00
ARM: 7322/1: Print BUG instead of undefined instruction on BUG_ON()
2012-02-09 16:25:37 +00:00
ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts
2012-01-25 11:07:40 +00:00
ARM: at91: Fix at91sam9g45 and at91cap9 reset
2012-01-20 17:22:50 +01:00
ARM: bcmring: fix build failure in mach-bcmring/arch.c
2012-02-04 11:38:20 -08:00
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
ARM: davinci: update mdio bus name
2012-01-27 22:29:09 +05:30
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP
2012-01-23 10:20:05 +00:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
ARM: big removal of now unused vmalloc.h files
2011-11-26 19:21:29 -05:00
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP
2012-01-23 10:20:05 +00:00
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
2012-01-28 13:27:10 -08:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
mach-l7200/include /mach
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-01-07 12:03:30 -08:00
Merge branch 'samsung/driver' into next/drivers
2012-01-09 16:16:29 +00:00
ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP
2012-01-23 10:20:05 +00:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
clock management changes for i.MX
2012-01-09 14:44:15 -08:00
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
New feature development
2012-01-09 14:38:51 -08:00
Merge branch 'omap-fixes-warnings' of git://git.linaro.org/people/rmk/linux-arm
2012-02-13 14:16:07 -08:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
Merge branch 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.6-ji into fixes
2012-01-16 22:45:42 -08:00
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
Revert "RTC: sa1100: support sa1100, pxa and mmp soc families"
2012-01-19 17:19:18 +00:00
ARM: 7298/1: realview: fix mapping of MPCore private memory region
2012-01-25 09:24:36 +00:00
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
Merge branch 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
2012-01-16 22:46:19 -08:00
Device tree conversions for samsung and tegra
2012-01-09 14:28:38 -08:00
Device tree conversions for samsung and tegra
2012-01-09 14:28:38 -08:00
Cleanups for the Samsung platforms
2012-01-09 14:30:28 -08:00
Board-level changes
2012-01-09 14:37:41 -08:00
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-01-07 12:03:30 -08:00
Driver specific changes
2012-01-09 14:39:22 -08:00
Cleanups for the Samsung platforms
2012-01-09 14:30:28 -08:00
Cleanups for the Samsung platforms
2012-01-09 14:30:28 -08:00
Merge branch 'sa11x0-mcp-fixes' into fixes
2012-01-26 21:06:54 +00:00
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
2012-02-04 10:54:26 -08:00
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
2012-01-12 08:00:30 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
2012-01-10 10:19:57 -08:00
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
2012-01-28 13:27:10 -08:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP
2012-01-23 10:20:05 +00:00
ARM: big removal of now unused vmalloc.h files
2011-11-26 19:21:29 -05:00
Merge branch 'master' into fixes
2012-01-13 15:00:22 +00:00
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
ARM: 7321/1: cache-v7: Disable preemption when reading CCSIDR
2012-02-09 16:25:37 +00:00
ARM: 7207/1: Use generic ARM instruction set condition code checks for nwfpe.
2011-12-13 08:52:02 +00:00
oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue
2011-12-23 11:58:34 +01:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
arm-soc fixes for 3.3-rc:
2012-01-28 13:21:54 -08:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
ARM: Add arm_memblock_steal() to allocate memory away from the kernel
2012-01-13 15:02:35 +00:00
New feature development
2012-01-09 14:38:51 -08:00
Merge branch 'master' into fixes
2012-01-13 15:00:22 +00:00
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-01-07 12:03:30 -08:00
ARM: fixes for ARM platforms
2012-01-17 18:55:56 -08:00
Merge branch 'depends/rmk/restart' into next/cleanup
2012-01-07 11:51:28 +00:00
ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP
2012-01-23 10:20:05 +00:00
ARM: Update mach-types
2011-12-23 22:58:10 +00:00
ARM: 7291/1: cache: assume 64-byte L1 cachelines for ARMv7 CPUs
2012-01-23 10:20:05 +00:00
Merge branches 'at91/gpio', 'at91/ioremap', 'drivers/macb-gem-cleanup' and 'msm/misc' into next/cleanup
2011-12-01 12:34:21 +00:00
Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.
2012-01-23 14:50:30 -08:00
b14a29982a