Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Nov 2008 19:07:16 +0000 (11:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Nov 2008 19:07:16 +0000 (11:07 -0800)
commitf1ba3bc7b97ad0cc5886e5dadf4defba68f37819
tree733ec0fb6ab2f15732eb96b1fdd0e027ee3d4b92
parent95c5e1f1e6e1788cc8b9acbe9379ae395ef64958
parentabd942194dcba2fa9d24d547b8acd4ef052eaf73
Merge branch 'for-linus' of git://git390.osdl.marist.edu/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] Update default configuration.
  [S390] Fix alignment of initial kernel stack.
  [S390] pgtable.h: Fix oops in unmap_vmas for KVM processes
  [S390] fix/cleanup sched_clock
  [S390] fix system call parameter functions.
arch/s390/include/asm/ptrace.h