Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
commit1db9b8373821f200dd71f4896ca7323c371620fe
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Oct 2008 20:43:05 +0000 (3 13:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Oct 2008 20:43:05 +0000 (3 13:43 -0700)
tree8dcf67e48a53b7f56b2607b3ffbd859bcd674ff0
parent96d746c68fae9a1e3167caab04c22fd0f677f62d
parent75f6276187e5ce5a312a0619fba2fe56c9290b48
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] qdio: prevent stack clobber
  [S390] nohz: Fix __udelay.