aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2010-05-188-129/+312
|\
| * Merge branch 'iommu/largepages' into amd-iommu/2.6.35Joerg Roedel2010-05-116-129/+304
| |\
| | * iommu-api: Remove iommu_{un}map_range functionsJoerg Roedel2010-03-073-92/+2
| | * x86/amd-iommu: Implement ->{un}map callbacks for iommu-apiJoerg Roedel2010-03-071-0/+29
| | * x86/amd-iommu: Make amd_iommu_iova_to_phys aware of multiple page sizesJoerg Roedel2010-03-071-4/+9
| | * x86/amd-iommu: Make iommu_unmap_page and fetch_pte aware of page sizesJoerg Roedel2010-03-072-18/+78
| | * x86/amd-iommu: Make iommu_map_page and alloc_pte aware of page sizesJoerg Roedel2010-03-072-20/+61
| | * kvm: Change kvm_iommu_map_pages to map large pagesJoerg Roedel2010-03-071-22/+91
| | * VT-d: Change {un}map_range functions to implement {un}map interfaceJoerg Roedel2010-03-071-10/+12
| | * iommu-api: Add ->{un}map callbacks to iommu_opsJoerg Roedel2010-03-072-0/+10
| | * iommu-api: Add iommu_map and iommu_unmap functionsJoerg Roedel2010-03-072-0/+47
| | * iommu-api: Rename ->{un}map function pointers to ->{un}map_rangeJoerg Roedel2010-03-074-10/+10
| * | x86/amd-iommu: Add amd_iommu=off command line optionJoerg Roedel2010-05-112-0/+8
* | | Merge branch 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/li...Linus Torvalds2010-05-181-2/+2
|\ \ \
| * | | debugobjects: Section mismatch cleanupHenrik Kretzschmar2010-03-261-2/+2
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6Linus Torvalds2010-05-1827-1245/+1228
|\ \ \ \
| * | | | cifs: fix noserverino handling when unix extensions are enabledJeff Layton2010-05-173-0/+15
| * | | | cifs: don't update uniqueid in cifs_fattr_to_inodeJeff Layton2010-05-171-1/+0
| * | | | cifs: always revalidate hardlinked inodes when using noserverinoJeff Layton2010-05-171-0/+5
| * | | | Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6Steve French2010-05-1410-22/+96
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6Steve French2010-05-1411-25/+44
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6Steve French2010-05-13743-4321/+9920
| |\ \ \ \ \ \
| * | | | | | | [CIFS] drop quota operation stubsSteve French2010-05-121-107/+0
| * | | | | | | cifs: propagate cifs_new_fileinfo() error back to the callerSuresh Jayaraman2010-05-111-4/+13
| * | | | | | | cifs: add comments explaining cifs_new_fileinfo behaviorSuresh Jayaraman2010-05-101-2/+16
| * | | | | | | cifs: remove unused parameter from cifs_posix_open_inode_helper()Suresh Jayaraman2010-05-101-3/+2
| * | | | | | | [CIFS] Remove unused cifs_oplock_cachepSteve French2010-05-062-14/+0
| * | | | | | | cifs: have decode_negTokenInit set flags in server structJeff Layton2010-05-056-30/+26
| * | | | | | | cifs: break negotiate protocol calls out of cifs_setup_sessionJeff Layton2010-05-053-33/+52
| * | | | | | | cifs: eliminate "first_time" parm to CIFS_SessSetupJeff Layton2010-04-283-11/+15
| * | | | | | | [CIFS] Fix lease break for writesSteve French2010-04-273-17/+3
| * | | | | | | cifs: save the dialect chosen by serverJeff Layton2010-04-272-6/+6
| * | | | | | | cifs: change && to ||Dan Carpenter2010-04-261-1/+1
| * | | | | | | cifs: rename "extended_security" to "global_secflags"Jeff Layton2010-04-266-12/+12
| * | | | | | | cifs: move tcon find/create into separate functionJeff Layton2010-04-261-70/+86
| * | | | | | | cifs: move SMB session creation code into separate functionJeff Layton2010-04-261-65/+93
| * | | | | | | cifs: track local_nls in volume infoJeff Layton2010-04-261-5/+6
| * | | | | | | [CIFS] Allow null nd (as nfs server uses) on createSteve French2010-04-223-14/+23
| * | | | | | | [CIFS] Fix losing locks during fork()Pavel Shilovsky2010-04-211-3/+4
| * | | | | | | [CIFS] Cleanup various minor breakage in previous cFYI cleanupSteve French2010-04-214-29/+29
| * | | | | | | [CIFS] Neaten cERROR and cFYI macros, reduce text spaceJoe Perches2010-04-2125-835/+845
| * | | | | | | [CIFS] use add_to_page_cache_lruNick Piggin2010-04-211-10/+3
* | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee...Linus Torvalds2010-05-1731-285/+405
|\ \ \ \ \ \ \ \
| * | | | | | | | m68k: amiga - Floppy platform device conversionGeert Uytterhoeven2010-05-172-26/+26
| * | | | | | | | m68k: amiga - Sound platform device conversionGeert Uytterhoeven2010-05-172-20/+36
| * | | | | | | | m68k: amiga - Frame buffer platform device conversionGeert Uytterhoeven2010-05-172-18/+46
| * | | | | | | | m68k: amiga - Zorro host bridge platform device conversionGeert Uytterhoeven2010-05-175-128/+190
| * | | | | | | | m68k: amiga - Zorro bus modalias supportGeert Uytterhoeven2010-05-1712-12/+66
| * | | | | | | | platform: Make platform resource input parameters constGeert Uytterhoeven2010-05-172-4/+6
| * | | | | | | | m68k: invoke oom-killer from page faultNick Piggin2010-05-171-10/+4