| commit | 1db9b8373821f200dd71f4896ca7323c371620fe | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 03 13:43:05 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 03 13:43:05 2008 -0700 |
| tree | 8dcf67e48a53b7f56b2607b3ffbd859bcd674ff0 | |
| parent | 96d746c68fae9a1e3167caab04c22fd0f677f62d [diff] | |
| parent | 75f6276187e5ce5a312a0619fba2fe56c9290b48 [diff] |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/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.