diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-06-27 20:42:09 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-06-27 20:42:09 +1000 |
| commit | dc0216445cdc5b937b78a02f1145a2fbcf92e9d6 (patch) | |
| tree | eff2e326fe6369a948f57f2991232b97f08384b9 /arch/um | |
| parent | 4300a0f8bdcce5a03b88bfa16fc9827e15c52dc4 (diff) | |
| parent | 166989e366ffa66108b2f37b870e66b85b2185ad (diff) | |
Merge branch 'core/mutexes' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into drm-next
Merge in the tip core/mutexes branch for future GPU driver use.
Ingo will send this branch to Linus prior to drm-next.
* 'core/mutexes' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
locking-selftests: Handle unexpected failures more strictly
mutex: Add more w/w tests to test EDEADLK path handling
mutex: Add more tests to lib/locking-selftest.c
mutex: Add w/w tests to lib/locking-selftest.c
mutex: Add w/w mutex slowpath debugging
mutex: Add support for wound/wait style locks
arch: Make __mutex_fastpath_lock_retval return whether fastpath succeeded or not
powerpc/pci: Fix boot panic on mpc83xx (regression)
s390/ipl: Fix FCP WWPN and LUN format strings for read
fs: fix new splice.c kernel-doc warning
spi/pxa2xx: fix memory corruption due to wrong size used in devm_kzalloc()
s390/mem_detect: fix memory hole handling
s390/dma: support debug_dma_mapping_error
s390/dma: fix mapping_error detection
s390/irq: Only define synchronize_irq() on SMP
Input: xpad - fix for "Mad Catz Street Fighter IV FightPad" controllers
Input: wacom - add a new stylus (0x100802) for Intuos5 and Cintiqs
spi/pxa2xx: use GFP_ATOMIC in sg table allocation
fuse: hold i_mutex in fuse_file_fallocate()
Input: add missing dependencies on CONFIG_HAS_IOMEM
...
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions