tree be3a4e4b7202af48a8297a36d578990187629001
parent 3ee8da87ba6151ec91b2b8bbd27633bb248ea0d5
parent ab96e798cbd562a53edd802272e49a5100b29efb
author Linus Torvalds <torvalds@linux-foundation.org> 1239827307 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239827307 -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] boot cputime accounting
  [S390] add read_persistent_clock
  [S390] cpu hotplug and accounting values
  [S390] fix idle time accounting
  [S390] smp: fix cpu_possible_map initialization
  [S390] dasd: fix idaw boundary checking for track based ccw
  [S390] dasd: Use the new async framework for autoonlining.
  [S390] qdio: remove dead timeout handler
  [S390] appldata: Use new mod_virt_timer_periodic() function.
  [S390] extend virtual timer interface by mod_virt_timer_periodic
  [S390] stp synchronization retry timer
  [S390] call nmi_enter/nmi_exit on machine checks
  [S390] wire up preadv/pwritev system calls
  [S390] s390: move machine flags to lowcore