diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 17:33:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 17:33:35 -0700 |
| commit | 80c226fbef56576946c9655fcb2ab62e63404d12 (patch) | |
| tree | f5f565c370aeb0de257a4e3825c0873af54590e8 /drivers/s390 | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm (diff) | |
| parent | m68k: Add missing I/O macros {in,out}{w,l}_p() for !CONFIG_ISA (diff) | |
| download | linux-dev-80c226fbef56576946c9655fcb2ab62e63404d12.tar.xz linux-dev-80c226fbef56576946c9655fcb2ab62e63404d12.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Add missing I/O macros {in,out}{w,l}_p() for !CONFIG_ISA
m68k: Remove big kernel lock in cache flush code
m68k: __pa(): cast arg to long
fbdev: atafb - Remove undead ifdef ATAFB_FALCON
zorro: Fix device_register() error handling
fbdev/m68k: Fix section mismatches in q40fb.c
m68k/m68knommu: merge the MMU and non-MMU traps.h
m68k/m68knommu: merge MMU and non-MMU thread_info.h
m68k/m68knommu: merge MMU and non-MMU atomic.h
m68k/m68knommu: clean up page.h
m68k/m68knommu: merge machdep.h files into a single file
m68k/m68knommu: merge MMU and non-MMU string.h
m68k/m68knommu: Remove dead SMP config option
m68k: move definition of THREAD_SIZE into thread_info_mm.h
m68k: Use asm-generic/ioctls.h (enables termiox)
m68k: Remove dead GG2 config option
Diffstat (limited to 'drivers/s390')
0 files changed, 0 insertions, 0 deletions