mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 12:52:30 +00:00
1c6ba37b3d
Things are calming down for arm-soc as well. This set of bug fixes is
dominated in size by the at91 platform bug fixes. Some of them were
meant to go through the framebuffer tree during the merge window, but
since the framebuffer maintainer could not be reached, I offered to
take them here. The other notable at91 change is the addition of pinctrl
definitions to fix the NAND controller.
The rest are mostly simple regression fixes:
* Our removal of VIRT_TO_BUS conflicted with Stephen Rothwell's
renaming of the Kconfig symbol. You will get a trivial merge conflict
here, we still want to remove it.
* missing bits for clocks on imx and s5pv210
* missing header inclusions in mmp and shmobile
* typos in s5pv210 camera and vt8500 clock support code
and three trivial fixes for pre-3.8 bugs:
* an old bogus build warning in the joystick driver
* a misleading Kconfig description
* a NULL pointer check on davinci
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIVAwUAUUchPmCrR//JCVInAQLxHhAA4bbv0+aS3vhEV8sMomBQ7XpjlI2wJ5wy
cd2jA04Gb54bQlRkZNuflIHH5xYq9bslR98Y3iEMqPHrxheDV5qgfZ9wO1E5b8wd
bl/Fj1bj7D7AeQpvhAYHZufQnV4xGSpW7j/6hkEWCDDgla82BaEwQq3aVCqFsZu5
u41xlWCFYbwS+sEcdALnGmFdEBtNHzsfwkY7AClcunARWcFTyIAm5J2VhO/1Z3eY
sA31DBizTsxhkfgOEXTDvyH1N3YwcGlm3Mb7J0ZfdU5d5QQlthmU1ims2fVPoo3t
x1rJNb5HARsJuuuFIgoRa/Vbcytqxj2+MhJGy2cLhsmAxr8L61cb618oniZxxDoW
y4DMurF790q3uSkJOrhtcAmGBmHNBdTHcvV4U05EYIQl64k/oY+L7IB18ACAHVqO
LwimbZ+KF1kxv/hVosGbu7l0EKDt7MS4ykc5QJAtiYu7RDikoRmH05742feWfQ+2
Fy6V1GqIyUCea1cWDjomeTx+lERknSWPweesrcyiRhIs2BsqrtDRDngse/S59Lf9
mUFiLh+tZqZxTh8HqZbnHbuJoqNvfVyZVYWrvifkH0Ji8VZqeLuzxx/8fBvnCDWz
tXZOkl4m2U4lVYzkYOLN9VAurEHSYcHOw51IIgQp4IfS3U32sA1a4/fF/ATq0ugP
tdJBtr7mpzA=
=oLKI
-----END PGP SIGNATURE-----
Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC bug fixes from Arnd Bergmann:
"Things are calming down for arm-soc as well. This set of bug fixes is
dominated in size by the at91 platform bug fixes. Some of them were
meant to go through the framebuffer tree during the merge window, but
since the framebuffer maintainer could not be reached, I offered to
take them here. The other notable at91 change is the addition of
pinctrl definitions to fix the NAND controller.
The rest are mostly simple regression fixes:
- Our removal of VIRT_TO_BUS conflicted with Stephen Rothwell's
renaming of the Kconfig symbol. You will get a trivial merge
conflict here, we still want to remove it.
- missing bits for clocks on imx and s5pv210
- missing header inclusions in mmp and shmobile
- typos in s5pv210 camera and vt8500 clock support code
and three trivial fixes for pre-3.8 bugs:
- an old bogus build warning in the joystick driver
- a misleading Kconfig description
- a NULL pointer check on davinci"
* tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: fix CONFIG_VIRT_TO_BUS handling
ARM: i.MX35: enable MAX clock
ARM: Scorpion is a v7 architecture, not v6
ARM: mmp: add platform_device head file in gplugd
input/joystick: use get_cycles on ARM
[media] s5p-fimc: fix s5pv210 build
clk: vt8500: Fix "fix device clock divisor calculations"
ARM: i.MX25: Fix DT compilation
ARM: at91: fix infinite loop in at91_irq_suspend/resume
ARM: at91: add gpio suspend/resume support when using pinctrl
ARM: at91: fix LCD-wiring mode
atmel_lcdfb: fix 16-bpp modes on older SOCs
ARM: at91: dt: at91sam9x5: complete NAND pinctrl
ARM: at91: dt: at91sam9x5: correct NAND pins comments
ARM: davinci: edma: fix dmaengine induced null pointer dereference on da830
ARM: shmobile: marzen: Include mmc/host.h
ARM: EXYNOS: Add #dma-cells for generic dma binding support for PL330
ARM: S5PV210: Fix PL330 DMA controller clkdev entries
|
||
|---|---|---|
| .. | ||
| include/mach | ||
| at91_aic.h | ||
| at91_rstc.h | ||
| at91_shdwc.h | ||
| at91_tc.h | ||
| at91rm9200_devices.c | ||
| at91rm9200_time.c | ||
| at91rm9200.c | ||
| at91sam9_alt_reset.S | ||
| at91sam9g45_devices.c | ||
| at91sam9g45_reset.S | ||
| at91sam9g45.c | ||
| at91sam9n12.c | ||
| at91sam9rl_devices.c | ||
| at91sam9rl.c | ||
| at91sam9x5.c | ||
| at91sam926x_time.c | ||
| at91sam9260_devices.c | ||
| at91sam9260.c | ||
| at91sam9261_devices.c | ||
| at91sam9261.c | ||
| at91sam9263_devices.c | ||
| at91sam9263.c | ||
| at91x40_time.c | ||
| at91x40.c | ||
| board-1arm.c | ||
| board-afeb-9260v1.c | ||
| board-cam60.c | ||
| board-carmeva.c | ||
| board-cpu9krea.c | ||
| board-cpuat91.c | ||
| board-csb337.c | ||
| board-csb637.c | ||
| board-dt.c | ||
| board-eb01.c | ||
| board-eb9200.c | ||
| board-ecbat91.c | ||
| board-eco920.c | ||
| board-flexibity.c | ||
| board-foxg20.c | ||
| board-gsia18s.c | ||
| board-kafa.c | ||
| board-kb9202.c | ||
| board-pcontrol-g20.c | ||
| board-picotux200.c | ||
| board-qil-a9260.c | ||
| board-rm9200-dt.c | ||
| board-rm9200dk.c | ||
| board-rm9200ek.c | ||
| board-rsi-ews.c | ||
| board-sam9-l9260.c | ||
| board-sam9g20ek.c | ||
| board-sam9m10g45ek.c | ||
| board-sam9rlek.c | ||
| board-sam9260ek.c | ||
| board-sam9261ek.c | ||
| board-sam9263ek.c | ||
| board-snapper9260.c | ||
| board-stamp9g20.c | ||
| board-usb-a926x.c | ||
| board-yl-9200.c | ||
| board.h | ||
| clock.c | ||
| clock.h | ||
| cpuidle.c | ||
| generic.h | ||
| gpio.c | ||
| gsia18s.h | ||
| irq.c | ||
| Kconfig | ||
| leds.c | ||
| Makefile | ||
| Makefile.boot | ||
| pm_slowclock.S | ||
| pm.c | ||
| pm.h | ||
| sam9_smc.c | ||
| sam9_smc.h | ||
| setup.c | ||
| soc.h | ||
| stamp9g20.h | ||