From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 Jun 2010 01:13:24 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v3.12-rc1~9729
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fbe33a7c3f388f7b8b2642bfadb1b5914f635a5b;p=kernel%2Fkernel-generic.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:
  [S390] Update default configuration.
  [S390] arch/s390/kvm: Use GFP_ATOMIC when a lock is held
  [S390] kprobes: add parameter check to module_free()
  [S390] appldata/extmem/kvm: add missing GFP_KERNEL flag
---

fbe33a7c3f388f7b8b2642bfadb1b5914f635a5b