Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Sep 2011 16:32:21 +0000 (09:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Sep 2011 16:32:21 +0000 (09:32 -0700)
commitfae3f6f2eed147092e4612177972d46e542cab71
tree8e889a7f236e1a7933f4a6245117d680af6479b9
parentd93dc5c4478c1fd5de85a3e8aece9aad7bbae044
parentb6cf8788a3382c2000743a0e393bcc8aeb0601cb
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] kvm: extension capability for new address space layout
  [S390] kvm: fix address mode switching