summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6Linus Torvalds2007-07-1953-599/+473
|\
| * ide: add support for SCSI ioctls to ide-floppyBartlomiej Zolnierkiewicz2007-07-202-5/+17
| * ide: remove stale changelog from setup-pci.cBartlomiej Zolnierkiewicz2007-07-201-6/+0
| * ide: remove stale changelog/comments/TODO from ide.cBartlomiej Zolnierkiewicz2007-07-201-78/+0
| * ide-cris: handle PIO auto-tuning in tune_cris_ide()Bartlomiej Zolnierkiewicz2007-07-201-0/+2
| * ide: add PIO masksBartlomiej Zolnierkiewicz2007-07-2043-8/+99
| * ide: remove ide_find_best_pio_mode()Bartlomiej Zolnierkiewicz2007-07-207-39/+45
| * ide: drop "PIO data" argument from ide_get_best_pio_mode()Bartlomiej Zolnierkiewicz2007-07-2037-53/+43
| * ide: ide_find_best_pio_mode() fixes (take 2)Bartlomiej Zolnierkiewicz2007-07-201-6/+4
| * ide: add ide_pio_cycle_time() helper (take 2)Bartlomiej Zolnierkiewicz2007-07-209-56/+74
| * sc1200: remove stale Power Management codeBartlomiej Zolnierkiewicz2007-07-201-37/+2
| * ide: ide_start_power_step() fix WRT disabling DMABartlomiej Zolnierkiewicz2007-07-201-2/+3
| * serverworks: fix DMABartlomiej Zolnierkiewicz2007-07-201-6/+2
| * serverworks: always tune PIOBartlomiej Zolnierkiewicz2007-07-201-40/+36
| * ide: add ide_pci_device_t.host_flags (take 2)Bartlomiej Zolnierkiewicz2007-07-2035-94/+25
| * ide: add ide_dev_has_iordy() helper (take 4)Bartlomiej Zolnierkiewicz2007-07-203-10/+13
| * ide: make ide_get_best_pio_mode() print info if overriding PIO modeBartlomiej Zolnierkiewicz2007-07-204-11/+12
| * siimage: PIO mode setup fixes (take 2)Bartlomiej Zolnierkiewicz2007-07-201-98/+39
| * atiixp: PIO mode setup fixesBartlomiej Zolnierkiewicz2007-07-201-13/+19
| * ide: Stop mapping ROMsAlan Cox2007-07-205-38/+2
| * IDE: Remove references to dead ETRAX-related variables.Robert P. J. Day2007-07-201-6/+0
| * PCMCIA: Add another MemoryCard to ide-cs/pata_pcmciaMarcin Juszkiewicz2007-07-202-0/+2
| * scc_pata.c: Workaround for errata A308 (take 2)Kou Ishizaki2007-07-201-13/+54
| * scc_pata: Use inline function for eieioKumar Gala2007-07-201-2/+2
* | coda breakageAl Viro2007-07-192-14/+14
* | missed cong_avoid() instanceAl Viro2007-07-191-1/+1
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2007-07-197-66/+162
|\
| * SELinux: use SECINITSID_NETMSG instead of SECINITSID_UNLABELED for NetLabelPaul Moore2007-07-192-31/+31
| * SELinux: enable dynamic activation/deactivation of NetLabel/SELinux enforcementPaul Moore2007-07-196-35/+131
* | Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6Linus Torvalds2007-07-194-2/+93
|\ \
| * | [XFS] Fix inode size update before data write in xfs_setattrDavid Chinner2007-07-191-1/+24
| * | [XFS] Allow punching holes to free space when at ENOSPCDavid Chinner2007-07-191-1/+4
| * | [XFS] Implement ->page_mkwrite in XFS.David Chinner2007-07-191-0/+16
| * | [FS] Implement block_page_mkwrite.David Chinner2007-07-192-0/+49
| |/
* | i386: Allow KVM on i386 nonpaeAvi Kivity2007-07-196-18/+6
* | Merge git://git.linux-nfs.org/pub/linux/nfs-2.6Linus Torvalds2007-07-1917-407/+442
|\ \
| * | NFSv4: handle lack of clientaddr in option stringJeff Layton2007-07-191-0/+7
| * | NFSv4: debug print ntohl(status) in nfs client callback xdr codeBenny Halevy2007-07-191-5/+5
| * | SUNRPC: Clean up the sillyrename codeTrond Myklebust2007-07-197-202/+120
| * | NFS: Introduce struct nfs_removeargs+nfs_removeresTrond Myklebust2007-07-197-64/+99
| * | NFS: Use dentry->d_time to store the parent directory verifier.Trond Myklebust2007-07-191-2/+2
| * | SUNRPC: move bkl locking and xdr proc invocation into a common helperJ. Bruce Fields2007-07-193-27/+23
| * | NFSv4: Fix the nfsv4 readlink reply buffer alignmentTrond Myklebust2007-07-191-10/+11
| * | NFSv4: Fix the readdir reply buffer alignmentTrond Myklebust2007-07-191-13/+14
| * | NFSv4: More NFSv4 xdr cleanupsTrond Myklebust2007-07-191-74/+134
| * | NFSv4: Try to recover from getfh failures in nfs4_xdr_dec_openTrond Myklebust2007-07-192-5/+10
| * | NFSv4: 'constify' lookup arguments.Trond Myklebust2007-07-192-6/+6
| * | NFSv4: Don't fail nfs4_xdr_dec_open if decode_restorefh() failedTrond Myklebust2007-07-191-1/+1
| * | NFSv4: Fix open state recoveryTrond Myklebust2007-07-191-12/+24
| * | NFSD/SUNRPC: Fix the automatic selection of RPCSEC_GSSTrond Myklebust2007-07-191-1/+1
OpenPOWER on IntegriCloud