From: Linus Torvalds Date: Tue, 10 Jun 2008 15:00:40 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=19f2b8dfea10e4d5cd34feb08cbab738504c25cf;p=linux-beck.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] tape_3590.c: introduce missing kfree [S390] Fix __ctl_load/__ctl_store inline assembly constraints [S390] Fix build failure in __cpu_up() [S390] vt220 console, initialize list head before use [S390] cio: Fix inverted isc priorities. [S390] vmemmap: fix off-by-one bug. [S390] cio: Fix sparse warnings in blacklist.c. [S390] sparsemem: use SPARSEMEM_STATIC if !64BIT. --- 19f2b8dfea10e4d5cd34feb08cbab738504c25cf