diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:11:13 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:11:13 +0100 |
| commit | 72f318897e50c29b91efd1ed24515a93c138a2ba (patch) | |
| tree | 7e7ef8138d5afacd1be4655e4458dc4cee432d1e /drivers/ide/ide-dma-sff.c | |
| parent | audit: always follow va_copy() with va_end() (diff) | |
| parent | [S390] disassembler: mark exception causing instructions (diff) | |
| download | linux-72f318897e50c29b91efd1ed24515a93c138a2ba.tar.xz linux-72f318897e50c29b91efd1ed24515a93c138a2ba.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (31 commits)
[S390] disassembler: mark exception causing instructions
[S390] Enable exception traces by default
[S390] return address of compat signals
[S390] sysctl: get rid of dead declaration
[S390] dasd: fix fixpoint divide exception in define_extent
[S390] dasd: add sanity check to detect path connection error
[S390] qdio: fix kernel panic for zfcp 31-bit
[S390] Add s390x description to Documentation/kdump/kdump.txt
[S390] Add VMCOREINFO_SYMBOL(high_memory) to vmcoreinfo
[S390] dasd: fix expiration handling for recovery requests
[S390] outstanding interrupts vs. smp_send_stop
[S390] ipc: call generic sys_ipc demultiplexer
[S390] zcrypt: Fix error return codes.
[S390] zcrypt: Rework length parameter checking.
[S390] cleanup trap handling
[S390] Remove Kerntypes leftovers
[S390] topology: increase poll frequency if change is anticipated
[S390] entry[64].S improvements
[S390] make arch/s390 subdirectories depend on config option
[S390] kvm: move cmf host id constant out of lowcore
...
Fix up conflicts in arch/s390/kernel/{smp.c,topology.c} due to the
sysdev removal clashing with "topology: get rid of ifdefs" which moved
some of that code around.
Diffstat (limited to 'drivers/ide/ide-dma-sff.c')
0 files changed, 0 insertions, 0 deletions