Linus Torvalds
9a8e5d4112
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm ...
Pull ARM fixes from Russell King:
"Nothing too disasterous, the biggest thing being the removal of the
regulator support for vcore in the AMBA driver; only one SoC was using
this and it got broken during the last merge window, which then
started causing problems for other people. Mutual agreement was
reached for it to be removed."
* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: 7386/1: jump_label: fixup for rename to static_key
ARM: 7384/1: ThumbEE: Disable userspace TEEHBR access for !CONFIG_ARM_THUMBEE
ARM: 7382/1: mm: truncate memory banks to fit in 4GB space for classic MMU
ARM: 7359/2: smp_twd: Only wait for reprogramming on active cpus
ARM: 7383/1: nommu: populate vectors page from paging_init
ARM: 7381/1: nommu: fix typo in mm/Kconfig
ARM: 7380/1: DT: do not add a zero-sized memory property
ARM: 7379/1: DT: fix atags_to_fdt() second call site
ARM: 7366/3: amba: Remove AMBA level regulator support
ARM: 7377/1: vic: re-read status register before dispatching each IRQ handler
ARM: 7368/1: fault.c: correct how the tsk->[maj|min]_flt gets incremented
2012-04-15 17:35:19 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-04-06 19:56:04 -07:00
ARM: 7366/3: amba: Remove AMBA level regulator support
2012-04-13 14:04:08 +01:00
1) AHCI regression fix. A recent "make driver conform to spec" change
2012-03-22 20:22:30 -07: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: fix build error on MIPS; implicit pcibios_enable_device
2012-04-10 14:13:30 -04:00
Merge branch 'for-3.4/drivers' of git://git.kernel.dk/linux-block
2012-04-13 18:45:13 -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
powerpc: Remove some of the legacy iSeries specific device drivers
2012-03-16 09:28:05 +11:00
tty and serial fixes for 3.4-rc2
2012-04-12 15:36:33 -07:00
clk: make CONFIG_COMMON_CLK invisible
2012-03-19 09:37:11 +00: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
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2012-03-22 18:15:32 -07:00
ARM: global cleanups
2012-03-27 16:03:32 -07:00
dmaengine-fixes for 3.4-rc3
2012-04-10 15:30:16 -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
gpio/exynos: Fix compiler warning in gpio-samsung.c file
2012-04-10 22:15:39 -06:00
Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes
2012-04-12 17:42:01 +01:00
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
Tools: hv: Support enumeration from all the pools
2012-03-16 13:36:04 -07:00
hwmon: (pmbus_core) Fix compiler warning
2012-04-09 12:17:38 -07:00
i2c: prevent spurious interrupt on Designware controllers
2012-04-10 08:09:03 -07: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
Add a fix for a bug hit by Alexey Shvetsov in ib_srtp that hits on
2012-04-12 18:51:32 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-04-12 12:49:07 -07: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
MFD changes for 3.4
2012-03-28 13:56:35 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
md/bitmap: prevent bitmap_daemon_work running while initialising bitmap
2012-04-12 16:05:06 +10:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-04-11 11:05:34 -07:00
memstick: remove the second argument of k[un]map_atomic()
2012-03-20 21:48:19 +08:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
ARM: 7366/3: amba: Remove AMBA level regulator support
2012-04-13 14:04:08 +01:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
mmc: use really long write timeout to deal with crappy cards
2012-04-05 20:32:34 -04:00
fix breakage in mtdchar_open(), sanitize failure exits
2012-04-09 01:38:55 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-04-12 14:04:33 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
gpio: Fix range check in of_gpio_simple_xlate()
2012-04-10 14:20:56 -06: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
PCI: Fix regression in pci_restore_state(), v3
2012-04-15 13:06:29 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
2012-03-29 16:00:48 -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
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
phc: Update author's email address.
2012-03-17 01:41:43 -07:00
rapidio/tsi721: fix bug in register offset definitions
2012-03-15 17:03:03 -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-pl031.c: enable clock on all ST variants
2012-04-12 13:12:12 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07: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
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
2012-04-15 17:35:19 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-03-20 21:04:47 -07:00
Staging tree fixes for 3.4-rc2
2012-04-12 15:35:12 -07:00
tcm_fc: Do not free tpg structure during wq allocation failure
2012-04-06 18:57:05 -07:00
thermal: Fix for setting the thermal zone mode to enable/disable
2012-03-22 01:10:18 -04:00
tty and serial fixes for 3.4-rc2
2012-04-12 15:36:33 -07:00
xHCI: Correct the #define XHCI_LEGACY_DISABLE_SMI
2012-04-11 08:31:06 -07:00
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2012-03-23 14:46:48 -04:00
ARM: a few more SoC fixes for 3.4-rc
2012-04-15 11:14:54 -07:00
virtio-pci: switch to PM ops macro to initialise PM functions
2012-03-31 08:09:51 +05:30
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
Two fixes for regressions:
2012-04-06 17:54:53 -07: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
9a8e5d4112