tree 8e889a7f236e1a7933f4a6245117d680af6479b9
parent d93dc5c4478c1fd5de85a3e8aece9aad7bbae044
parent b6cf8788a3382c2000743a0e393bcc8aeb0601cb
author Linus Torvalds <torvalds@linux-foundation.org> 1316709141 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1316709141 -0700

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] kvm: extension capability for new address space layout
  [S390] kvm: fix address mode switching