tree 14b0997d648a158e05fa2243b1beddaa6d4cfd36
parent 7d5fcdc38ff0425ff52bffe26d481ea07547574c
parent 33fea794b9deeb8ffb77e284eb37375b8f45a2c4
author Linus Torvalds <torvalds@linux-foundation.org> 1280442208 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1280442208 -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] etr: fix clock synchronization race
  [S390] Fix IRQ tracing in case of PER