From: Linus Torvalds Date: Fri, 11 Sep 2009 16:16:39 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 X-Git-Tag: v5.15~32704 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=89af571ca633ada14d17746519a179553a732d31;p=platform%2Fkernel%2Flinux-starfive.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: (54 commits) [S390] tape: Use pr_xxx instead of dev_xxx in shared driver code [S390] Wire up page fault events for software perf counters. [S390] Remove smp_cpu_not_running. [S390] Get rid of cpuid.h header file. [S390] Limit cpu detection to 256 physical cpus. [S390] tape: Fix device online messages [S390] Enable guest page hinting by default. [S390] use generic scatterlist.h [S390] s390dbf: Add description for usage of "%s" in sprintf events [S390] Initialize __LC_THREAD_INFO early. [S390] fix recursive locking on page_table_lock [S390] kvm: use console_initcall() to initialize s390 virtio console [S390] tape: reversed order of labels [S390] hypfs: Use "%u" instead of "%d" for unsigned ints in snprintf [S390] kernel: Print an error message if kernel NSS cannot be defined [S390] zcrypt: Free ap_device if dev_set_name fails. [S390] zcrypt: Use spin_lock_bh in suspend callback [S390] xpram: Remove checksum validation for suspend/resume [S390] vmur: Invalid allocation sequence for vmur class [S390] hypfs: remove useless variable qname ... --- 89af571ca633ada14d17746519a179553a732d31