From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Feb 2011 01:51:31 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b8ef289daa313b3e5eb6564ed1c2758ddb6e3d6f;p=linux-beck.git

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] reset default for CONFIG_CHSC_SCH
  [S390] qdio: prevent compile warning under CONFIG_32BIT
  [S390] use asm-generic/cacheflush.h
  [S390] tlb: fix build error caused by THP
  [S390] missing sacf in uaccess
  [S390] pgtable_list corruption
  [S390] dasd: prevent panic with unresumed devices
---

b8ef289daa313b3e5eb6564ed1c2758ddb6e3d6f