aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/shmparam.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-04 18:49:11 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-04 18:49:11 -0400
commit90bc1a658a53f8832ee799685703977a450e5af9 (patch)
tree98c5ceb22d634508614e42330ed1e27e6930a983 /arch/s390/include/asm/shmparam.h
parent6ce90c430baef6e411dcf32e872913888bb3ef54 (diff)
parent54822de7793bf9aa56d79cc173281cdb23b37f9f (diff)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (32 commits) MIPS: Wire up accept4 syscall. MIPS: VPE: Delete unused function get_tc_unused(). MIPS: VPE: Fix bogus indentation. MIPS: VPE: Make various functions static. MIPS: VPE: Free relocation chain on error. MIPS: VPE: Fix compiler warning. MIPS: Module: Make error messages unique. MIPS: Octeon: Run IPI code with interrupts disabled. MIPS: Jazz: Fix read buffer overflow MIPS: Use DIV_ROUND_CLOSEST MIPS: MTX-1: Request button GPIO before setting its direction MIPS: AR7: Override CFLAGS with -Werror MIPS: AR7: Remove unused tnetd7200_get_clock function MIPS: AR7: Use DMA_BIT_MASK(nn) instead of deprecated DMA_nnBIT_MASK MIPS: AR7: Fix build failures when CONFIG_SERIAL_8250 is not enabled MIPS: Fix read buffer overflow MIPS: AR7: Fix build warning on memory.c MIPS: Octeon PCIe: Make hardware and software bus numbers match. MIPS: RBTX4939: Fix IOC pin-enable register updating MIPS: Simplify and correct interrupt handling for MSP4200 ...
Diffstat (limited to 'arch/s390/include/asm/shmparam.h')
0 files changed, 0 insertions, 0 deletions