Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Jul 2010 22:23:28 +0000 (15:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Jul 2010 22:23:28 +0000 (15:23 -0700)
commita2dccdb2055abeb8a7ce8e45e5f83de9c980a00c
tree14b0997d648a158e05fa2243b1beddaa6d4cfd36
parent7d5fcdc38ff0425ff52bffe26d481ea07547574c
parent33fea794b9deeb8ffb77e284eb37375b8f45a2c4
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] etr: fix clock synchronization race
  [S390] Fix IRQ tracing in case of PER