summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2008-02-1513-25/+22
|\
| * ata: fix sparse warning in pata_acpi.cHarvey Harrison2008-02-151-2/+2
| * ata: fix sparse warning in pata_marvell.cHarvey Harrison2008-02-151-2/+2
| * ata: fix sparse warning in pata_jmicron.cHarvey Harrison2008-02-151-1/+2
| * ata: fix sparse warning in pata_cs5536.cHarvey Harrison2008-02-151-1/+1
| * ata: sparse fixes for pata_amd.cHarvey Harrison2008-02-151-5/+2
| * pata_scc.c: add thaw opsAkira Iguchi2008-02-151-0/+2
| * pata_cs5536.c bugfixMartin K. Petersen2008-02-151-4/+4
| * pata_legacy: don't call ata_host_detach() after initialization failureTejun Heo2008-02-151-2/+0
| * ata: fix sparse warnings in sata_mv.cHarvey Harrison2008-02-151-2/+2
| * ata: fix sparse warning in sata_via.cHarvey Harrison2008-02-151-2/+2
| * ata: fix sparse warning in sata_promise.cHarvey Harrison2008-02-151-1/+1
| * ata: fix sparse warning in ata_piix.cHarvey Harrison2008-02-151-1/+1
| * ata: fix sparse warning in libata-core.cHarvey Harrison2008-02-151-1/+0
| * ata: make ata_scsiop_inq_89 static in libata-scsi.cHarvey Harrison2008-02-151-1/+1
* | Linux 2.6.25-rc2v2.6.25-rc2Linus Torvalds2008-02-151-2/+2
* | Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2008-02-155-16/+21
|\ \
| * \ Merge branch 'linus_origin' into hotfixesTrond Myklebust2008-02-15271-3432/+5317
| |\ \
| * | | NFS: add missing spkm3 strings to mount option parserOlga Kornievskaia2008-02-131-0/+4
| * | | NFS: remove error field from nfs_readdir_descriptor_tJeff Layton2008-02-131-5/+3
| * | | NFS: missing spaces in KERN_WARNINGDan Muntz2008-02-131-2/+2
| * | | NFS: Allow text-based mounts via compat_sys_mountChuck Lever2008-02-131-3/+0
| * | | NFS: fix reference counting for NFSv4 callback threadJeff Layton2008-02-131-6/+12
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-02-1560-1953/+5663
|\ \ \ | |_|/ |/| |
| * | [NET]: Make sure sockets implement splice_readRĂ©mi Denis-Courmont2008-02-151-0/+3
| * | netconsole: avoid null pointer dereference at show_local_mac()Keiichi KII2008-02-151-2/+2
| * | [IPV6]: Fix reversed local_df test in ip6_fragmentHerbert Xu2008-02-141-2/+2
| * | [XFRM]: Avoid bogus BUG() when throwing new policy away.YOSHIFUJI Hideaki2008-02-141-0/+1
| * | [AF_KEY]: Fix bug in spdaddKazunori MIYAZAWA2008-02-141-0/+1
| * | [NETFILTER] nf_conntrack_proto_tcp.c: Mistyped state corrected.Jozsef Kadlecsik2008-02-141-1/+1
| * | net: xfrm statistics depend on INETPaul Mundt2008-02-141-1/+1
| * | [NETFILTER]: make secmark_tg_destroy() staticAdrian Bunk2008-02-131-1/+1
| * | [INET]: Unexport inet_listen_wlockAdrian Bunk2008-02-131-2/+0
| * | [INET]: Unexport __inet_hash_connectAdrian Bunk2008-02-131-1/+0
| * | [NET]: Improve cache line coherency of ingress qdiscNeil Turton2008-02-121-4/+4
| * | [NET]: Fix race in dev_close(). (Bug 9750)Matti Linnanvuori2008-02-121-2/+2
| * | [IPSEC]: Fix bogus usage of u64 on input sequence numberHerbert Xu2008-02-127-10/+15
| * | [RTNETLINK]: Send a single notification on device state changes.Laszlo Attila Toth2008-02-121-10/+26
| * | [NETLABLE]: Hide netlbl_unlabel_audit_addr6 under ifdef CONFIG_IPV6.Pavel Emelyanov2008-02-121-0/+2
| * | [NETLABEL]: Don't produce unused variables when IPv6 is off.Pavel Emelyanov2008-02-121-10/+18
| * | [NETLABEL]: Compilation for CONFIG_AUDIT=n case.Pavel Emelyanov2008-02-121-2/+1
| * | [GENETLINK]: Relax dances with genl_lock.Pavel Emelyanov2008-02-121-4/+2
| * | [NETLABEL]: Fix lookup logic of netlbl_domhsh_search_def.Pavel Emelyanov2008-02-121-3/+3
| * | [IPV6]: remove unused method declaration (net/ndisc.h).Rami Rosen2008-02-121-1/+0
| * | [NET]: Fix comment for skb_pull_rcsumUrs Thuermann2008-02-121-2/+1
| * | [IPV6]: Fix IPsec datagram fragmentationHerbert Xu2008-02-122-2/+6
| * | [NDISC]: Fix race in generic address resolutionDavid S. Miller2008-02-122-12/+3
| * | hci_ldisc: fix null pointer derefDavid Newall2008-02-121-0/+1
| * | [AX25] ax25_ds_timer: use mod_timer instead of add_timerJarek Poplawski2008-02-123-9/+6
| * | [AX25] ax25_timer: use mod_timer instead of add_timerJarek Poplawski2008-02-123-44/+23