Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Jun 2010 01:13:24 +0000 (18:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Jun 2010 01:13:24 +0000 (18:13 -0700)
commitfbe33a7c3f388f7b8b2642bfadb1b5914f635a5b
tree4317d8debb29ebb7131cbbc5db183d4194102970
parentd87815cb2090e07b0b0b2d73dc9740706e92c80c
parent40a510ddc57b49a01668643b1dec691a0e996c52
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