| commit | 58be18c4de37b9277b045c0b5bb123a664dac9ed | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 24 08:28:27 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 24 08:28:27 2009 -0700 |
| tree | 370d55da6958b7b31aeaffc278512fea1111134d | |
| parent | 12bac708e6242b0ccd969519582b2938d78289bb [diff] | |
| parent | e655dc8873b2390d92888095af6adad822a8b386 [diff] |
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] update default configuration. [S390] omit frame pointers on s390 when possible [S390] Use tape_generic_offline directly. [S390] /proc/stat idle field for idle cpus [S390] appldata: avoid deadlock with appldata_mem [S390] ipl: fix compile breakage