From: Linus Torvalds Date: Fri, 30 May 2008 14:44:19 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 X-Git-Tag: v2.6.26-rc5~35 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9db8ee3d96e98705ba4e9260815ca326b0d07741;p=karo-tx-linux.git Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] Update default configuration. [S390] disassembler: fix idte instruction format. [S390] tape: fix race with stack local wait_queue_head_t. [S390] 3270: fix race with stack local wait_queue_head_t. [S390] dasd: use a generic wait_queue for sleep_on [S390] sclp_vt220: fix scheduling while atomic bug. [S390] showmem: Only walk spanned pages. [S390] appldata: prevent cpu hotplug when walking cpu_online_map. [S390] Fix section mismatch warnings. [S390] s390 types: make dma_addr_t 64 bit capable [S390] tape: Fix race condition in tape block device driver [S390] fix sparsemem related compile error with allnoconfig on s390 --- 9db8ee3d96e98705ba4e9260815ca326b0d07741