summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2007-07-1217-725/+890
|\
| * libata: remove irq_on from ata_bus_reset() and ata_std_postreset()Albert Lee2007-07-122-11/+0
| * ata_piix: kill incorrect invalid map value warningTejun Heo2007-07-121-1/+1
| * libata: add another Maxtor drive with broken NCQ to the listChuck Ebbert2007-07-121-0/+1
| * [libata] sata_mv: Fix and clean up per-chip-generation testsJeff Garzik2007-07-121-15/+14
| * [libata] sata_mv: Convert to new exception handling (EH) infrastructureJeff Garzik2007-07-121-247/+456
| * [libata] sata_mv: minor bug fixes, enhancements, and cleanups (prep for new EH)Jeff Garzik2007-07-121-15/+8
| * [libata] sata_mv: Minor cleanups and renaming, preparing for new EH & NCQJeff Garzik2007-07-111-57/+105
| * libata-link: add PMP related ATA constantsTejun Heo2007-07-101-0/+29
| * libata-link: separate out ata_eh_handle_dev_fail()Tejun Heo2007-07-101-44/+52
| * pata_hpt3x3: fix DMA Kconfig option to actually have a hope of workingJeff Garzik2007-07-101-0/+5
| * Add Hitachi HDS7250SASUN500G 0621KTAWSD to NCQ blacklistPrarit Bhargava2007-07-101-0/+2
| * pata_scc.c: Workaround for errata A308Akira Iguchi2007-07-101-15/+35
| * libata: add FUJITSU MHV2080BH to NCQ blacklistTejun Heo2007-07-101-0/+1
| * pata_hpt3x3: major reworking and testingAlan Cox2007-07-102-15/+85
| * libata: clean up horkage handlingTejun Heo2007-07-102-7/+9
| * libata: quirk IOMEGA ZIP 250 ATAPI FLOPPYTejun Heo2007-07-101-0/+2
| * libata: simplify PCI legacy SFF host handlingTejun Heo2007-07-107-266/+42
| * pata_mpc52xx: suspend/resume supportDomen Puncer2007-07-101-2/+16
| * sata_promise: SATA hotplug support, take 2Mikael Pettersson2007-07-101-5/+36
| * pata_sis: FIFO whackAlan Cox2007-07-101-0/+3
| * libata-core: convert to use cancel_rearming_delayed_work()Oleg Nesterov2007-07-102-41/+4
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...Linus Torvalds2007-07-12412-7282/+11191
|\ \
| * | [TG3]: Update version to 3.78.Michael Chan2007-07-111-2/+2
| * | [TG3]: Add missing NVRAM strapping.Matt Carlson2007-07-112-1/+4
| * | [TG3]: Enable auto MDI.Matt Carlson2007-07-112-15/+49
| * | [TG3]: Fix the polarity bit.Matt Carlson2007-07-111-19/+44
| * | [TG3]: Fix irq_sync race condition.Michael Chan2007-07-111-3/+3
| * | [NET_SCHED]: ematch: module autoloadingPatrick McHardy2007-07-118-10/+31
| * | [TCP]: tcp probe wraparound handling and other changesStephen Hemminger2007-07-111-70/+124
| * | [RTNETLINK]: rtnl_link: allow specifying initial device addressPatrick McHardy2007-07-115-4/+44
| * | [RTNETLINK]: rtnl_link API simplificationPatrick McHardy2007-07-114-131/+23
| * | [VLAN]: Fix MAC address handlingPatrick McHardy2007-07-114-45/+57
| * | [ETH]: Validate address in eth_mac_addrPatrick McHardy2007-07-111-0/+3
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6David S. Miller2007-07-1110-142/+195
| |\ \
| | * | [Bluetooth] Add basics to better support and handle eSCO linksMarcel Holtmann2007-07-115-37/+66
| | * | [Bluetooth] Keep rfcomm_dev on the list until it is freedVille Tervo2007-07-112-8/+23
| | * | [Bluetooth] Hangup TTY before releasing rfcomm_devMikko Rapeli2007-07-111-0/+4
| | * | [Bluetooth] Remove the redundant non-seekable llseek methodRobert P. J. Day2007-07-111-6/+0
| | * | [Bluetooth] Use hci_recv_fragment() within HCI USB driverMarcel Holtmann2007-07-112-89/+4
| | * | [Bluetooth] Add hci_recv_fragment() helper functionMarcel Holtmann2007-07-112-2/+98
| * | | [NET]: Fix races in net_rx_action vs netpoll.Olaf Kirch2007-07-112-0/+18
| * | | [AF_UNIX]: Rewrite garbage collector, fixes race.Miklos Szeredi2007-07-113-144/+190
| * | | [NETFILTER]: {ip, nf}_conntrack_sctp: fix remotely triggerable NULL ptr deref...Patrick McHardy2007-07-101-1/+2
| * | | [NET]: Make all initialized struct seq_operations const.Philippe De Muyter2007-07-1056-76/+76
| * | | [UDP]: Fix length check.Patrick McHardy2007-07-101-7/+2
| * | | [IPV6]: Remove unneeded pointer idev from addrconf_cleanup().Micah Gruber2007-07-101-2/+1
| * | | [DECNET]: Another unnecessary net/tcp.h inclusion in net/dn.hIlpo Järvinen2007-07-101-1/+0
| * | | [IPV6]: Make IPV6_{RECV,2292}RTHDR boolean options.YOSHIFUJI Hideaki2007-07-102-8/+4
| * | | [IPV6]: Do not send RH0 anymore.YOSHIFUJI Hideaki2007-07-108-130/+5