summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2012-07-317-55/+121
|\
| * powerpc/kvm/book3s_32: Fix MTMSR_EERI macroAlexander Graf2012-07-311-1/+0
| * Merge remote-tracking branch 'kumar/merge' into mergeBenjamin Herrenschmidt2012-07-316-54/+121
| |\
| | * powerpc/85xx: p1022ds: fix DIU/LBC switching with NAND enabledTimur Tabi2012-07-261-2/+62
| | * powerpc/85xx: p1022ds: disable the NAND flash node if video is enabledTimur Tabi2012-07-261-20/+38
| | * powerpc/85xx: Fix sram_offset parameter typeClaudiu Manoil2012-07-262-27/+16
| | * powerpc/85xx: P3041DS - change espi input-clock from 40MHz to 35MHzShaohui Xie2012-07-261-1/+1
| | * powerpc/85xx: Fix pci base address error for p2020rdb-pc in dtsTang Yuantian2012-07-262-4/+4
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39...Linus Torvalds2012-07-3118-105/+104
|\ \ \
| * | | s390: make use of user_mode() macro where possibleHeiko Carstens2012-07-304-15/+15
| * | | s390/mm: rename user_mode variable to addressing_modeHeiko Carstens2012-07-306-14/+15
| * | | s390/mm: fix fault handling for page table walk caseHeiko Carstens2012-07-301-6/+7
| * | | s390/mm: make page faults killableHeiko Carstens2012-07-301-1/+11
| * | | s390: update defconfigHeiko Carstens2012-07-261-2/+3
| * | | s390/mm: downgrade page table after fork of a 31 bit processMartin Schwidefsky2012-07-264-8/+25
| * | | s390/ipl: Use diagnose 8 command separationMichael Holzheu2012-07-261-10/+2
| * | | s390/linker script: use RO_DATA_SECTIONHeiko Carstens2012-07-261-1/+1
| * | | s390/exceptions: sort exception table at build timeHeiko Carstens2012-07-263-1/+2
| * | | s390/debug: remove module_exit function / move EXPORT_SYMBOLsHeiko Carstens2012-07-261-47/+23
* | | | Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2012-07-3127-237/+368
|\ \ \ \
| * | | | NFSd: make boot_time variable per network namespaceStanislav Kinsbursky2012-07-273-16/+25
| * | | | NFSd: make grace end flag per network namespaceStanislav Kinsbursky2012-07-272-5/+4
| * | | | Lockd: move grace period management from lockd() to per-net functionsStanislav Kinsbursky2012-07-271-6/+3
| * | | | LockD: pass actual network namespace to grace period management functionsStanislav Kinsbursky2012-07-2710-58/+67
| * | | | LockD: manage grace list per network namespaceStanislav Kinsbursky2012-07-273-3/+13
| * | | | SUNRPC: service request network namespace helper introducedStanislav Kinsbursky2012-07-275-7/+9
| * | | | NFSd: make nfsd4_manager allocated per network namespace context.Stanislav Kinsbursky2012-07-272-13/+21
| * | | | LockD: make lockd manager allocated per network namespaceStanislav Kinsbursky2012-07-272-8/+12
| * | | | LockD: manage grace period per network namespaceStanislav Kinsbursky2012-07-272-6/+13
| * | | | Lockd: add more debug to host shutdown functionsStanislav Kinsbursky2012-07-271-2/+2
| * | | | Lockd: host complaining function introducedStanislav Kinsbursky2012-07-271-27/+30
| * | | | LockD: manage used host count per networks namespaceStanislav Kinsbursky2012-07-272-0/+19
| * | | | LockD: manage garbage collection timeout per networks namespaceStanislav Kinsbursky2012-07-272-3/+10
| * | | | LockD: make garbage collector network namespace aware.Stanislav Kinsbursky2012-07-271-9/+13
| * | | | LockD: mark host per network namespace on garbage collectStanislav Kinsbursky2012-07-273-8/+16
| * | | | nfsd4: fix missing fault_inject.h includeJ. Bruce Fields2012-07-271-0/+1
| * | | | locks: move lease-specific code out of locks_delete_lockJ. Bruce Fields2012-07-271-6/+5
| * | | | locks: prevent side-effects of locks_release_private before file_lock is init...Filipe Brandenburger2012-07-271-11/+6
| * | | | NFSd: set nfsd_serv to NULL after service destructionStanislav Kinsbursky2012-07-252-5/+7
| * | | | NFSd: introduce nfsd_destroy() helperStanislav Kinsbursky2012-07-253-17/+14
| * | | | nfsd: add get_uint for u32'sJ. Bruce Fields2012-07-252-3/+19
| * | | | NFSd: fix locking in nfsd_forget_delegations()Stanislav Kinsbursky2012-07-251-6/+17
| * | | | nfsd4: fix cr_principal comparison check in same_credsVivek Trivedi2012-07-251-2/+2
| * | | | SUNRPC/cache: fix reporting of expired cache entries in 'content' file.NeilBrown2012-07-121-1/+4
| * | | | sunrpc/cache.h: replace simple_strtoulEldad Zack2012-07-111-5/+1
| * | | | sunrpc/cache.h: fix coding styleEldad Zack2012-07-111-4/+10
| * | | | nfsd: share some function prototypesJ. Bruce Fields2012-07-101-0/+2
| * | | | nfsd: allow owner_override only for regular filesJ. Bruce Fields2012-07-101-1/+9
| * | | | nfsd4: release openowners on free in >=4.1 caseJ. Bruce Fields2012-07-101-6/+13
| * | | | nfsd4: our filesystems are normally case sensitiveJ. Bruce Fields2012-07-101-1/+1
OpenPOWER on IntegriCloud