| commit | 599c853195f43dfbcbf28b362e6ae80ffa33fec7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.osdl.org> | Tue Jan 09 09:34:20 2007 -0800 |
| committer | Linus Torvalds <torvalds@woody.osdl.org> | Tue Jan 09 09:34:20 2007 -0800 |
| tree | 0a4730bd6cb2289bc3b81fdac1d42888d9de8e5f | |
| parent | 2f5c33b3180169f3eafb698b66686962d637fb0e [diff] | |
| parent | bf3dbdcd0bfca74c16ad0b2b5a978907c864ed4c [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] locking problem with __cpcmd. [S390] don't call handle_mm_fault() if in an atomic context. [S390] Fix vmalloc area size calculation. [S390] Fix cpu hotplug (missing 'online' attribute). [S390] cio: use barrier() in stsch_reset. [S390] memory detection misses 128k.