Linus Torvalds
32d687cad3
Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
...
Pull DMA-mapping fixes from Marek Szyprowski:
"Another set of fixes for ARM dma-mapping subsystem.
Commit e9da6e9905 replaced custom consistent buffer remapping code
with generic vmalloc areas. It however introduced some regressions
caused by limited support for allocations in atomic context. This
series contains fixes for those regressions.
For some subplatforms the default, pre-allocated pool for atomic
allocations turned out to be too small, so a function for setting its
size has been added.
Another set of patches adds support for atomic allocations to
IOMMU-aware DMA-mapping implementation.
The last part of this pull request contains two fixes for Contiguous
Memory Allocator, which relax too strict requirements."
* 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
ARM: dma-mapping: IOMMU allocates pages from atomic_pool with GFP_ATOMIC
ARM: dma-mapping: Introduce __atomic_get_pages() for __iommu_get_pages()
ARM: dma-mapping: Refactor out to introduce __in_atomic_pool
ARM: dma-mapping: atomic_pool with struct page **pages
ARM: Kirkwood: increase atomic coherent pool size
ARM: DMA-Mapping: print warning when atomic coherent allocation fails
ARM: DMA-Mapping: add function for setting coherent pool size from platform code
ARM: relax conditions required for enabling Contiguous Memory Allocator
mm: cma: fix alignment requirements for contiguous regions
2012-09-08 16:22:43 -07:00
..
accessibility
acpi
Merge branch 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
2012-08-22 09:18:49 +10:00
amba
ata
libata: Add a space to " 2GB ATA Flash Disk" DMA blacklist entry
2012-08-25 10:16:45 -04:00
atm
drivers/atm/iphase.c: fix error return code
2012-08-06 13:29:57 -07:00
auxdisplay
base
mm: cma: fix alignment requirements for contiguous regions
2012-08-28 21:01:01 +02:00
bcma
bcma: BCM43228 support
2012-08-02 13:51:46 -04:00
block
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2012-08-25 11:36:43 -07:00
bluetooth
Bluetooth: add support for atheros 0489:e057
2012-08-06 15:33:05 -03:00
cdrom
char
drm/i915: fix hsw uncached pte
2012-08-17 09:21:35 +02:00
clk
clk: validate pointer in __clk_disable()
2012-07-30 17:25:13 -07:00
clocksource
cs5535-clockevt: typo, it's MFGPT, not MFPGT
2012-08-21 16:45:02 -07:00
connector
cpufreq
Merge branch 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
2012-08-23 17:02:42 +02:00
cpuidle
cpuidle: Prevent null pointer dereference in cpuidle_coupled_cpu_notify
2012-08-17 19:37:08 +02:00
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2012-08-23 21:58:04 -07:00
dca
devfreq
dio
dma
dma: tegra: enable/disable dma clock
2012-08-13 10:15:22 +05:30
edac
eisa
extcon
extcon: extcon_gpio: Replace gpio_request_one by devm_gpio_request_one
2012-08-16 10:29:08 -07:00
firewire
firmware
This patch series contains a major revamp of how we collect entropy
2012-07-31 19:07:42 -07:00
gpio
gpio: rdc321x: Prevent removal of modules exporting active GPIOs
2012-09-01 12:52:24 +02:00
gpu
drm: Add EDID_QUIRK_FORCE_REDUCED_BLANKING for ASUS VW222S
2012-08-30 14:14:12 +10:00
hid
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2012-09-07 12:29:38 -07:00
hsi
hv
This patch series contains a major revamp of how we collect entropy
2012-07-31 19:07:42 -07:00
hwmon
hwmon: (asus_atk0110) Add quirk for Asus M5A78L
2012-08-22 22:33:31 -07:00
hwspinlock
i2c
i2c: tegra: protect suspend/resume callbacks with CONFIG_PM_SLEEP
2012-08-18 20:45:09 +02:00
ide
ide: fix generic_ide_suspend/resume Oops
2012-08-21 14:54:42 -07:00
idle
intel_idle: Check cpu_idle_get_driver() for NULL before dereferencing it.
2012-08-17 19:37:14 +02:00
ieee802154
iio
iio: lm3533-als: Fix build warnings
2012-08-16 20:24:38 +01:00
infiniband
Merge branches 'cma', 'ipoib', 'misc', 'mlx4', 'ocrdma', 'qib' and 'srp' into for-next
2012-08-16 09:38:39 -07:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-09-08 16:20:59 -07:00
iommu
iommu/amd: Fix wrong check for ARRAY_SIZE()
2012-08-10 11:34:08 +02:00
isdn
mISDN: Bugfix for layer2 fixed TEI mode
2012-08-06 13:22:50 -07:00
leds
leds: renesas: fix error handling
2012-08-13 14:34:02 +08:00
lguest
macintosh
md
md/raid10: fix problem with on-stack allocation of r10bio structure.
2012-08-18 09:51:42 +10:00
media
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-08-21 16:54:38 -07:00
memory
memstick
message
drivers/message/i2o/i2o_config.c: bound allocation
2012-07-30 17:25:17 -07:00
mfd
More USB patches for 3.6-rc3
2012-08-20 13:14:22 -07:00
misc
drivers/misc/sgi-xp/xpc_uv.c: SGI XPC fails to load when cpu 0 is out of IRQ resources
2012-08-21 16:45:03 -07:00
mmc
mmc: omap: fix broken PIO mode
2012-09-04 13:58:11 -04:00
mtd
UBI: fix a horrible memory deallocation bug
2012-09-04 09:40:26 +03:00
net
net: qmi_wwan: add several new Gobi devices
2012-09-01 22:49:34 -04:00
nfc
nubus
of
dt: introduce for_each_available_child_of_node, of_get_next_available_child
2012-08-20 02:16:00 -07:00
oprofile
parisc
parport
pci
PCI: Don't print anything while decoding is disabled
2012-08-23 10:53:08 -06:00
pcmcia
pinctrl
pinctrl/nomadik: add kp_b_2 keyboard function group list
2012-08-17 11:09:58 +02:00
platform
ideapad: add Lenovo IdeaPad Z570 support (part 3)
2012-08-20 12:44:41 -04:00
pnp
power
Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc
2012-08-02 11:52:39 -07:00
pps
pps: return PTR_ERR on error in device_create
2012-07-30 17:25:21 -07:00
ps3
ptp
pwm
pwm: Improve Kconfig help text
2012-08-20 11:58:43 +02:00
rapidio
rapidio/tsi721: fix unused variable compiler warning
2012-08-21 16:45:03 -07:00
regulator
regulator: twl-regulator: fix up VINTANA1/VINTANA2
2012-08-15 17:19:01 +01:00
remoteproc
rpmsg
rtc
Fixes for AT91 related to:
2012-08-27 17:07:37 -07:00
s390
s390/dasd: fix ioctl return value
2012-08-28 10:08:31 +02:00
sbus
scsi
Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-block
2012-08-01 09:02:41 -07:00
sfi
sh
sh: intc: Handle domain association for sparseirq pre-allocated vectors.
2012-08-09 13:21:05 +09:00
sn
spi
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-08-25 11:45:04 -07:00
ssb
staging
More USB patches for 3.6-rc3
2012-08-20 13:14:22 -07:00
target
target: Remove unused se_cmd.cmd_spdtl
2012-08-21 14:27:35 -07:00
tc
thermal
The tag contains just a few battery-related changes for v3.6. It's is
2012-07-31 18:08:25 -07:00
tty
pmac_zilog,kdb: Fix console poll hook to return instead of loop
2012-08-16 12:20:20 -07:00
uio
usb
More USB patches for 3.6-rc3
2012-08-20 13:14:22 -07:00
uwb
vfio
vfio: grab vfio_device reference *before* exposing the sucker via fd_install()
2012-08-22 10:26:42 -04:00
vhost
tcm_vhost: Fix vhost_scsi_target structure alignment
2012-08-20 14:52:11 -07:00
video
OMAPFB: fix framebuffer console colors
2012-08-23 12:37:22 +00:00
virt
virtio
vlynq
vme
w1
1-Wire: Add support for the maxim ds1825 temperature sensor
2012-08-16 12:33:59 -07:00
watchdog
watchdog: da9052: Remove duplicate inclusion of delay.h
2012-08-29 17:13:06 +02:00
xen
xen/pciback: Fix proper FLR steps.
2012-09-06 09:22:02 -04:00
zorro
Kconfig
vfio: VFIO core
2012-07-31 08:16:22 -06:00
Makefile
vfio: VFIO core
2012-07-31 08:16:22 -06:00