Arnd Bergmann
0fa7be407d
ARM: nomadik: enable PINCTRL_NOMADIK where needed ...
The nomadik gpio code has been converted to pinctrl, but the nomadik platform
still expects the old code to be present. Change it to use the new one instead.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
2012-05-15 14:42:57 +02:00
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-04-25 21:29:26 -07:00
ARM: 7366/3: amba: Remove AMBA level regulator support
2012-04-13 14:04:08 +01:00
libata: forbid port runtime pm by default, fixing regression
2012-04-18 14:33:25 -04:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
drivers/base: fix compiler warning in SoC export driver - idr should be ida
2012-04-09 14:54:22 -07:00
bcma: use fallback sprom if no on chip sprom is available
2012-04-16 13:32:01 -04:00
Fixes in various components:
2012-04-20 11:31:00 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
2012-04-09 15:47:49 -04:00
tty and serial fixes for 3.4-rc2
2012-04-12 15:36:33 -07:00
CLKDEV: provide helpers for common clock framework
2012-05-02 09:30:32 +01:00
Revert "clocksource: Load the ACPI PM clocksource asynchronously"
2012-04-12 00:05:05 +02:00
cpufreq: OMAP: fix build errors: depends on ARCH_OMAP2PLUS
2012-04-13 17:57:40 -07:00
Merge branches 'idle-fix' and 'misc' into release
2012-04-06 21:48:59 -04:00
crypto: talitos - properly lock access to global talitos registers
2012-04-09 15:13:40 +08:00
ARM: global cleanups
2012-03-27 16:03:32 -07:00
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
2012-04-26 15:33:36 -07:00
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
2012-04-06 17:56:20 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
ux500 GPIO and pinctrl changes for kernel 3.5
2012-05-12 19:57:34 -07:00
drm/i915: Set the Stencil Cache eviction policy to non-LRA mode.
2012-04-28 08:05:15 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2012-04-20 10:39:33 -07:00
HSI: hsi_char: Remove max_data_size from sysfs
2012-04-23 14:23:32 +03:00
hwmon: (fam15h_power) Fix pci_device_id array
2012-04-26 08:40:08 -07:00
i2c: mxs: adopt pinctrl support
2012-05-12 09:43:17 +08:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
A few fixes for regressions introduced in 3.4-rc1:
2012-04-26 15:35:35 -07:00
mfd: Convert twl6040 to i2c driver, and separate it from twl core
2012-04-16 16:45:34 +02:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
tty and serial fixes for 3.4-rc2
2012-04-12 15:36:33 -07:00
leds-atmel-pwm.c: Make pwmled_probe() __devinit
2012-04-17 16:29:31 +02:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
md: fix possible corruption of array metadata on shutdown.
2012-04-24 10:23:16 +10:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-04-21 12:43:23 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
mfd: Fix modular builds of rc5t583 regulator support
2012-04-16 21:27:07 +02:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
Merge branch 'imx/pinctrl/for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/pinctrl
2012-05-11 22:59:11 -07:00
mtd: nand: gpmi: adopt pinctrl support
2012-05-12 09:43:16 +08:00
can: flexcan: adopt pinctrl support
2012-05-12 09:43:09 +08:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
dt: add property iteration helpers
2012-04-18 13:53:11 +02:00
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Merge branch 'for-v3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2012-04-27 19:32:37 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
2012-03-29 16:00:48 -07:00
ARM: nomadik: enable PINCTRL_NOMADIK where needed
2012-05-15 14:42:57 +02:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-26 15:24:45 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
Various small bugfixes and enhancements, plus two new drivers:
2012-03-30 16:09:02 -07:00
regulator: Fix a build warning in the anatop driver for 3.4
2012-04-10 10:26:41 -07:00
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
drivers/rtc/rtc-ds1307.c: fix BUG shown with lock debugging enabled
2012-04-25 21:26:34 -07:00
[S390] s390/char/vmur.c: fix memory leak
2012-04-11 14:28:24 +02:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
SCSI: Fix error handling when no ULD is attached
2012-04-15 11:08:53 -07:00
SuperH updates for 3.4 merge window
2012-03-30 00:09:17 -07:00
spi/imx: adopt pinctrl support
2012-05-12 09:43:11 +08:00
staging: ozwpan: Fix bug where kfree is called twice.
2012-04-26 12:40:53 -07:00
tcm_fc: Do not free tpg structure during wq allocation failure
2012-04-06 18:57:05 -07:00
serial: mxs-auart: adopt pinctrl support
2012-05-12 09:43:13 +08:00
Merge branch 'imx/pinctrl/for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/pinctrl
2012-05-11 22:59:11 -07:00
uwb: fix error handling
2012-04-18 13:15:51 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-04-22 21:02:57 -07:00
video: mxsfb: adopt pinctrl support
2012-05-12 09:43:19 +08:00
virtio_balloon: fix handling of PAGE_SIZE != 4k
2012-04-15 11:51:06 +03:00
hpwdt: Only BYTE reads/writes to WD Timer port 0x72
2012-04-26 14:38:07 +02:00
xen/acpi: Workaround broken BIOSes exporting non-existing C-states.
2012-04-26 22:07:28 -04:00
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00
0fa7be407d