From: Linus Torvalds Date: Wed, 19 May 2010 18:35:30 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 X-Git-Tag: MMI-PSA29.97-13-9~23905 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ba0234ec35127fe21d373db53cbaf9fe20620cb6;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'for-linus' of git://git390.marist.edu/linux-2.6 * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (24 commits) [S390] drivers/s390/char: Use kmemdup [S390] drivers/s390/char: Use kstrdup [S390] debug: enable exception-trace debug facility [S390] s390_hypfs: Add new attributes [S390] qdio: remove API wrappers [S390] qdio: set correct bit in dsci [S390] qdio: dont convert timestamps to microseconds [S390] qdio: remove memset hack [S390] qdio: prevent starvation on PCI devices [S390] qdio: count number of qdio interrupts [S390] user space fault: report fault before calling do_exit [S390] topology: expose core identifier [S390] dasd: remove uid from devmap [S390] dasd: add dynamic pav toleration [S390] vdso: add missing vdso_install target [S390] vdso: remove redundant check for CONFIG_64BIT [S390] avoid default_llseek in s390 drivers [S390] vmcp: disallow modular build [S390] add breaking event address for user space [S390] virtualization aware cpu measurement ... --- ba0234ec35127fe21d373db53cbaf9fe20620cb6