summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ger...Linus Torvalds2011-07-2644-1907/+1074
|\
| * m68k: Revive reporting of spurious interruptsGeert Uytterhoeven2011-07-255-8/+12
| * m68knommu: Move forward declaration of do_IRQ() from machdep.h to irq.hGeert Uytterhoeven2011-07-252-1/+2
| * m68k: fix some atomic operation asm address modes for ColdFireGreg Ungerer2011-07-251-3/+3
| * m68k: use CPU_HAS_NO_BITFIELDS for signal functionsGreg Ungerer2011-07-251-8/+7
| * m68k: merge and clean up delay.h filesGreg Ungerer2011-07-255-158/+95
| * m68knommu: correctly use trap_initGreg Ungerer2011-07-259-24/+13
| * m68knommu: merge ColdFire 5206 and 5206e platform codeGreg Ungerer2011-07-255-195/+7
| * m68k: merge mmu and non-mmu bitops.hGreg Ungerer2011-07-255-837/+535
| * m68k: merge MMU and non MMU versions of system.hGreg Ungerer2011-07-257-380/+222
| * m68k: merge MMU and non-MMU versions of asm/hardirq.hGreg Ungerer2011-07-254-47/+32
| * m68k: merge the non-mmu and mmu versions of module.cGreg Ungerer2011-07-254-241/+140
| * m68knommu: Fix printk() format in free_initrd_mem()Geert Uytterhoeven2011-07-251-2/+3
| * m68knommu: Make empty_zero_page "void *", like on m68kGeert Uytterhoeven2011-07-251-3/+3
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linusLinus Torvalds2011-07-266-6/+28
|\ \
| * | Squashfs: Make ZLIB compression support optionalPhillip Lougher2011-07-225-5/+25
| * | Squashfs: Update documentation for XZ and add squashfs-tools devel treePhillip Lougher2011-07-221-1/+3
* | | Merge branch 'for-3.1' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2011-07-2633-1426/+559
|\ \ \
| * | | nfsd: don't break lease on CLAIM_DELEGATE_CURCasey Bodley2011-07-231-6/+12
| * | | locks: rename lock-manager opsJ. Bruce Fields2011-07-217-47/+47
| * | | nfsd4: update nfsv4.1 implementation notesJ. Bruce Fields2011-07-191-23/+10
| * | | nfsd: turn on reply cache for NFSv4J. Bruce Fields2011-07-187-23/+55
| * | | nfsd4: call nfsd4_release_compoundargs from pc_releaseJ. Bruce Fields2011-07-183-10/+8
| * | | nfsd41: Deny new lock before RECLAIM_COMPLETE doneMi Jinlong2011-07-161-0/+9
| * | | fs: locks: remove init_onceMiklos Szeredi2011-07-161-31/+10
| * | | nfsd41: check the size of requestMi Jinlong2011-07-161-0/+12
| * | | nfsd41: error out when client sets maxreq_sz or maxresp_sz too smallMi Jinlong2011-07-161-0/+27
| * | | nfsd4: fix file leak on open_downgradeJ. Bruce Fields2011-07-161-23/+8
| * | | nfsd4: remember to put RW access on stateid destructionJ. Bruce Fields2011-07-161-11/+6
| * | | NFSD: Added TEST_STATEID operationBryan Schumaker2011-07-165-3/+145
| * | | NFSD: added FREE_STATEID operationBryan Schumaker2011-07-164-2/+161
| * | | svcrpc: fix list-corrupting race on nfsd shutdownJ. Bruce Fields2011-07-161-5/+6
| * | | rpc: allow autoloading of gss mechanismsJ. Bruce Fields2011-07-162-4/+35
| * | | svcauth_unix.c: quiet sparse noiseH Hartley Sweeten2011-07-161-0/+1
| * | | svcsock.c: include sunrpc.h to quiet sparse noiseH Hartley Sweeten2011-07-161-0/+2
| * | | nfsd: Remove deprecated nfsctl system call and related code.NeilBrown2011-07-1614-1238/+0
| * | | NFSD: allow OP_DESTROY_CLIENTID to be only op in COMPOUNDBenny Halevy2011-07-161-0/+5
* | | | vfs: fix check_acl compile error when CONFIG_FS_POSIX_ACL is not setLinus Torvalds2011-07-261-0/+2
* | | | Merge 'akpm' patch seriesLinus Torvalds2011-07-26160-1090/+5261
|\ \ \ \
| * | | | drivers/connector/cn_proc.c: remove unused localAndrew Morton2011-07-261-1/+0
| * | | | Documentation/SubmitChecklist: add RCU debug config optionsPaul E. McKenney2011-07-261-2/+2
| * | | | reiserfs: use hweight_long()Akinobu Mita2011-07-261-5/+1
| * | | | reiserfs: use proper little-endian bitopsAkinobu Mita2011-07-263-4/+6
| * | | | pnpacpi: register disabled resourcesWitold Szczeponik2011-07-261-25/+27
| * | | | drivers/rtc/rtc-tegra.c: properly initialize spinlockUwe Kleine-König2011-07-261-1/+1
| * | | | drivers/rtc/rtc-twl.c: check return value of twl_rtc_write_u8() in twl_rtc_se...Jesper Juhl2011-07-261-1/+1
| * | | | drivers/rtc: add support for Qualcomm PMIC8xxx RTCAnirudh Ghayal2011-07-264-0/+586
| * | | | drivers/rtc/rtc-s3c.c: support clock gatingDonggeun Kim2011-07-261-1/+26
| * | | | drivers/rtc/rtc-mpc5121.c: add support for RTC on MPC5200Dmitry Eremin-Solenikov2011-07-262-10/+75
| * | | | init: skip calibration delay if previously doneSameer Nanda2011-07-261-1/+10