)]}' { "log": [ { "commit": "efdbc1a7caf770b1b312000a42c630597f06973d", "tree": "be5eeec43a6887dc07cfc957ce357be88b807847", "parents": [ "a4c0291aa942dceddabe23bf2b74addb958d0964" ], "author": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Mon Sep 25 14:04:49 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Mon Sep 25 16:39:56 2006 -0700" }, "message": "[SUNLANCE]: Mark sparc_lance_probe_one as __devinit.\n\nFixes section mismatch warnings when built as a module.\n\nAlso, mark find_ledma and sun4 init function as __devinit\ntoo.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "855fc73bf81e8f99606d6f5914c5b7c3b079d718", "tree": "802cd222d609efdce191ed85369d091b86ac7771", "parents": [ "ee111d111b69c2a216d674081107fe3b3829aa9a" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Mon Sep 25 02:54:46 2006 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun Sep 24 20:07:49 2006 -0700" }, "message": "[PATCH] wrong thing iounmapped (qla3xxx)\n\nql3xxx_probe() does ioremap and stores result in -\u003emem_map_registers.\nOn failure exit it does iounmap() of the same thing.\n\nOTOH, ql3xxx_remove() does iounmap() of -\u003emmap_virt_base which is\n (a) never assigned and\n (b) never used other than in that iounmap() call.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "ee111d111b69c2a216d674081107fe3b3829aa9a", "tree": "3696a452a000ef30c9aaa037e43465f9467aa947", "parents": [ "8a1cdc9ca264c49ad0b896e43468fe6a4b0b646c" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Mon Sep 25 02:53:53 2006 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun Sep 24 20:07:48 2006 -0700" }, "message": "[PATCH] qla3xxx iomem annotations\n\nthe driver is still shite, though...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "a319a2773a13bab56a0d0b3744ba8703324313b5", "tree": "f02c86acabd1031439fd422a167784007e84ebb1", "parents": [ "e18fa700c9a31360bc8f193aa543b7ef7b39a06b", "183798799216fad36c7219fe8d4d6dee6b8fa755" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun Sep 24 10:15:13 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun Sep 24 10:15:13 2006 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6\n\n* \u0027upstream-linus\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (217 commits)\n net/ieee80211: fix more crypto-related build breakage\n [PATCH] Spidernet: add ethtool -S (show statistics)\n [NET] GT96100: Delete bitrotting ethernet driver\n [PATCH] mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM\n [PATCH] Cirrus Logic ep93xx ethernet driver\n r8169: the MMIO region of the 8167 stands behin BAR#1\n e1000, ixgb: Remove pointless wrappers\n [PATCH] Remove powerpc specific parts of 3c509 driver\n [PATCH] s2io: Switch to pci_get_device\n [PATCH] gt96100: move to pci_get_device API\n [PATCH] ehea: bugfix for register access functions\n [PATCH] e1000 disable device on PCI error\n drivers/net/phy/fixed: #if 0 some incomplete code\n drivers/net: const-ify ethtool_ops declarations\n [PATCH] ethtool: allow const ethtool_ops\n [PATCH] sky2: big endian\n [PATCH] sky2: fiber support\n [PATCH] sky2: tx pause bug fix\n drivers/net: Trim trailing whitespace\n [PATCH] ehea: IBM eHEA Ethernet Device Driver\n ...\n\nManually resolved conflicts in drivers/net/ixgb/ixgb_main.c and\ndrivers/net/sky2.c related to CHECKSUM_HW/CHECKSUM_PARTIAL changes by\ncommit 84fa7933a33f806bbbaae6775e87459b1ec584c0 that just happened to be\nnext to unrelated changes in this update.\n" }, { "commit": "a4c12d6c5dde48c69464baf7c703e425ee511433", "tree": "73c375e41a353e2da0461ff30d744bff73958b08", "parents": [ "73af07de3e32b9ac328c3d1417258bb98a9b0a9b", "3b9f9a1c3903b64c38505f9fed3bb11e48dbc931" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sat Sep 23 16:49:31 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sat Sep 23 16:49:31 2006 -0700" }, "message": "Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\n* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (353 commits)\n [IPV6] ADDRCONF: Mobile IPv6 Home Address support.\n [IPV6] ADDRCONF: Allow non-DAD\u0027able addresses.\n [IPV6] NDISC: Fix is_router flag setting.\n [IPV6] ADDRCONF: Convert addrconf_lock to RCU.\n [IPV6] NDISC: Add proxy_ndp sysctl.\n [IPV6] NDISC: Set per-entry is_router flag in Proxy NA.\n [IPV6] NDISC: Avoid updating neighbor cache for proxied address in receiving NA.\n [IPV6]: Don\u0027t forward packets to proxied link-local address.\n [IPV6] NDISC: Handle NDP messages to proxied addresses.\n [NETFILTER]: PPTP conntrack: fix another GRE keymap leak\n [NETFILTER]: PPTP conntrack: fix GRE keymap leak\n [NETFILTER]: PPTP conntrack: fix PPTP_IN_CALL message types\n [NETFILTER]: PPTP conntrack: check call ID before changing state\n [NETFILTER]: PPTP conntrack: clean up debugging cruft\n [NETFILTER]: PPTP conntrack: consolidate header parsing\n [NETFILTER]: PPTP conntrack: consolidate header size checks\n [NETFILTER]: PPTP conntrack: simplify expectation handling\n [NETFILTER]: PPTP conntrack: remove unnecessary cid/pcid header pointers\n [NETFILTER]: PPTP conntrack: fix header definitions\n [NETFILTER]: PPTP conntrack: remove more dead code\n ...\n" }, { "commit": "9b6b0b81f0de6a17ce57c818d1f403253c200e1f", "tree": "51706d05197363768630bdcbd5249c906f9567f9", "parents": [ "78cc3b78c4208d28e7f4ecded82e238224ed4d1c" ], "author": { "name": "Jim Lewis", "email": "jklewis@us.ibm.com", "time": "Fri Sep 22 17:22:53 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Fri Sep 22 20:26:02 2006 -0400" }, "message": "[PATCH] Spidernet: add ethtool -S (show statistics)\n\nAdd the ethtool -S (show statistics) feature to the Spidernet ethernet\ndriver. I have tested it extensively and believe it is ready to be\napplied.\n\nSigned-off-by: James K Lewis \u003cjklewis@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "78cc3b78c4208d28e7f4ecded82e238224ed4d1c", "tree": "137f4fe32e41572bb41ba170f6b822ebf215079e", "parents": [ "ff2a2e0172fd11b1bfb9b45ee1b996d3f10669af", "d81bf551103cc3bc9e4f7ddf337511d6da0d088f" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Fri Sep 22 20:18:02 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Fri Sep 22 20:18:02 2006 -0400" }, "message": "Merge tag \u0027r8169-20060920-00\u0027 of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into tmp\n" }, { "commit": "ff2a2e0172fd11b1bfb9b45ee1b996d3f10669af", "tree": "aa73a797810fb389c27af29b9eea2648bc979ee4", "parents": [ "06ede91017d015a03cf8c1c87b3ff668f9a846e0" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Fri Sep 22 20:15:30 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Fri Sep 22 20:15:30 2006 -0400" }, "message": "[NET] GT96100: Delete bitrotting ethernet driver\n\nCode for the EV96100 evaluation board hasn\u0027t compiled since at least\nNovember 15, 2003, so it is being deleted as of 2.6.18 due to lack of\na user base.\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "06ede91017d015a03cf8c1c87b3ff668f9a846e0", "tree": "7c9e4098d676b647f3e5f7d6a11ac1cf1f91f809", "parents": [ "1d22e05df8183b36b3cc0760344774040abc74d5" ], "author": { "name": "Dale Farnsworth", "email": "dale@farnsworth.org", "time": "Wed Sep 20 12:24:34 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Fri Sep 22 20:13:23 2006 -0400" }, "message": "[PATCH] mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM\n\nNo 64-bit PPC_MULTIPLATFORM platforms use the mv643xx_eth driver,\nso build it only on PPC32.\n\nSigned-off-by: Dale Farnsworth \u003cdale@farnsworth.org\u003e\nAcked-by: Sven Luther \u003csl@bplan-gmbh.de\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "1d22e05df8183b36b3cc0760344774040abc74d5", "tree": "ec560b450a60045d0607b450ced38b60a9db9ecb", "parents": [ "28eb177dfa5982d132edceed891cb3885df258bb" ], "author": { "name": "Lennert Buytenhek", "email": "buytenh@wantstofly.org", "time": "Fri Sep 22 02:28:13 2006 +0200" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Fri Sep 22 20:13:23 2006 -0400" }, "message": "[PATCH] Cirrus Logic ep93xx ethernet driver\n\nThe Cirrus Logic ep93xx is an ARM SoC that includes an ethernet MAC\n-- this patch adds a driver for that ethernet MAC.\n\nSigned-off-by: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "28eb177dfa5982d132edceed891cb3885df258bb", "tree": "5f8fdc37ad1d8d0793e9c47da7d908b97c814ffb", "parents": [ "fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b", "db392219c5f572610645696e3672f6ea38783a65" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Fri Sep 22 20:10:23 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Fri Sep 22 20:10:23 2006 -0400" }, "message": "Merge branch \u0027master\u0027 into upstream\n\nConflicts:\n\n\tnet/ieee80211/ieee80211_crypt_tkip.c\n\tnet/ieee80211/ieee80211_crypt_wep.c\n" }, { "commit": "3e2ab46df697048e222cdc046a2fa97149ca32ba", "tree": "f0b53afc6054853f7281b833d2d6b9ed48ed2b19", "parents": [ "e6e5fee1426bef07f4e6c3c76f48343c14207938", "54caf44da31995df1f51174468fd9e83ca5c67a2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Fri Sep 22 15:37:31 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Fri Sep 22 15:37:31 2006 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6\n\n* \u0027upstream-linus\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:\n [netdrvr] mv643xx_eth: fix obvious typo, which caused build breakage\n [netdrvr] lp486e: fix typo\n" }, { "commit": "131852176c1f5b4350b4af811d1836db387d0c61", "tree": "1092efea1219dd4ea2c146b68563c72568183e78", "parents": [ "8abfedd889e46ad4977dfcdab737edf5c5803c62" ], "author": { "name": "Henrik Kretzschmar", "email": "henne@nachtwindheim.de", "time": "Tue Aug 22 00:28:33 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Fri Sep 22 14:55:20 2006 -0700" }, "message": "[TG3]: Convert the pci_device_id table to PCI_DEVICE()\n\nConvert the pci_device_ids to PCI_DEVICE() macro. Saves 1.5k in the\nsourcefile.\n\nSigned-off-by: Henrik Kretzschmar \u003chenne@nachtwindheim.de\u003e\nAcked-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "62872e2dcb3127b20a49e3b4b1d93523cf476cc4", "tree": "b6ac296c59ab341a26c2a3562d347fac93cbf1dc", "parents": [ "9c3bd6833a4df1abd9ecd3b51492b8949bf9cd11" ], "author": { "name": "Stphane Witzmann", "email": "stephane.witzmann@ubpmes.univ-bpclermont.fr", "time": "Tue Aug 15 00:09:17 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Fri Sep 22 14:54:46 2006 -0700" }, "message": "[ARCNET]: SoHard PCI support\n\nAdd support for a SoHard PCI ARCnet card.\n\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9c3bd6833a4df1abd9ecd3b51492b8949bf9cd11", "tree": "6835d90852cd40289ad970b979b694ed55203e60", "parents": [ "9a673e563e543a5c8a6f9824562e55e807b8a56c" ], "author": { "name": "Bjorn Helgaas", "email": "bjorn.helgaas@hp.com", "time": "Tue Aug 15 00:05:38 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Fri Sep 22 14:54:45 2006 -0700" }, "message": "[IRDA]: Replace hard-coded dev_self[] array sizes with ARRAY_SIZE()\n\nSeveral IR drivers used \"for (i \u003d 0; i \u003c 4; i++)\" to walk their\ndev_self[] table. Better to use ARRAY_SIZE(). And fix ali-ircc so it\nwon\u0027t run off the end if we find too many adapters.\n\nSigned-off-by: Bjorn Helgaas \u003cbjorn.helgaas@hp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "50da859d4e566fba90ebda87b843970d902c903e", "tree": "43d7e49e429afe62b61920ba4d8d4278bcf6ced1", "parents": [ "90d41122f79c8c3687d965dde4c6d30a6e0cac4c" ], "author": { "name": "Andreas Mohr", "email": "andi@lisas.de", "time": "Mon Aug 14 23:54:30 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Fri Sep 22 14:54:39 2006 -0700" }, "message": "[TG3]: Constify firmware structs\n\nConstify largish areas of firmware data in Tigon3 ethernet driver.\n\nnon-const:\n\nlsmod:\ntg3 101404 0\n\nobjdump -x:\n.rodata 000003e8\n.data 00004a0c\n\nls -l:\n-rw-r--r-- 1 root root 114404 2006-08-19 21:36 drivers/net/tg3.ko\n\nconst:\n\nlsmod:\ntg3 101404 0\n\nobjdump -x:\n.rodata 000042c8\n.data 00000b4c\n\nls -l:\n-rw-r--r-- 1 root root 114532 2006-08-19 21:06 drivers/net/tg3.ko\n\nSigned-off-by: Andreas Mohr \u003candi@lisas.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "84fa7933a33f806bbbaae6775e87459b1ec584c0", "tree": "5be404225d90f640997b12f631e9b496b3fd0d61", "parents": [ "8584d6df39db5601965f9bc5e3bf2fea833ad7bb" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Aug 29 16:44:56 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Fri Sep 22 14:53:53 2006 -0700" }, "message": "[NET]: Replace CHECKSUM_HW by CHECKSUM_PARTIAL/CHECKSUM_COMPLETE\n\nReplace CHECKSUM_HW by CHECKSUM_PARTIAL (for outgoing packets, whose\nchecksum still needs to be completed) and CHECKSUM_COMPLETE (for\nincoming packets, device supplied full checksum).\n\nPatch originally from Herbert Xu, updated by myself for 2.6.18-rc3.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6bbd9b6d694ff7242d63cda2faac4bd59ee4328e", "tree": "0641aa896e2ea01f4692973e5fbea429408854f4", "parents": [ "a489d159229fcc07bbb7566ac4fac745b79197ad", "3c164bd8153c4644a22dc2101b003c67cd2a0d0a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Fri Sep 22 12:51:33 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Fri Sep 22 12:51:33 2006 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (64 commits)\n [BLOCK] dm-crypt: trivial comment improvements\n [CRYPTO] api: Deprecate crypto_digest_* and crypto_alg_available\n [CRYPTO] padlock: Convert padlock-sha to use crypto_hash\n [CRYPTO] users: Use crypto_comp and crypto_has_*\n [CRYPTO] api: Add crypto_comp and crypto_has_*\n [CRYPTO] users: Use crypto_hash interface instead of crypto_digest\n [SCSI] iscsi: Use crypto_hash interface instead of crypto_digest\n [CRYPTO] digest: Remove old HMAC implementation\n [CRYPTO] doc: Update documentation for hash and me\n [SCTP]: Use HMAC template and hash interface\n [IPSEC]: Use HMAC template and hash interface\n [CRYPTO] tcrypt: Use HMAC template and hash interface\n [CRYPTO] hmac: Add crypto template implementation\n [CRYPTO] digest: Added user API for new hash type\n [CRYPTO] api: Mark parts of cipher interface as deprecated\n [PATCH] scatterlist: Add const to sg_set_buf/sg_init_one pointer argument\n [CRYPTO] drivers: Remove obsolete block cipher operations\n [CRYPTO] users: Use block ciphers where applicable\n [SUNRPC] GSS: Use block ciphers where applicable\n [IPSEC] ESP: Use block ciphers where applicable\n ...\n" }, { "commit": "14d1adfc59ba66932ef167fdff62983e7c2b0197", "tree": "34bad21bf4ec220be87fa5d79ff41dd98e7dad9f", "parents": [ "e478bec0ba0a83a48a0f6982934b6de079e7e6b3", "69917c26c840e7de94522bf90fb190de63bf92bd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Fri Sep 22 12:48:03 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Fri Sep 22 12:48:03 2006 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (114 commits)\n [POWERPC] Fix ohare IDE irq workaround on old powermacs\n [POWERPC] EEH: Power4 systems sometimes need multiple resets.\n [POWERPC] Include \u003casm/mmu.h\u003e in arch/powerpc/sysdev/fsl_soc.h for phys_addr_t.\n [POWERPC] Demacrofy arch/powerpc/platforms/maple/pci.c\n [POWERPC] Maple U3 HT - reject inappropriate config space access\n [POWERPC] Fix IPIC pending register assignments\n [POWERPC] powerpc: fix building gdb against asm/ptrace.h\n [POWERPC] Remove DISCONTIGMEM cruft from page.h\n [POWERPC] Merge iSeries i/o operations with the rest\n [POWERPC] 40x: Fix debug status register defines\n [POWERPC] Fix compile error in sbc8560\n [POWERPC] EEH: support MMIO enable recovery step\n [POWERPC] EEH: enable MMIO/DMA on frozen slot\n [POWERPC] EEH: code comment cleanup\n [POWERPC] EEH: balance pcidev_get/put calls\n [POWERPC] PPC: Fix xmon stack frame address in backtrace\n [POWERPC] Add AT_PLATFORM value for Xilinx Virtex-4 FX\n [POWERPC] Start arch/powerpc/boot code reorganization\n [POWERPC] Define of_read_ulong helper\n [POWERPC] iseries: eliminate a couple of warnings\n ...\n" }, { "commit": "fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b", "tree": "88f81d90021bd38b33622169103988f1e0a66510", "parents": [ "783c99f42e221217761e9c319838d5533107f7cb", "54caf44da31995df1f51174468fd9e83ca5c67a2" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Thu Sep 21 00:08:25 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Thu Sep 21 00:08:25 2006 -0400" }, "message": "Merge branch \u0027upstream-fixes\u0027 into upstream\n" }, { "commit": "54caf44da31995df1f51174468fd9e83ca5c67a2", "tree": "306a78de16850b17c81d86492ed088171addbc03", "parents": [ "8ce90907ea534f10075a9eba5f83d6dd77b39cb6" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Thu Sep 21 00:08:10 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Thu Sep 21 00:08:10 2006 -0400" }, "message": "[netdrvr] mv643xx_eth: fix obvious typo, which caused build breakage\n\nThe last minute fix submitted by the author fixed a bug, but\nbroke the driver build.\n\nNoticed by Al Viro, since I can\u0027t build on said platform.\n\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "8ce90907ea534f10075a9eba5f83d6dd77b39cb6", "tree": "f0afaf6ee678a2e6f3c9c1b2a76921e73257e0d9", "parents": [ "e478bec0ba0a83a48a0f6982934b6de079e7e6b3" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Thu Sep 21 00:06:21 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Thu Sep 21 00:06:21 2006 -0400" }, "message": "[netdrvr] lp486e: fix typo\n\ninside #if 0\u0027d code, but it bugged me.\n\nReally, we should probably just delete the driver.\n\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "e4d5b79c661c7cfca9d8d5afd040a295f128d3cb", "tree": "55a19ceca1b51b26d1934d388b26f0b1bed99a3e", "parents": [ "fce32d70ba834129b164c40c2d4260e5a7a7d850" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sat Aug 26 18:12:40 2006 +1000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Sep 21 11:46:22 2006 +1000" }, "message": "[CRYPTO] users: Use crypto_comp and crypto_has_*\n\nThis patch converts all users to use the new crypto_comp type and the\ncrypto_has_* functions.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "35058687912aa2f0b4554383cc10be4e0683b9a4", "tree": "3e18d13aef6682553887076c1e9872e91e6fc5c4", "parents": [ "dc64ddf4918f0da52df10d83c2a5941a547c2035" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Aug 24 19:10:20 2006 +1000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Sep 21 11:46:21 2006 +1000" }, "message": "[CRYPTO] users: Use crypto_hash interface instead of crypto_digest\n\nThis patch converts all remaining crypto_digest users to use the new\ncrypto_hash interface.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "f12cc2090d721647c23dfce20834f4306db3b77d", "tree": "fba6861bdb58153acaab1ba1e51ec4e48fe0fd99", "parents": [ "378c6697a282c383d89428380a3405bf95189347" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Aug 22 20:36:13 2006 +1000" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Sep 21 11:46:15 2006 +1000" }, "message": "[CRYPTO] users: Use block ciphers where applicable\n\nThis patch converts all remaining users to use the new block cipher type\nwhere applicable. It also changes all simple cipher operations to use\nthe new encrypt_one/decrypt_one interface.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "d81bf551103cc3bc9e4f7ddf337511d6da0d088f", "tree": "15ebe716d004a0fc10d3b92869eeec593a7bbf7d", "parents": [ "b39fe41f481d20c201012e4483e76c203802dda7" ], "author": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Wed Sep 20 21:31:20 2006 +0200" }, "committer": { "name": "Francois Romieu", "email": "romieu@electric-eye.fr.zoreil.com", "time": "Wed Sep 20 21:08:20 2006 +0200" }, "message": "r8169: the MMIO region of the 8167 stands behin BAR#1\n\nReported by Matt Bockol \u003cmbockol@carleton.edu\u003e to make\nits LOM (MSI 965 Neo) work.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\n" }, { "commit": "f8ec473387f70d103c83ffb3ab50cb2b1380d0c0", "tree": "8abcae6e3e7c4692519196c26dac4a82e65753b4", "parents": [ "23b6b0e3e8306ce3d00e0c87196bfaad335b9096" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 19 15:27:07 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 19 15:27:07 2006 -0400" }, "message": "e1000, ixgb: Remove pointless wrappers\n\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "8624a1c93772d24a38ed10cfcd290e8a18ac5b0a", "tree": "035dc21e3957540c8cdb817507f2377e07065a3b", "parents": [ "26d36b642e2f024019f94819284a11273807571d" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Tue Sep 19 11:54:49 2006 +1000" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 19 00:36:59 2006 -0400" }, "message": "[PATCH] Remove powerpc specific parts of 3c509 driver\n\nOn powerpc and ppc, insl_ns and insl are identical as are outsl_ns and\noutsl, so remove the conditional use of insl_ns and outsl_ns.\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "26d36b642e2f024019f94819284a11273807571d", "tree": "cce04aa045ad79dc63fcac3f4652d338218dc66a", "parents": [ "b921c3d8b64fe12948088be049785de49be50990" ], "author": { "name": "Alan Cox", "email": "alan@lxorguk.ukuu.org.uk", "time": "Fri Sep 15 15:22:51 2006 +0100" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 19 00:05:45 2006 -0400" }, "message": "[PATCH] s2io: Switch to pci_get_device\n\nWe want the pci devices ref counted against hotplug.\n\nSigned-off-by: Alan Cox \u003calan@redhat.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "b921c3d8b64fe12948088be049785de49be50990", "tree": "426619f6bd1d9636cdace998a63ec6885c53fa72", "parents": [ "53ccce2395cdc3693c22b9a94764b66dc1a4fcb4" ], "author": { "name": "Alan Cox", "email": "alan@lxorguk.ukuu.org.uk", "time": "Fri Sep 15 15:27:06 2006 +0100" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 19 00:05:45 2006 -0400" }, "message": "[PATCH] gt96100: move to pci_get_device API\n\nSigned-off-by: Alan Cox \u003calan@redhat.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "53ccce2395cdc3693c22b9a94764b66dc1a4fcb4", "tree": "91a884aafe61608be29dcdf8deba6810dd921bae", "parents": [ "72e8d6bbc151ca670c66d58a37e5bbfbc041db69" ], "author": { "name": "Jan-Bernd Themann", "email": "ossthema@de.ibm.com", "time": "Thu Sep 14 13:51:56 2006 +0200" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 19 00:05:45 2006 -0400" }, "message": "[PATCH] ehea: bugfix for register access functions\n\nHi Jeff,\n\nsorry to bother you again. We figured out that the readq function we\nincluded in the eHEA patch we sent yesterday to access eHEA registers\nis defined as little endian on POWER. This collides with our adapter.\nWe talked to some PPC people who told us there is a discussion going\non about new access functions. We were told to use __raw_readq /\n__raw_writeq for now.\n\nThis patch fixes this bug found by our internal tests today.\nPlease apply this small patch on the latest patch we sent you yesterday.\nIf it is easier for you I can also give you the entire eHEA patch again.\n\nsorry and thanks a lot,\nJan-Bernd\n\nSigned-off-by: Jan-Bernd Themann \u003cthemann@de.ibm.com\u003e\n\n drivers/net/ehea/ehea.h | 2 +-\n drivers/net/ehea/ehea_hw.h | 11 ++++++++---\n 2 files changed, 9 insertions(+), 4 deletions(-)\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "72e8d6bbc151ca670c66d58a37e5bbfbc041db69", "tree": "20546e26d6b09ba8e3e8421b8a8945e1006833a9", "parents": [ "f50e5ea14baa321c5f0ff71707a83b02bf5b9398" ], "author": { "name": "Linas Vepstas", "email": "linas@austin.ibm.com", "time": "Mon Sep 18 20:58:06 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 19 00:04:29 2006 -0400" }, "message": "[PATCH] e1000 disable device on PCI error\n\nA recent patch in -mm3 titled\n\"gregkh-pci-pci-don-t-enable-device-if-already-enabled.patch\" causes\npci_enable_device() to be a no-op if the kernel thinks that the device is\nalready enabled. This change breaks the PCI error recovery mechanism in\nthe e1000 device driver, since, after PCI slot reset, the card is no longer\nenabled. This is a trivial fix for this problem. Tested.\n\nSigned-off-by: Linas Vepstas \u003clinas@austin.ibm.com\u003e\nCc: John Ronciak \u003cjohn.ronciak@intel.com\u003e\nCc: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nCc: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nAcked-by: Auke Kok \u003cauke-jan.h.kok@intel.com\u003e\nCc: Jeff Garzik \u003cjeff@garzik.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "c547fc28ab3e8716076fdaf4bd0260c5d63a18f7", "tree": "34af1fa64a63618660187ae58ad182665a1861ef", "parents": [ "3dd836a56de0d4f049438412959b905e1db4666e", "63b98080daa35f0d682db04f4fb7ada010888752" ], "author": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Thu Sep 14 07:07:18 2006 +1000" }, "committer": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Thu Sep 14 07:07:18 2006 +1000" }, "message": "Merge branch \u0027linux-2.6\u0027\n" }, { "commit": "c233289c29369dba7177ca873e9b8ed457af2a78", "tree": "7dc73aa736c2a1164c887f203eff2b533220d11a", "parents": [ "7282d491ecaee9883233a0e27283c4c79486279a" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 13 14:33:12 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 13 14:33:12 2006 -0400" }, "message": "drivers/net/phy/fixed: #if 0 some incomplete code\n\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "7282d491ecaee9883233a0e27283c4c79486279a", "tree": "172ffa70716f5493db57976ceef7652120b3332f", "parents": [ "76fd85937097a0c2ec8ab23bf21dc10992d1c398" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 13 14:30:00 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 13 14:30:00 2006 -0400" }, "message": "drivers/net: const-ify ethtool_ops declarations\n\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "f65b138ca94326bbffe06ddc28e65606a249e58e", "tree": "8fb69b76b32fe10d07678e3721a68638841061ca", "parents": [ "b89165f2b75ba0a79eb5ed60924835cf3c54c51a" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@osdl.org", "time": "Wed Sep 06 12:45:02 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 13 13:27:44 2006 -0400" }, "message": "[PATCH] sky2: big endian\n\nFix support for big endian platforms like PPC.\nStill not sure about VLAN acceleration (does it need swapping)?\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@osdl.org\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "b89165f2b75ba0a79eb5ed60924835cf3c54c51a", "tree": "6ed4af3b2746c94416858753449f74310cb5407c", "parents": [ "2eaba1a280b6380f5b1238c53ce62e4381fc5f97" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@osdl.org", "time": "Wed Sep 06 12:44:53 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 13 13:27:44 2006 -0400" }, "message": "[PATCH] sky2: fiber support\n\nFix the support for fiber connected gigabit boards.\nAllow half duplex gigabit to be configured.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@osdl.org\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "2eaba1a280b6380f5b1238c53ce62e4381fc5f97", "tree": "4b161be011f0bb6adeea1c49c5fef5e84297e26d", "parents": [ "6aa20a2235535605db6d6d2bd850298b2fe7f31e" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@osdl.org", "time": "Wed Sep 06 12:44:47 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 13 13:27:44 2006 -0400" }, "message": "[PATCH] sky2: tx pause bug fix\n\nFix problems with transmit pause frames. The driver was telling the\nGMAC to flush (not process) pause frames. Manually disabling pause wasn\u0027t\nworking because of problems in the setup.\n\nThis maybe the cause of the lockup under load.\n\thttp://bugzilla.kernel.org/show_bug.cgi?id\u003d6839\n\nPatch against netdev-2.6 git tree\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@osdl.org\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "6aa20a2235535605db6d6d2bd850298b2fe7f31e", "tree": "df0b855043407b831d57f2f2c271f8aab48444f4", "parents": [ "7a291083225af6e22ffaa46b3d91cfc1a1ccaab4" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 13 13:24:59 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 13 13:24:59 2006 -0400" }, "message": "drivers/net: Trim trailing whitespace\n\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "7a291083225af6e22ffaa46b3d91cfc1a1ccaab4", "tree": "c87a93ee7d5c1c63ce98dc90a62cd0b4dfc4318f", "parents": [ "7de745e56244156233e5cdd62b462e52e638d408" ], "author": { "name": "Jan-Bernd Themann", "email": "ossthema@de.ibm.com", "time": "Wed Sep 13 17:44:31 2006 +0200" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 13 13:23:52 2006 -0400" }, "message": "[PATCH] ehea: IBM eHEA Ethernet Device Driver\n\nHi Jeff,\n\nI fixed the __iomem issue and tested the driver with sparse. Looks good so far.\nThanks for your effort.\n\nJan-Bernd Themann\n\nSigned-off-by: Jan-Bernd Themann \u003cthemann@de.ibm.com\u003e\n\n drivers/net/Kconfig | 9\n drivers/net/Makefile | 1\n drivers/net/ehea/Makefile | 6\n drivers/net/ehea/ehea.h | 447 ++++++\n drivers/net/ehea/ehea_ethtool.c | 294 ++++\n drivers/net/ehea/ehea_hcall.h | 51\n drivers/net/ehea/ehea_hw.h | 287 ++++\n drivers/net/ehea/ehea_main.c | 2654 ++++++++++++++++++++++++++++++++++++++++\n drivers/net/ehea/ehea_phyp.c | 705 ++++++++++\n drivers/net/ehea/ehea_phyp.h | 455 ++++++\n drivers/net/ehea/ehea_qmr.c | 582 ++++++++\n drivers/net/ehea/ehea_qmr.h | 358 +++++\n 12 files changed, 5849 insertions(+)\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "7de745e56244156233e5cdd62b462e52e638d408", "tree": "fbc0a3e546de813a5276c0c8a5454d46b1329fbc", "parents": [ "3904c324148930bad5d9b97fdf66c63e7682b546" ], "author": { "name": "Don Fry", "email": "brazilnut@us.ibm.com", "time": "Wed Sep 13 10:16:53 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 13 13:23:52 2006 -0400" }, "message": "[PATCH] pcnet32: NAPI implementation\n\nImplement NAPI changes to pcnet32 driver. Compile default is off.\nListed as experimental.\n\nLen and Don both worked on a NAPI implementation and have both tested\nthese changes.\n\nAn e1000 blasting short packets to the pcnet32 will lockup Don\u0027s system\nuntil the receive storm stops. Without NAPI Len\u0027s system watchdog would\nexpire causing the system to reboot. With NAPI the system will stay\noperational.\n\nTested ia32 and ppc64. Tested \u0027970A, \u0027971, \u0027972, \u0027973, \u0027975, \u0027976, and\n\u0027978.\n\nThe Kconfig changes came from Len. Don is to blame for all the others.\n\nSigned-off-by: Len Sorensen \u003clsorense@csclub.uwaterloo.ca\u003e\nSigned-off-by: Don Fry \u003cbrazilnut@us.ibm.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "3904c324148930bad5d9b97fdf66c63e7682b546", "tree": "92241080690303c39bd1f254906d71a6c214abd5", "parents": [ "9691edd26cfae0484367a6b8e3d46f3a5179e663" ], "author": { "name": "Don Fry", "email": "brazilnut@us.ibm.com", "time": "Wed Sep 13 10:16:38 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 13 13:23:52 2006 -0400" }, "message": "[PATCH] pcnet32: break receive routine into two pieces.\n\nBreaking the receive frame processing into two routines for greater clarity.\n\nTested ia32 and ppc64.\n\nSigned-off-by: Don Fry \u003cbrazilnut@us.ibm.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "9691edd26cfae0484367a6b8e3d46f3a5179e663", "tree": "86e57f62c87c37bac7a2f5036f2e6e6512ab5e3b", "parents": [ "b368a3fbe41c44e4c7eb628002bbd8891defa7e0" ], "author": { "name": "Don Fry", "email": "brazilnut@us.ibm.com", "time": "Wed Sep 13 10:16:21 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 13 13:23:52 2006 -0400" }, "message": "[PATCH] pcnet32: move/create receive and transmit routines\n\nMove the receive routine and create the transmit routine.\n\nTested ia32 and ppc64.\n\nSigned-off-by: Don Fry \u003cbrazilnut@us.ibm.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "b368a3fbe41c44e4c7eb628002bbd8891defa7e0", "tree": "d0836b4797a29732182009b28084144eb79a323f", "parents": [ "5c99346a3358a9c3c3fcf38669c05ac5f06832c9" ], "author": { "name": "Don Fry", "email": "brazilnut@us.ibm.com", "time": "Wed Sep 13 10:16:07 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 13 13:23:52 2006 -0400" }, "message": "[PATCH] pcnet32: magic number cleanup\n\nChange some magic numbers to clearer names. A few whitespace changes.\n\nTested ia32 and ppc64.\n\nSigned-off-by: Don Fry \u003cbrazilnut@us.ibm.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "5c99346a3358a9c3c3fcf38669c05ac5f06832c9", "tree": "548f8ef561cf81069b41a709f6241704f63d3405", "parents": [ "38ed61d6c0b2c35fbaa1ccdb497543a18509d401" ], "author": { "name": "Don Fry", "email": "brazilnut@us.ibm.com", "time": "Wed Sep 13 10:15:43 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 13 13:23:52 2006 -0400" }, "message": "[PATCH] pcnet32: remove unnecessary save/restore register accesses.\n\nDelete unnecessary save/restore of rap in interrupt handler and statistics.\n\ntested ia32 and ppc64.\n\nSigned-off-by: Don Fry \u003cbrazilnut@us.ibm.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "38ed61d6c0b2c35fbaa1ccdb497543a18509d401", "tree": "d7be64b244119ccfb346d3cea7124bbc2135603e", "parents": [ "4291130595065aa3c9fbb9130231f65e4914629a", "71d28725548be203e8b8f6ad63b1f64fd7f02d4d" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 13 12:26:12 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 13 12:26:12 2006 -0400" }, "message": "Merge branch \u0027upstream-fixes\u0027 into upstream\n" }, { "commit": "71d28725548be203e8b8f6ad63b1f64fd7f02d4d", "tree": "7246cf38c4c4b392b7c167026c1967c8ca45ddbc", "parents": [ "eff68d452f1a6842fb05218fd93c774ffc4dbc5a" ], "author": { "name": "Dale Farnsworth", "email": "dale@farnsworth.org", "time": "Wed Sep 13 09:21:08 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 13 12:26:03 2006 -0400" }, "message": "[PATCH] mv643xx_eth: Unmap DMA buffers in receive path\n\nFix a missing call to dma_unmap_single() in the receive path. Without\nthis call, errors have been observed on non-cache-coherent systems.\n\nSigned-off-by Dale Farnsworth \u003cdale@farnsworth.org\u003e\n\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "d3148ce9a65813a8020473739c200cb63036f84c", "tree": "96be330d1fd69cf19574b44c44e717e891ac2227", "parents": [ "2a69bf428e49c229f8b735ba3de0a91ebd5d7f33" ], "author": { "name": "Auke-Jan H Kok", "email": "auke-jan.h.kok@intel.com", "time": "Tue Sep 12 10:46:15 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 12 22:07:09 2006 -0400" }, "message": "[PATCH] e1000: revert \u0027e1000: Remove 0x1000 as supported device\u0027\n\nThe commit \u0027e1000: Remove 0x1000 as supported device\u0027 (Jeff Kirsher,\n673a052fde79ab5e9dce569b0336358812ddba2d) Removes PIC device ID 8086:1000\nfrom the list of supported devices. A fix was submitted for the original\nissue (commit 6a9516989f94df10d9a27ba543c6b53b3e69c84a).\n\nThis commit reverts commit 673a052fde79ab5e9dce569b0336358812ddba2d and\nre-enables 82542rev3 chips completely.\n\nSigned-off-by: Auke Kok \u003cauke-jan.h.kok@intel.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "2a69bf428e49c229f8b735ba3de0a91ebd5d7f33", "tree": "586eafa1a16f51d4b309ebe0c53f5befd8f88ad0", "parents": [ "cb930205c9dc26efedba5e93e6f84b98f36257e1", "b39fe41f481d20c201012e4483e76c203802dda7" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 12 22:03:36 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 12 22:03:36 2006 -0400" }, "message": "Merge tag \u0027r8169-20060912-00\u0027 of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into tmp\n" }, { "commit": "cb930205c9dc26efedba5e93e6f84b98f36257e1", "tree": "4a98f78a6a57d9f7c63c6b0aa7d9106f51e011a2", "parents": [ "435b70e65d7cecbcf2a7e9495ded9d179d63f3ba", "48907e39890590792c58272604cfb34ad1d80054" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 12 21:59:47 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 12 21:59:47 2006 -0400" }, "message": "Merge tag \u00278139cp-20060912-00\u0027 of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into tmp\n" }, { "commit": "48907e39890590792c58272604cfb34ad1d80054", "tree": "75cc0a74ef9c704b3cfe0745d4bde39b5db515fb", "parents": [ "cccb20d3a9b7c6d4b6e1b52ee02814e6094aaa12" ], "author": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sun Sep 10 23:33:44 2006 +0200" }, "committer": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Tue Sep 12 21:00:46 2006 +0200" }, "message": "8139cp: ring_info removal for the transmit path\n\nAs long as the descriptor fits on a single cacheline, the change\nshould be almost free.\n\nNow ring_info is not used at all. Remove it.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\n" }, { "commit": "435b70e65d7cecbcf2a7e9495ded9d179d63f3ba", "tree": "c501a17e7cb7dacff049e28b25ea5ee65a00bd06", "parents": [ "4e83b7fad8d3fd55828baa4510885c7362e66a26", "6a9516989f94df10d9a27ba543c6b53b3e69c84a" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 12 12:03:54 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 12 12:03:54 2006 -0400" }, "message": "Merge branch \u0027upstream-fixes\u0027 into upstream\n" }, { "commit": "6a9516989f94df10d9a27ba543c6b53b3e69c84a", "tree": "b476d50e8b8126181847fb00326a871489457964", "parents": [ "1802ca745280b916cda4090e459741b8c9b3e8d0" ], "author": { "name": "Auke Kok", "email": "auke-jan.h.kok@intel.com", "time": "Mon Sep 11 14:00:21 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 12 11:46:39 2006 -0400" }, "message": "[PATCH] e1000: fix TX timout hang regression for 82542rev3\n\nCommit 581d708eb47cccb5f41bc0817e50c9b004011ba8 (oct. 5 2005) introduced\npartial Multiqueue support for e1000 which broke macro smartness in setting\nup head/tail registers for 82542 rev3 chipsets, making these adapters\ncompletely non-working since 2.6.15.\n\nThis commit sets the proper head and tail registers for read and write\ndescriptor rings. Ths fix was tested on an 82542 rev3 NIC and newer NICs.\n\nSigned-off-by: Auke Kok \u003cauke-jan.h.kok@intel.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "4e83b7fad8d3fd55828baa4510885c7362e66a26", "tree": "eb3f28516c05a945f2e9c8003e5864de4e0763bc", "parents": [ "c925f1ea9ec20a95d46f57810f4a4d69db74580e", "d5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 12 11:45:33 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 12 11:45:33 2006 -0400" }, "message": "Merge branch \u0027tmp\u0027 into upstream\n" }, { "commit": "d5b20697ca37d80cc4ec2ba3c5ddf1339dc1d49a", "tree": "a5fa98145b1d95b84357157856517de8d0e31edf", "parents": [ "05ff0e291af086f4325bac76abad250690bbbd63" ], "author": { "name": "Andy Gospodarek", "email": "andy@greyhouse.net", "time": "Mon Sep 11 17:39:18 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 12 11:45:19 2006 -0400" }, "message": "[PATCH] Remove more unnecessary driver printk\u0027s\n\nAs I promised last week, here is the first pass at removing all\nunnecessary printk\u0027s that exist in network device drivers currently in\npromiscuous mode. The duplicate messages are not needed so they have\nbeen removed. Some of these drivers are quite old and might not need an\nupdate, but I did them all anyway.\n\nI am currently auditing the remaining conditional printk\u0027s and will send\nout a patch for those soon.\n\nSigned-off-by: Andy Gospodarek \u003candy@greyhouse.net\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "c925f1ea9ec20a95d46f57810f4a4d69db74580e", "tree": "150d09324f1cf6b231bbe1f3791a75f9169470dd", "parents": [ "8083e1656211eb1487329923d592ee061d08d7b3", "884d3a2bad7293e56fe99d9322a1090bfdfd7c4e" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 12 11:43:28 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 12 11:43:28 2006 -0400" }, "message": "Merge branch \u0027upstream\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream\n" }, { "commit": "8083e1656211eb1487329923d592ee061d08d7b3", "tree": "92a44787484996b82365fab21f2dec960ab4f2d3", "parents": [ "6b12a3d35ff6cb09f8b777ab258ea1e32c680d62", "1802ca745280b916cda4090e459741b8c9b3e8d0" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 12 11:42:45 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 12 11:42:45 2006 -0400" }, "message": "Merge branch \u0027upstream-fixes\u0027 into upstream\n" }, { "commit": "1802ca745280b916cda4090e459741b8c9b3e8d0", "tree": "eda781119a372cb05da7ba9dbbc44502ad222a01", "parents": [ "05ff0e291af086f4325bac76abad250690bbbd63", "db888aed7e83559d61cff04bf002d0fb80ecbfa7" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 12 11:42:33 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 12 11:42:33 2006 -0400" }, "message": "Merge branch \u0027upstream-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes\n" }, { "commit": "884d3a2bad7293e56fe99d9322a1090bfdfd7c4e", "tree": "26375b9205380f02fad6a877a7d3f5afa3260c14", "parents": [ "dca762d63a6fd62599f0d5d18525fa347fa1772a" ], "author": { "name": "Christian Steineck", "email": "Christian.Steineck@web.de", "time": "Fri Sep 08 23:51:34 2006 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 11 19:34:03 2006 -0400" }, "message": "[PATCH] hostap_cs: added support for Proxim Harmony PCI W-Lan card\n\nhostap_cs driver\n- added support for Proxim Harmony PCI W-Lan Card (uses pd6729 based\npcmcia2pci bridge)\n\nSigned-off-by: Christian Steineck \u003cmemphis@machzwo.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "dca762d63a6fd62599f0d5d18525fa347fa1772a", "tree": "1c619558db1a846fc318134caa4792d945e41cf1", "parents": [ "87d263271b1bbf344c596ac308417ff692ddc851" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Thu Sep 07 11:17:05 2006 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 11 19:34:03 2006 -0400" }, "message": "[PATCH] bcm43xx: remove dead code in bcm43xx_sysfs.c\n\nCoverity CID 1160 \u0026 1161\nRemove some dead code from bcm43xx_sysfs.c in 2.6.18-rc6\n\nSigned-off-by: Darren Jenkins \u003cdarrenrjenkins@gmail.com\u003e\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "87d263271b1bbf344c596ac308417ff692ddc851", "tree": "566f6b682e55f6ae68a73da17ee6e78f771035ef", "parents": [ "1ef4583ee3e1efab83d05b6ccdad378c9caaa95f" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Thu Sep 07 10:12:11 2006 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 11 19:34:02 2006 -0400" }, "message": "[PATCH] bcm43xx: ucode debug status via sysfs\n\nThis patch prints out the ucode debug status to sysfs. So, users can\nwatch the microcode status of their hardware.\n\nSigned-off-by: Martin Langer \u003cmartin-langer@gmx.de\u003e\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "1ef4583ee3e1efab83d05b6ccdad378c9caaa95f", "tree": "3a443ce3f33f020f0a1b89a9f9f0c5fe95caad14", "parents": [ "6807b5076373b8a6b6dac3b3b54645c85df91ad6" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Mon Sep 04 17:13:57 2006 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 11 19:34:02 2006 -0400" }, "message": "[PATCH] bcm43xx: Add firmware version printout\n\nThis patch prints microcode revision, patchlevel, date and time to\nKERN_INFO. Also, version 4.xx microcodes (rev\u003e0x128) will be rejected\nby the driver, because they still do not work.\n\nSigned-off-by: Martin Langer \u003cmartin-langer@gmx.de\u003e\nAcked-by: Michael Buesch \u003cmb@bu3sch.de\u003e\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "6807b5076373b8a6b6dac3b3b54645c85df91ad6", "tree": "4f8187d5fd0c0b8c60d6d927d5db94461c70ea3b", "parents": [ "bd6dd756522f3874b0efe576f9c25f5dee239646" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Sun Sep 03 23:38:56 2006 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 11 19:34:02 2006 -0400" }, "message": "[PATCH] bcm43xx: remove dead statistics code\n\nThis patch removes code that was make obsolete when the wireless\nstatistics in bcm43xx-softmac were changed, but was overlooked at that\ntime. The value of bcm-\u003estats.link_quality computed here is never used.\n\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "bd6dd756522f3874b0efe576f9c25f5dee239646", "tree": "f7fa278d1e4c850a77280bcc40ae1275c31c750c", "parents": [ "4e1bbd846d00a245dcf78b6b331d8a9afed8e6d7" ], "author": { "name": "Jean Tourrilhes", "email": "jt@hpl.hp.com", "time": "Tue Aug 29 18:19:23 2006 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 11 19:34:02 2006 -0400" }, "message": "[PATCH] Prism54 : add bitrates to scan result\n\nThis patch adds bitrate information to the scan result in the Prism54\ndriver, like some/most other driver do.\n\nSigned-off-by: Jean Tourrilhes \u003cjt@hpl.hp.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4e1bbd846d00a245dcf78b6b331d8a9afed8e6d7", "tree": "5eaca587cf00eef0f27a11a43220ffe602c25c4f", "parents": [ "fc3e39bef9ef5eb594ab2a35206b9b049c36320a" ], "author": { "name": "Ulrich Kunitz", "email": "kune@deine-taler.de", "time": "Tue Aug 29 23:51:43 2006 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 11 19:34:01 2006 -0400" }, "message": "[PATCH] zd1211rw: Removed unneeded packed attributes\n\nInspired by an e-mail by Stephen Hemminger I decided to remove all\nunneeded packed attributes from the code where the member variables are\nalready aligned. This avoids horrible code being generated on some\narchitectures.\n\nSigned-off-by: Ulrich Kunitz \u003ckune@deine-taler.de\u003e\nSigned-off-by: Daniel Drake \u003cdsd@gentoo.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "fc3e39bef9ef5eb594ab2a35206b9b049c36320a", "tree": "8fa1efe3a95eda2a004d9cbffaa99d9996b1ab64", "parents": [ "fca2714f27376caa04c3127c802a553b295eaa32" ], "author": { "name": "Daniel Drake", "email": "dsd@gentoo.org", "time": "Tue Aug 29 23:49:53 2006 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 11 19:34:01 2006 -0400" }, "message": "[PATCH] zd1211rw: Add ID for Asus WL-159g\n\nTested by Vincent TOUCHARD\n\nzd1211 chip 0b05:170c v4802 high 00-11-d8 AL2230_RF pa0 g---\n\nSigned-off-by: Daniel Drake \u003cdsd@gentoo.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "fca2714f27376caa04c3127c802a553b295eaa32", "tree": "6b6d86b5a641d744ccf367a4594afc3d362b4c04", "parents": [ "6aeb3dddb7c6697c083582a0757078e163758971" ], "author": { "name": "Daniel Drake", "email": "dsd@gentoo.org", "time": "Tue Aug 29 23:49:32 2006 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 11 19:34:01 2006 -0400" }, "message": "[PATCH] zd1211rw: Add ID for Siemens Gigaset USB Stick 54\n\nTested by Martin Dummer.\n\nzd1211 chip 0b3b:5630 v4330 high 00-01-e3 RF2959_RF pa0 ---\n\nSigned-off-by: Daniel Drake \u003cdsd@gentoo.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "6aeb3dddb7c6697c083582a0757078e163758971", "tree": "c032b0e362e1e142bcfa14c7f3988c62cef7902c", "parents": [ "7d4b0394bbf5e306ff9d5753163a07187131bfd8" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Mon Sep 11 16:46:26 2006 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 11 19:34:01 2006 -0400" }, "message": "[PATCH] bcm43xx: Correct out of sequence initialization step\n\nThis patch fixes an out of sequence step in the bcm43xx_init_board\nroutine for bcm43xx-softmac.\n\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "7d4b0394bbf5e306ff9d5753163a07187131bfd8", "tree": "24696862ca6df267b7c4d30feb240174c99d4237", "parents": [ "34fa0e319c760189f1fc226acc5b3b387dc58099" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Mon Aug 21 09:43:44 2006 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 11 19:34:00 2006 -0400" }, "message": "[PATCH] bcm43xx-softmac: Init, shutdown and restart fixes\n\nThis fixes various bugs in the init and shutdown code\nthat would lead to lockups and crashes.\n\nSigned-Off-By: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "34fa0e319c760189f1fc226acc5b3b387dc58099", "tree": "401ce21e352ce538abe25744da9c510a2339cd06", "parents": [ "623b3e1d645e42030897d18d37db10133d763006", "db888aed7e83559d61cff04bf002d0fb80ecbfa7" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 11 16:40:03 2006 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 11 16:40:03 2006 -0400" }, "message": "Merge branch \u0027upstream-fixes\u0027 into upstream\n" }, { "commit": "db888aed7e83559d61cff04bf002d0fb80ecbfa7", "tree": "4c8795f5924ce440ddc79cf0e2d7ae25d633d5ad", "parents": [ "38f5745c5a90641079fd5b48600ae63f7ab6edcd" ], "author": { "name": "Ulrich Kunitz", "email": "kune@deine-taler.de", "time": "Tue Aug 29 23:50:29 2006 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 11 16:11:08 2006 -0400" }, "message": "[PATCH] zd1211rw: Fix of signal strength and quality measurement\n\nCaused by a documentation issue I mixed up fields of the zd_status\nstructure. This patch fixes it and improves also the average\ncomputation, which is now using only measurements of packets sent\nby the access point.\n\nSigned-off-by: Ulrich Kunitz \u003ckune@deine-taler.de\u003e\nSigned-off-by: Daniel Drake \u003cdsd@gentoo.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "623b3e1d645e42030897d18d37db10133d763006", "tree": "090ff481cd72b47ff87d50615461712a33ba41e6", "parents": [ "c576af479162c0a11d4e2691ebc97354958d9285", "38f5745c5a90641079fd5b48600ae63f7ab6edcd" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 11 14:08:41 2006 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 11 14:08:41 2006 -0400" }, "message": "Merge branch \u0027from-linus\u0027 into upstream\n" }, { "commit": "b39fe41f481d20c201012e4483e76c203802dda7", "tree": "06493995b74c1fd2f40561b0f6924d3b863f166f", "parents": [ "d2eed8cff9a1a5d7e12ec9ddf71432c466b104d0" ], "author": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Mon Sep 11 20:10:58 2006 +0200" }, "committer": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Mon Sep 11 19:51:47 2006 +0200" }, "message": "r8169: quirk for the 8110sb on arm platform\n\nInverting the write ordering of the TxDescAddr{High/Low} registers\nsuffices to trigger a sabbat of PCI errors which make the device\ncompletely dysfunctional. The issue has not been reported on a\ndifferent platform.\n\nSwitching from MMIO accesses to I/O ones as done in Realtek\u0027s\nown driver fixes (papers over ?) the bug as well but I am not\nthrilled to see everyone pay the I/O price for an obscure bug.\n\nThis is the minimal change to handle the issue.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\nReported-by: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\n" }, { "commit": "6b12a3d35ff6cb09f8b777ab258ea1e32c680d62", "tree": "433a88c55ac4713e9d839a9589728ac4dd142afd", "parents": [ "0486a8c83b0f83c52c4d93accd841e08ccdf04dc", "519854876c66bd04b0c12d3cead6e0e5fc5a1167" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 11 09:14:17 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 11 09:14:17 2006 -0400" }, "message": "Merge branch \u0027upstream-fixes\u0027 into upstream\n" }, { "commit": "519854876c66bd04b0c12d3cead6e0e5fc5a1167", "tree": "a76da09513b838d6ccd41545ba6f5f9f328acf46", "parents": [ "38f5745c5a90641079fd5b48600ae63f7ab6edcd" ], "author": { "name": "Dirk Opfer", "email": "Dirk@Opfer-Online.de", "time": "Wed Sep 06 19:53:32 2006 +0200" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 11 09:08:38 2006 -0400" }, "message": "[PATCH] Fix dm9000 release_resource\n\ndm9000_release_board calls release_resource with the platform resource\ninstead of the requested resource:\n\ndb-\u003eaddr_res \u003d platform_get_resource(pdev, IORESOURCE_MEM, 0);\ndb-\u003eaddr_req \u003d request_mem_region(db-\u003eaddr_res-\u003estart, i, pdev-\u003ename);\n\ndm9000_release_board:\n\nif (db-\u003eaddr_res !\u003d NULL) {\nrelease_resource(db-\u003eaddr_res);\nkfree(db-\u003eaddr_req);\n\nWith this behavior the kernel will crash on the second removal. The\nattached patch fix this problem.\n\nSigned-off-by: Dirk Opfer \u003cDirk@Opfer-Online.de\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "0486a8c83b0f83c52c4d93accd841e08ccdf04dc", "tree": "793c5740cf6fd8a7bbad01e3b31fe122f81eb56b", "parents": [ "2a2fc64481ed48ef0952d03979b053d1e6ba89dc" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@osdl.org", "time": "Wed Sep 06 11:06:10 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 11 09:07:19 2006 -0400" }, "message": "[PATCH] skge: check for PCI hotplug during IRQ\n\nCheck if IRQ came from hardware fault (hotplug).\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@osdl.org\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "2a2fc64481ed48ef0952d03979b053d1e6ba89dc", "tree": "ba43d147d00fbd4bd68285ce869c98be13967bb4", "parents": [ "9f486ae1d9ea700a952b77a8881de05ebc1610c3" ], "author": { "name": "Andy Gospodarek", "email": "andy@greyhouse.net", "time": "Fri Sep 08 08:41:48 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 11 09:06:34 2006 -0400" }, "message": "[PATCH] cleanup unnecessary forcedeth printk\n\nThis removes unnecessary messages that show up every time I put my\nethernet card in promiscuous mode. I\u0027m already getting notification\nfrom the networking layer, I don\u0027t need notification from the driver as\nwell.\n\nThere are probably other drivers that do this as well -- I\u0027ll look\naround and see what I can find.\n\nSigned-off-by: Andy Gospodarek \u003candy@greyhouse.net\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "9f486ae1d9ea700a952b77a8881de05ebc1610c3", "tree": "702247e52d2d8ce81758aec6dd3362db52a3cd36", "parents": [ "42eab56776b7c9686ee39f8f677a3e3b09caa170" ], "author": { "name": "Valerie Henson", "email": "val_henson@linux.intel.com", "time": "Fri Sep 08 11:15:41 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 11 09:05:37 2006 -0400" }, "message": "[PATCH] Handle pci_enable_device() errors in resume\n\nSigned-off-by: Valerie Henson \u003cval_henson@linux.intel.com\u003e\nCc: Jeff Garzik \u003cjeff@garzik.org\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "42eab56776b7c9686ee39f8f677a3e3b09caa170", "tree": "79a4612538438a1c91d5aa1883a8115296a91540", "parents": [ "7f2b12482c86d69ed1804d239a52ea846ef294f2" ], "author": { "name": "Grant Grundler", "email": "grundler@parisc-linux.org", "time": "Fri Sep 08 11:15:40 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 11 09:05:37 2006 -0400" }, "message": "[PATCH] Use tulip.h in winbond-840.c\n\nInclude \"tulip.h\" in winbond-840.c and clean up lots of redundant\ndefinitions.\n\nSigned-off-by: Grant Grundler \u003cgrundler@parisc-linux.org\u003e\nSigned-off-by: Kyle McMartin \u003ckyle@parisc-linux.org\u003e\nSigned-off-by: Valerie Henson \u003cval_henson@linux.intel.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "7f2b12482c86d69ed1804d239a52ea846ef294f2", "tree": "5bcb8d6c4d9a90634595cf2d4e4a40302dab5e67", "parents": [ "0bb3cf726b37c13abce9f9134a68b94aa10e8803" ], "author": { "name": "Grant Grundler", "email": "grundler@parisc-linux.org", "time": "Fri Sep 08 11:15:39 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 11 09:05:37 2006 -0400" }, "message": "[PATCH] Clean up tulip.h\n\nUpdate/cleanup some definitions in tulip.h and tulip_core.c.\n\nSigned-off-by: Grant Grundler \u003cgrundler@parisc-linux.org\u003e\nSigned-off-by: Kyle McMartin \u003ckyle@parisc-linux.org\u003e\nSigned-off-by: Valerie Henson \u003cval_henson@linux.intel.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "0bb3cf726b37c13abce9f9134a68b94aa10e8803", "tree": "52a1fe8fdd08bdc088c1fb95957ecf5e698b8def", "parents": [ "40c0d87948ab635e814f45664259d4cc193651a1" ], "author": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Fri Sep 08 11:15:38 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 11 09:05:37 2006 -0400" }, "message": "[PATCH] Defer tulip_select_media() to process context\n\nMove tulip_select_media() processing to a workqueue, instead of\ndelaying in interrupt context, edited by Kyle McMartin to use kevent\nthread, instead of creating its own workqueue.\n\nSigned-off-by: Kyle McMartin \u003ckyle@parisc-linux.org\u003e\nSigned-off-by: Valerie Henson \u003cval_henson@linux.intel.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "40c0d87948ab635e814f45664259d4cc193651a1", "tree": "24c3c8e62eef0db500466540a7338d161c7ce5d7", "parents": [ "b892de0bd79d534ff4dcbae7aa2ad5b63e23e9fd" ], "author": { "name": "Grant Grundler", "email": "grundler@parisc-linux.org", "time": "Fri Sep 08 11:15:37 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 11 09:05:37 2006 -0400" }, "message": "[PATCH] Flush MMIO writes in reset sequence\n\nThe obvious safe registers to read is one from PCI config space.\n\nSigned-off-by: Grant Grundler \u003cgrundler@parisc-linux.org\u003e\nSigned-off-by: Kyle McMartin \u003ckyle@parisc-linux.org\u003e\nSigned-off-by: Valerie Henson \u003cval_henson@linux.intel.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "b892de0bd79d534ff4dcbae7aa2ad5b63e23e9fd", "tree": "45ac1f0e4457b2458583207128d646d19ae11222", "parents": [ "c69f412219855c9525c96052a65b60814531977c" ], "author": { "name": "Thibaut Varene", "email": "varenet@parisc-linux.org", "time": "Fri Sep 08 11:15:36 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 11 09:05:37 2006 -0400" }, "message": "[PATCH] Make DS21143 printout match lspci output\n\nSigned-off-by: Thibaut Varene \u003cvarenet@parisc-linux.org\u003e\nSigned-off-by: Kyle McMartin \u003ckyle@parisc-linux.org\u003e\nSigned-off-by: Valerie Henson \u003cval_henson@linux.intel.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "c69f412219855c9525c96052a65b60814531977c", "tree": "21df55a4cd4848276a9fec2eaebb88a863ba43af", "parents": [ "6b92801b43441f1f0280c332b966b75c74222060" ], "author": { "name": "Grant Grundler", "email": "grundler@parisc-linux.org", "time": "Fri Sep 08 11:15:35 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 11 09:05:37 2006 -0400" }, "message": "[PATCH] Print physical address in tulip_init_one\n\nAs the cookie returned by pci_iomap() is fairly useless...\n\n[Compile warning on pci_resource_start() format fixed up by Valerie\nHenson.]\n\nSigned-off-by: Grant Grundler \u003cgrundler@parisc-linux.org\u003e\nSigned-off-by: Kyle McMartin \u003ckyle@parisc-linux.org\u003e\nSigned-off-by: Valerie Henson \u003cval_henson@linux.intel.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "6b92801b43441f1f0280c332b966b75c74222060", "tree": "b506159eff5edb6a458f472eb08c4f7f75b0f410", "parents": [ "10e299fc6d596f4e8476d24ebba1495a8355baff" ], "author": { "name": "Valerie Henson", "email": "val_henson@linux.intel.com", "time": "Fri Sep 08 11:15:34 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 11 09:05:37 2006 -0400" }, "message": "[PATCH] Change tulip maintainer\n\nSigned-off-by: Valerie Henson \u003cval_henson@linux.intel.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n\n MAINTAINERS | 4 ++--\n drivers/net/tulip/21142.c | 2 +-\n drivers/net/tulip/eeprom.c | 2 +-\n drivers/net/tulip/interrupt.c | 2 +-\n drivers/net/tulip/media.c | 2 +-\n drivers/net/tulip/pnic.c | 2 +-\n drivers/net/tulip/pnic2.c | 2 +-\n drivers/net/tulip/timer.c | 2 +-\n drivers/net/tulip/tulip_core.c | 2 +-\n 9 files changed, 10 insertions(+), 10 deletions(-)\n" }, { "commit": "cff93eb3d3244cc117a5204fe1d62102b506afb9", "tree": "14aaadd17ffe8af8904546cc8911aca3918f3d17", "parents": [ "f6aa1693671fa9ea661fd30f003820d129fe0628" ], "author": { "name": "Adrian Bunk", "email": "bunk@stusta.de", "time": "Mon Sep 04 13:41:14 2006 +0200" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 06 12:52:52 2006 -0400" }, "message": "[PATCH] make drivers/net/e1000/e1000_hw.c:e1000_phy_igp_get_info() static\n\nThis patch makes the needlessly global e1000_phy_igp_get_info() static.\n\nSigned-off-by: Adrian Bunk \u003cbunk@stusta.de\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "f6aa1693671fa9ea661fd30f003820d129fe0628", "tree": "f17e223a4b80c22e82c2a8543806aebad4e6e77c", "parents": [ "513f533e3f161c5a59555677d35e8ae28037bd89" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@osdl.org", "time": "Fri Sep 01 15:53:50 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 06 11:19:23 2006 -0400" }, "message": "[PATCH] skge: version 1.8\n\nBecause of the NAPI and other SMP fixes, let\u0027s call\nthis a version.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@osdl.org\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "513f533e3f161c5a59555677d35e8ae28037bd89", "tree": "84d8d7355f8c14f3abd57e8e313ce39ed09e3d05", "parents": [ "29365c900963d4986b74a0dadea46872bf283d76" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@osdl.org", "time": "Fri Sep 01 15:53:49 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 06 11:19:23 2006 -0400" }, "message": "[PATCH] skge: use NAPI for transmit complete\n\nThe skge driver has much better performance if transmit done is handled in\nNAPI softirq. Change from doing transmit locking in driver (LLTX) and\nuse device lock.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@osdl.org\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "29365c900963d4986b74a0dadea46872bf283d76", "tree": "d896de1c7306f0f03c9781cb054bbcd5cf0a9817", "parents": [ "c54f9765daafe8493dba837b3d70e97432cd876a" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@osdl.org", "time": "Fri Sep 01 15:53:48 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 06 11:19:23 2006 -0400" }, "message": "[PATCH] skge: irq lock race\n\nThe driver needs to access the IRQ status inside of lock to avoid\nraces with other places changing IRQ mask etc. This may be related\nto some of the SMP bugs reported against skge in kernel bugzilla.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@osdl.org\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "c54f9765daafe8493dba837b3d70e97432cd876a", "tree": "5933a42766864a3117611ec1c999758e9f8a2f38", "parents": [ "2f4a66ad49097f0b0207a141aa2115ed352fbf58" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@osdl.org", "time": "Fri Sep 01 15:53:47 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 06 11:19:22 2006 -0400" }, "message": "[PATCH] skge: use netdev_alloc_skb\n\nChange to use new netdev_alloc_skb interface for 2.6.18.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@osdl.org\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "2f4a66ad49097f0b0207a141aa2115ed352fbf58", "tree": "4909c72aa86e53ce17458cc3347e3682b769aefb", "parents": [ "ce7f93680aa1d37171c654536ae0ce9745d86a24" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@osdl.org", "time": "Fri Sep 01 14:52:04 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 06 11:10:50 2006 -0400" }, "message": "[PATCH] sky2: more pci device id\u0027s\n\nSome more Marvell device id\u0027s, these are from the latest SysKonnect\nvendor driver version of sk98lin (8.36).\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@osdl.org\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "ce7f93680aa1d37171c654536ae0ce9745d86a24", "tree": "7c88e6ebafbcdf5c0a89feb82b572a5ea4e6d000", "parents": [ "b4d01327e4c05ab555a4cf38a33f4b4fa2f75e64" ], "author": { "name": "Brice Goglin", "email": "brice@myri.com", "time": "Thu Aug 31 01:32:59 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 06 11:06:46 2006 -0400" }, "message": "[PATCH] myri10ge: improve firmware selection\n\nImprove the firmware selection by adding 2 cases where we should use the\noptimized firmware:\n* when the actual PCIe link width is lower than 8x.\n* when the board is plugged to one of the new Intel PCIe chipsets that\n are known to provide aligned PCIe completions.\n\nThe patch actually raises two concerns:\n* We might want to add a generic PCI function to get the PCIe link width since\n some other drivers (at least ipath) do the same. But we probably do not want\n to add a new function for every PCIe capability. I will probably look at it\n and discuss it on linux-pci in the future.\n* As requested during the submission, the PCI ids of chipsets that are known to\n provided aligned completion are defined in the myri10ge code. If we keep adding\n new ones, it might become better to move them to pciids.h.\n But, this sort of quirk to detect these chipsets are very specific to our NIC,\n I don\u0027t think it is worth moving it to the PCI core until somebody else really\n needs it.\n\nSigned-off-by: Brice Goglin \u003cbrice@myri.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "b4d01327e4c05ab555a4cf38a33f4b4fa2f75e64", "tree": "f683950f737fea82e55153209ef34a4089285abc", "parents": [ "a2413598b8c5f14d75f914ce95d72bacdeabd05e", "d279490543ee4e7c51371eb605b578ab47f45305" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 06 11:06:44 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 06 11:06:44 2006 -0400" }, "message": "Merge branch \u0027upstream-fixes\u0027 into upstream\n" }, { "commit": "d279490543ee4e7c51371eb605b578ab47f45305", "tree": "45217be4f3e2b6938d7b330cda6eb0a9a2cedf12", "parents": [ "c336923b668fdcf0312efbec3b44895d713f4d81" ], "author": { "name": "Brice Goglin", "email": "brice@myri.com", "time": "Tue Sep 05 21:58:50 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 06 11:04:26 2006 -0400" }, "message": "[PATCH] myri10ge: update the firmware download URL in Kconfig\n\nUpdate the firmware download URL in Kconfig to match the header\nin drivers/net/myri10ge/myri10ge.c.\n\nSigned-off-by: Brice Goglin \u003cbrice@myri.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "a2413598b8c5f14d75f914ce95d72bacdeabd05e", "tree": "35e1340b05b295dbefefaa45424e00a55c28402e", "parents": [ "f2ad2d9b65963322186a8af2bd2965c734a7badb", "c576af479162c0a11d4e2691ebc97354958d9285" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 06 11:02:22 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 06 11:02:22 2006 -0400" }, "message": "Merge branch \u0027upstream\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream\n" }, { "commit": "f2ad2d9b65963322186a8af2bd2965c734a7badb", "tree": "3bac0275d80a590b0254650b6a36e018dcf73b0a", "parents": [ "edf7e5ec99c2e24cea3951f7961958fc7edbfdd1" ], "author": { "name": "Ayaz Abdulla", "email": "aabdulla@nvidia.com", "time": "Thu Aug 24 17:35:41 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 06 10:57:37 2006 -0400" }, "message": "[PATCH] forcedeth: decouple vlan and rx checksum dependency\n\nThis patch decouples the dependency between the rx checksum feature and\nvlan feature. This is done by ignoring the checksum information if the\nuser has disabled rx checksum when vlan is enabled.\n\nSigned-Off-By: Ayaz Abdulla \u003caabdulla@nvidia.com\u003e\n\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "edf7e5ec99c2e24cea3951f7961958fc7edbfdd1", "tree": "1862fb28066e7f8728f7bc325349e1efc5885ab6", "parents": [ "3784fd7316d336f2ba79b6c7c8168d08eff8a714" ], "author": { "name": "Ayaz Abdulla", "email": "aabdulla@nvidia.com", "time": "Thu Aug 24 15:43:42 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Sep 06 10:57:37 2006 -0400" }, "message": "[PATCH] forcedeth: errata for marvell phys\n\nThis patch addresses an errata found on certain marvell phys concerning\nthe reset of the BMCR phy register during phy reset.\n\nSigned-Off-By: Ayaz Abdulla \u003caabdulla@nvidia.com\u003e\n\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "3784fd7316d336f2ba79b6c7c8168d08eff8a714", "tree": "3019c37f1ba588f252d1a9f1ef33beb5d3d683b1", "parents": [ "7c440e7990ea22c0c374c59a5fbd79b0579d1517", "c336923b668fdcf0312efbec3b44895d713f4d81" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 04 06:29:54 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 04 06:29:54 2006 -0400" }, "message": "Merge branch \u0027master\u0027 into upstream\n" }, { "commit": "7c440e7990ea22c0c374c59a5fbd79b0579d1517", "tree": "4fa6513ee2740479bf9c2796a3911eefa485572b", "parents": [ "a422142cfdf90d889d8d3e2affb8311a381530b7", "9ee093f653bae98cb56b0669819d4bccb8c05fa4" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Thu Aug 31 17:39:21 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Thu Aug 31 17:39:21 2006 -0400" }, "message": "Merge branch \u0027upstream\u0027 of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream\n" }, { "commit": "9ee093f653bae98cb56b0669819d4bccb8c05fa4", "tree": "a04608635a3f16ab2fe5b6d06f481e34e7ff9c24", "parents": [ "69c7a940335371cf31a6589bf2b2ad1d197ef6ec" ], "author": { "name": "Auke Kok", "email": "auke\\-jan.h.kok@intel.com", "time": "Thu Aug 31 14:27:53 2006 -0700" }, "committer": { "name": "Auke Kok", "email": "juke-jan.h.kok@intel.com", "time": "Thu Aug 31 14:27:53 2006 -0700" }, "message": "ixgb: Increment version to 1.0.112-k2\n\nSigned-off-by: Auke Kok \u003cauke-jan.h.kok@intel.com\u003e\n" } ], "next": "69c7a940335371cf31a6589bf2b2ad1d197ef6ec" }