| commit | b8ef289daa313b3e5eb6564ed1c2758ddb6e3d6f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 02 17:51:31 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 02 17:51:31 2011 -0800 |
| tree | 6e1dd8490bcf311ad49f8a3901f2f112aa7d19c8 | |
| parent | d54cdc8ca7aabc69e145a62155855db42b04ed0b [diff] | |
| parent | d9c11b1e8aade25d7d75fb8f344e68e1301822e4 [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] reset default for CONFIG_CHSC_SCH [S390] qdio: prevent compile warning under CONFIG_32BIT [S390] use asm-generic/cacheflush.h [S390] tlb: fix build error caused by THP [S390] missing sacf in uaccess [S390] pgtable_list corruption [S390] dasd: prevent panic with unresumed devices