From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Apr 2010 18:52:48 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v2.6.34-rc4~10
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=f16393776fc133d95fe3b3ba7118df579ed90af5;p=net-next-2.6.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] Update default configuration.
  [S390] nss: add missing .previous statement to asm function
  [S390] increase default size of vmalloc area
  [S390] s390: disable change bit override
  [S390] fix io_return critical section cleanup
  [S390] sclp_async: potential buffer overflow
  [S390] arch/s390/kernel: Add missing unlock
---

f16393776fc133d95fe3b3ba7118df579ed90af5