)]}'
{
  "log": [
    {
      "commit": "f9dcbcc9e338d08c0f7de7eba4eaafbbb7f81249",
      "tree": "8a1d9a37bc057440220a5ad23231e0fe974b93f6",
      "parents": [
        "52c793f24054f5dc30d228e37e0e19cc8313f086"
      ],
      "author": {
        "name": "Jiri Pirko",
        "email": "jpirko@redhat.com",
        "time": "Tue Feb 23 09:19:49 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Feb 26 02:07:30 2010 -0800"
      },
      "message": "net: convert multiple drivers to use netdev_for_each_mc_addr, part5 V2\n\nremoved some needless checks and also corrected bug in lp486e (dmi was passed\ninstead of dmi-\u003edmi_addr)\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5",
      "tree": "99f57f6374a58022e1e5ed1cbc12699288c7eae1",
      "parents": [
        "8e5574211d96c0552f84c757718475fdb4021be7"
      ],
      "author": {
        "name": "Jiri Pirko",
        "email": "jpirko@redhat.com",
        "time": "Mon Feb 08 04:30:35 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Feb 12 11:38:58 2010 -0800"
      },
      "message": "net: use netdev_mc_count and netdev_mc_empty when appropriate\n\nThis patch replaces dev-\u003emc_count in all drivers (hopefully I didn\u0027t miss\nanything). Used spatch and did small tweaks and conding style changes when\nit was suitable.\n\nJirka\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "9c119ba54c0fcae72881948af3d37b47a2f8e1f9",
      "tree": "0be51b0bf02ece3bb32955e9d33a3998ecd57250",
      "parents": [
        "a4b97f2054af2e411c414ed4cb5e1d0dbfd24a47",
        "fdd3d631cddad20ad9d3e1eb7dbf26825a8a121f"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Feb 03 19:38:22 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Feb 03 19:38:22 2010 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n"
    },
    {
      "commit": "e15eec2805565c7e31dbe402215637012f1e4616",
      "tree": "82ba2e31d52bf5e6ee5c0d56834fe23f6d5734d0",
      "parents": [
        "41f3e0b1f524c47908e944a7e55f11c371ddddec"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Tue Feb 02 04:16:21 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Feb 03 19:15:24 2010 -0800"
      },
      "message": "netxen: protect resource cleanup by rtnl lock\n\no context resources can be in used, while resource cleanup is in progress,\n  during fw recover.\no Null pointer execption can occur in send_cmd_desc, if fw recovery\n  module frees tx ring without rtnl lock.\no Same applies to ethtool register dump.\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "41f3e0b1f524c47908e944a7e55f11c371ddddec",
      "tree": "276c48bad87290f4e9839fbfbe07b0eb8b06b983",
      "parents": [
        "1386be55e32a3c5d8ef4a2b243c530a7b664c02c"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Tue Feb 02 04:16:20 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Feb 03 19:15:24 2010 -0800"
      },
      "message": "netxen: fix tx timeout recovery for NX2031 chip\n\nFor NX2031, first try to scrub interrupt before requesting firmware\nreset. Return statement was missing after scrubbbing interrupt.\n\nSigned-off-by: Vernon Mauery \u003cvernux@us.ibm.com\u003e\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "1954dc11776ef8c06263ba4cd21bf4d25c79a19c",
      "tree": "6d1d111c41be1df332c48e221f3c47eab47e0805",
      "parents": [
        "4d21fef426c5cbbdf6da607de4c0adcaa3d4bbb0"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Thu Jan 14 01:53:24 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Jan 15 01:37:25 2010 -0800"
      },
      "message": "netxen: fix sparse warning\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "4d21fef426c5cbbdf6da607de4c0adcaa3d4bbb0",
      "tree": "91ae7cd33cdf522605990c1c2abc7fac3093dd16",
      "parents": [
        "c070395009e1e153395837cd256dffc931dd6f98"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Thu Jan 14 01:53:23 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Jan 15 01:37:25 2010 -0800"
      },
      "message": "netxen: fix license header\n\nGNU General Public License is in file \"COPYING\".\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "c070395009e1e153395837cd256dffc931dd6f98",
      "tree": "7eca4f766bfce736c78dd5d6129855e345111b98",
      "parents": [
        "a03d2451998e09e87eb573a9e04cc41fde2bb77f"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Thu Jan 14 01:53:22 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Jan 15 01:37:24 2010 -0800"
      },
      "message": "netxen: fix endianness intr coalesce\n\nBefore sending Interrupt coalesce parameters to device,\nconvert them in little endian.\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "a03d2451998e09e87eb573a9e04cc41fde2bb77f",
      "tree": "21effa30f462f81749120fa05215432b52824303",
      "parents": [
        "71fceff0ea36d5a6cffecb272b8b3970535fe905"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Thu Jan 14 01:53:21 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Jan 15 01:37:24 2010 -0800"
      },
      "message": "netxen: fix endianness read mac address\n\nIn netxen_read_mac_addr, mac_addr should be declared\nu64 instead of __le64, used by host only.\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "d4a66e752d0b19934dd208884f8605fe385aaaa9",
      "tree": "72fb727be1d7636aae9cddfe9aa93ac9dec75daf",
      "parents": [
        "bdbec4b86ee99b020e159f9bd604003a3ae3b0ab",
        "fa15e99b6bb44aa86b241a43ca8c509e91f80153"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Jan 10 22:55:03 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Jan 10 22:55:03 2010 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/benet/be_cmds.h\n\tinclude/linux/sysctl.h\n"
    },
    {
      "commit": "c651a8c160647b2eb6e61fb485f307e3781415e8",
      "tree": "a5f26f72a32f3004d69caf557d94fdd3fbb8fc80",
      "parents": [
        "d49c9640975355c79f346869831bf9780d185de0"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Thu Jan 07 22:10:17 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Jan 08 00:35:28 2010 -0800"
      },
      "message": "netxen: update version to 4.0.72\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "d49c9640975355c79f346869831bf9780d185de0",
      "tree": "b0eb8f464e2369494dd57f4535b3ad5dc9106cd1",
      "parents": [
        "581e8ae49ea3a70b438991e388ded2dcbdbd2162"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Thu Jan 07 22:10:16 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Jan 08 00:35:28 2010 -0800"
      },
      "message": "netxen: fix set mac addr\n\no If tx and rx resources are not available, during set mac request.\n  Then this request wont be passed to firmware and it will be added to\n  driver mac list and will never make it to firmware.\n  So if resources are not available, don\u0027t add it to driver mac list.\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "581e8ae49ea3a70b438991e388ded2dcbdbd2162",
      "tree": "7fcf1acc5f67548f8cda89d535734c53c1128e1f",
      "parents": [
        "011f4ea09768fdf6f95e3781cba2ed681a2ac710"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Thu Jan 07 22:10:15 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Jan 08 00:35:27 2010 -0800"
      },
      "message": "netxen: fix smatch warning\n\no Fix pointless assignments\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "011f4ea09768fdf6f95e3781cba2ed681a2ac710",
      "tree": "b21804d01315379dcb9b8d6e9181c93728953441",
      "parents": [
        "704da560c0a0120d8869187f511491a00951a1d3"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Thu Jan 07 22:10:14 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Jan 08 00:35:27 2010 -0800"
      },
      "message": "netxen: fix tx ring memory leak\n\no While unloading driver or resetting the context, tx ring was not\n  getting free.\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "a3aa18842a5303fc28fcc4d57dbd16618bd830a0",
      "tree": "9214348bd1e57ad0a3701314be60adf19dfef702",
      "parents": [
        "108316c1bd0a75ba855ce4a6540c530e1562bfb0"
      ],
      "author": {
        "name": "Alexey Dobriyan",
        "email": "adobriyan@gmail.com",
        "time": "Thu Jan 07 11:58:11 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Jan 07 23:54:26 2010 -0800"
      },
      "message": "drivers/net/: use DEFINE_PCI_DEVICE_TABLE()\n\nUse DEFINE_PCI_DEVICE_TABLE() so we get place PCI ids table into correct section\nin every case.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "a4b751d87241c1b49ce43f819428223bfc22dc27",
      "tree": "53c92cf7799c68a8cb810aa3c4803a910f3da7e8",
      "parents": [
        "2d2cf34681e65a2495946ebc90b407ba4088e8d0"
      ],
      "author": {
        "name": "Sucheta Chakraborty",
        "email": "sucheta.chakraborty@qlogic.com",
        "time": "Sat Jan 02 03:25:19 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Jan 03 22:06:16 2010 -0800"
      },
      "message": "netxen: fix ethtool link test\n\no Fix ethtool link test for NX3031 chip.\no Remove unused code from phy interrupt callback\n\nSigned-off-by: Sucheta Chakraborty \u003csucheta.chakraborty@qlogic.com\u003e\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "2d2cf34681e65a2495946ebc90b407ba4088e8d0",
      "tree": "bacb358875bdb753e680f011f6325b5c260d275a",
      "parents": [
        "2585e7e5e1fcf64fd2b2cac0bc1f1b609eabe96a"
      ],
      "author": {
        "name": "Sucheta Chakraborty",
        "email": "sucheta.chakraborty@qlogic.com",
        "time": "Sat Jan 02 03:25:18 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Jan 03 22:06:16 2010 -0800"
      },
      "message": "netxen: fix ethtool register dump\n\no Dump registers such as tx ring and rx ring counter, firmware state,\n  niu regs, etc. which can be useful for debugging purpose.\n\nSigned-off-by: Sucheta Chakraborty \u003csucheta.chakraborty@qlogic.com\u003e\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "7ef8a2127a64d131c4dbe5b843e5708f6e75552b",
      "tree": "06a9084c46b6b4a3ed0d19360b5c45555cc1db19",
      "parents": [
        "e87ad5539343366e7c634c940a930157b6fa2aae"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Tue Dec 08 20:40:57 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Dec 23 14:13:27 2009 -0800"
      },
      "message": "netxen: fix unified fw size check\n\no Unified firmware image size can be \u003c 1 MB\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "e87ad5539343366e7c634c940a930157b6fa2aae",
      "tree": "53eacf4e7a62498e76463adafd0e43f4808d188d",
      "parents": [
        "6a808c6c02fb9f0ffa24ac7cca6cfc323cf98b21"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Tue Dec 08 20:40:56 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Dec 23 14:13:27 2009 -0800"
      },
      "message": "netxen: support pci error handlers\n\no Support pci error detection and recovery.\no Refactor suspend and resume code, to share with io_error_detected,\n  and slot_reset callbacks\no NX_NEED_AER device state added, to synchronize with firmware\n  recovery.\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "6a808c6c02fb9f0ffa24ac7cca6cfc323cf98b21",
      "tree": "8a9a6b881912a55568cc3b6839ee9a42449d0a23",
      "parents": [
        "bc86fcbac0a86a93ee65cc31769c4e83e6ff2295"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Tue Dec 08 20:40:55 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Dec 23 14:13:26 2009 -0800"
      },
      "message": "netxen: fix tx timeout recovery\n\no In case of tx timeout, firmare may be healthy, but some pci-func may\n  see no response from it. Force firmware reset, if some pci-func\n  explicitly requests so.\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "bc86fcbac0a86a93ee65cc31769c4e83e6ff2295",
      "tree": "8be1785bdebded3c125af8797a4e7dd0d9d9d39a",
      "parents": [
        "b4de921ae6f7bb211868be4f7d56e80ac6da676c"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Tue Dec 08 20:40:54 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Dec 23 14:13:26 2009 -0800"
      },
      "message": "netxen: minor suspend resume fixes\n\no pci device should be disable at the end and it should be enable first.\no Interface should be attached(netif_device_attach()) irrespective\n  of its state.\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "afdafff130142ef4d6478dcff6d9e879394fd348",
      "tree": "6acaaf4a7de181bad471100960515c7f842cfc40",
      "parents": [
        "9c69fabe789b0eb468a0c7031ae7bb850760aea8"
      ],
      "author": {
        "name": "Stephen Hemminger",
        "email": "shemminger@vyatta.com",
        "time": "Fri Dec 18 20:13:35 2009 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Dec 18 20:13:35 2009 -0800"
      },
      "message": "netxen: use module parameter correctly\n\nNetxen driver is doing this bogus thing to create a control file.\nThis fails if device doesn\u0027t exist, and overall is a bad way to do\nthe module parameter. Rather than fix borked code, just rewrite.\nJust using a writeable module parameter of 0/1 is the correct way\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "634d7df89a93a52561f598bf9512f4cf72946954",
      "tree": "45c9dcfb4ef96f076997db0e14068b2d76507e3e",
      "parents": [
        "f2251f668e9527b87c9ba7256e7497cb49abbc20"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Sat Dec 05 12:23:56 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Dec 08 20:37:46 2009 -0800"
      },
      "message": "netxen: fix firmware type check\n\nUnified firmware image may not contain MN type of firmware.\nDriver should fall back to NOMN firmware type instead\nof going to flash.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "f2251f668e9527b87c9ba7256e7497cb49abbc20",
      "tree": "bd0bc74ed3490b817f0fc9f5336867d202d5af90",
      "parents": [
        "6f7714196b4e01d7462df31d705c3ca53ecbdfc1"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Sat Dec 05 12:23:55 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Dec 08 20:37:45 2009 -0800"
      },
      "message": "netxen:fix napi intr enable check\n\no netif_running() check for enabling interrupt at end of napi poll is\n  not enough to cover firmwar recovery. Instead test __NX_DEV_UP bit.\no Avoid re-entry into to netxen_nic_down() with __NX_DEV_UP bit check.\n\nAcked-by: Dhananjay Phadke \u003cdhananjay.phadke@qlogic.com\u003e\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "6f7714196b4e01d7462df31d705c3ca53ecbdfc1",
      "tree": "54dc8ba18ba5d1db10eaa5f79b6a002a9b9acdfb",
      "parents": [
        "a29ec08a1b649436248c140a3bc389bc11434c94"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Sat Dec 05 12:23:54 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Dec 08 20:37:45 2009 -0800"
      },
      "message": "netxen: protect device reset by rtnl_lock\n\no To prevent race conditions with other reset events.\n  During suspend/resume and firmware recovery, acquire rtnl_lock,\n  while changing interface state.\n\nAcked-by: Dhananjay Phadke \u003cdhananjay.phadke@qlogic.com\u003e\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "8e95a2026f3b43f7c3d676adaccd2de9532e8dcc",
      "tree": "3733318168cd512480b6db58c5c16d1c8847f0b7",
      "parents": [
        "3454f835837609d60b29a266e3bd9d701073b060"
      ],
      "author": {
        "name": "Joe Perches",
        "email": "joe@perches.com",
        "time": "Thu Dec 03 07:58:21 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Dec 03 13:18:01 2009 -0800"
      },
      "message": "drivers/net: Move \u0026\u0026 and || to end of previous line\n\nOnly files where David Miller is the primary git-signer.\nwireless, wimax, ixgbe, etc are not modified.\n\nCompile tested x86 allyesconfig only\nNot all files compiled (not x86 compatible)\n\nAdded a few \u003e 80 column lines, which I ignored.\nExisting checkpatch complaints ignored.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "8f9b3f69944ab7eacb9273b4723087c42b5f4046",
      "tree": "b824149cb41ac31a5532e140e06c2dd77a266793",
      "parents": [
        "f58dbd7320e148b25cc0088ef37f524c99c6790f"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit@unm84.unmin.com",
        "time": "Wed Dec 02 15:46:19 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Dec 02 19:57:18 2009 -0800"
      },
      "message": "netxen: fix failure cases for fw hang recovery\n\nHandle few corner cases in firmware hang detection and recovery:\n\no Don\u0027t mark device state as READY, till handshake with\n  firmware is done.\no During probe, if start_firmware fails, restore reference\n  count.\no Don\u0027t increment refernce count, if start_firmware fails\n  during firmware reset.\no Clear __NX_RESETTING bit, incase of fatal error or tempeature\n  reaches critical limit so that pci remove() doesn\u0027t poll on\n  this bit.\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "f58dbd7320e148b25cc0088ef37f524c99c6790f",
      "tree": "9396794ba9af5c37b18911d79694762ff9ce6b26",
      "parents": [
        "0be8401051c716be4533272e983b7eed3d83946d"
      ],
      "author": {
        "name": "Narender Kumar",
        "email": "narender.kumar@qlogic.com",
        "time": "Wed Dec 02 15:46:18 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Dec 02 19:57:18 2009 -0800"
      },
      "message": "netxen : fix debug tools access for NX2031\n\nDriver maps only some part of the MMIO bar 0 in case of\nNX2031. This is sufficient for tx and rx by the driver.\nWhen debug tools need to access resources in\nunmapped regions, driver needs to map these on the fly\nin order to complete read/write request.\n\nSigned-off-by: Narender Kumar \u003cnarender.kumar@qlogic.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay.phadke@qlogic.com\u003e\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "e7473f12be7712aafe6df163222f26caadee1175",
      "tree": "bb7b1aec356b3f7120ee5a044b087ae471e0be92",
      "parents": [
        "906bb26c0624d87df74e6642f2d74cde176fcc12"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Sun Nov 29 21:54:55 2009 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Nov 29 21:54:55 2009 -0800"
      },
      "message": "netxen: fix merge 9b963e5d0e01461099a\n\nPatch \"fix memory initialization:5d521fd36de4e61\" didn\u0027t got merge.\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "9b963e5d0e01461099a40117b05480f24b63381f",
      "tree": "4756d554e37bf4ab7202f2c564cbe629af98b576",
      "parents": [
        "3b8626ba01a8a745a3fdf22dd347edd708b0af13",
        "5fdd4baef6195a1f2960e901c8877e2105f832ca"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Nov 29 00:57:15 2009 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Nov 29 00:57:15 2009 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/ieee802154/fakehard.c\n\tdrivers/net/e1000e/ich8lan.c\n\tdrivers/net/e1000e/phy.c\n\tdrivers/net/netxen/netxen_nic_init.c\n\tdrivers/net/wireless/ath/ath9k/main.c\n"
    },
    {
      "commit": "5d09e534bbb94e1fdc8e4783ac822bc172465a91",
      "tree": "c7096c8b0d87dbad2d05d8d0d4362c52b681e6c0",
      "parents": [
        "a7483b0afa63e851c4438ddda8934a296851f1de"
      ],
      "author": {
        "name": "Narender Kumar",
        "email": "narender.kumar@qlogic.com",
        "time": "Fri Nov 20 22:08:57 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Nov 21 11:37:37 2009 -0800"
      },
      "message": "netxen : fix BOND_MODE_TLB/ALB mode.\n\no Along with netdev-\u003eperm_addr, mac address will be\n  maintained in device private structure.\n\no Device limitation: We need to set mac address when ever\n  interface comes up.\n\nIn ALB/TAL mode, bonding driver calls set_mac for all slave with bond mac address.\nBut bonding driver set netdev-\u003edev_addr field to its original value,\nafter enslaving interfaces.\n\nWhen ever active slave changes, it swap dev_addr of inactive slave with active.\nYet it doesn\u0027t notify driver about change in netdev-\u003edev_addr.\n\nAs netxen driver need to set mac addr when ever interface comes up,\nit can\u0027t rely on netdev-\u003edev_addr field. Specially in case of bonding mode ALB/TLB.\n\nSigned-off-by: Narender Kumar \u003cnarender.kumar@qlogic.com\u003e\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "a7483b0afa63e851c4438ddda8934a296851f1de",
      "tree": "d19a6cdd0a81f759f810292d3a2bde64f9a90112",
      "parents": [
        "5d521fd36de4e61ab16a358df54c5babe153396c"
      ],
      "author": {
        "name": "Narender Kumar",
        "email": "narender.kumar@qlogic.com",
        "time": "Fri Nov 20 15:09:33 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Nov 21 11:37:35 2009 -0800"
      },
      "message": "netxen: fix promisc for NX2031.\n\nKernel crashes, if promisc mode set without disabling rx queue.\nBefore changing mode in NX2031 chip, wait till rx queue drains.\n\nSigned-off-by: Narender Kumar \u003cnarender.kumar@qlogic.com\u003e\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "5d521fd36de4e61ab16a358df54c5babe153396c",
      "tree": "e68b74daf6db805d1e91263e006d71a49717c1dc",
      "parents": [
        "507eebef86a59713c2180c813d90f98a7bf6c2b4"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit@netxen.com",
        "time": "Fri Nov 20 15:09:32 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Nov 21 11:37:32 2009 -0800"
      },
      "message": "netxen: fix memory initialization\n\nAvoid resetting memory during initialization, skip this memory\nblock during driver probe.\n\nSigned-off-by: Amit Kumar Salecha \u003camit@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "eb6d02133cf5451fece3a37ccccf2ce7c09a09c1",
      "tree": "37a76f1eee1b1e2383d9870ef8a440b0f0f7105e",
      "parents": [
        "55cac248caa4a5f181a11cd2f269a672bef3d3b5"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Thu Nov 19 15:08:12 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Nov 20 10:00:17 2009 -0800"
      },
      "message": "netxen: remove PCI IDs of CNA device\n\nRemove PCI vendor and device IDs for QLE8240 and QLE8242\nCNA devices. CNA devices will have separate driver.\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "c70948105d4f057b90d4a587246565782e51ed35",
      "tree": "ddac794b012a80efef0901ba8e477b6904dc7e8d",
      "parents": [
        "7e8e5d9718744b817bfea6f020586d7035cc89f4"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Sat Oct 24 16:04:03 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Oct 28 04:11:10 2009 -0700"
      },
      "message": "netxen: update version to 4.0.65\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "7e8e5d9718744b817bfea6f020586d7035cc89f4",
      "tree": "96758702e19bd3143bbfda21fcb1f94d2c2d777a",
      "parents": [
        "c25c0b9b33f681972e0b2abc96b9debdd1ef32a5"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Sat Oct 24 16:04:02 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Oct 28 04:11:10 2009 -0700"
      },
      "message": "netxen: module firmware hints\n\nAdd MODULE_FIRMWARE hints for various firmware file types,\nrequired by different chip revisions.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "c25c0b9b33f681972e0b2abc96b9debdd1ef32a5",
      "tree": "24df63e3e848ccf0205be3774ffa451246308d66",
      "parents": [
        "f0e08fac06596a760f074c08521550d93b96336e"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Wed Oct 28 04:11:04 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Oct 28 04:11:04 2009 -0700"
      },
      "message": "netxen: update module info\n\nUpdate module info with QLogic signature.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "f0e08fac06596a760f074c08521550d93b96336e",
      "tree": "4499759d62e374f9186973c4ce737f560394fea1",
      "parents": [
        "a9ac07deeb4b880aea3eaccf7ec913ac902aeef9"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Sat Oct 24 16:04:00 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Oct 28 04:10:18 2009 -0700"
      },
      "message": "netxen: add PCI IDs for new chip\n\nAdd PCI vendor and device IDs for QLE8240 and QLE8242\nCNA devices.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "a9ac07deeb4b880aea3eaccf7ec913ac902aeef9",
      "tree": "c87b51c895df99029557b383446803bd59fc86c2",
      "parents": [
        "f50330f90b9aa42b7058650ce66b85f1b443ab11"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Sat Oct 24 16:03:59 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Oct 28 04:10:17 2009 -0700"
      },
      "message": "netxen: refactor indirect register access\n\nRefactor code to calculate and set indirect access\nwindow for control registers in 2MB address space\n(NX3031 or newer). Use void __iomem * data type for\nabsolute pci addresses.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "f50330f90b9aa42b7058650ce66b85f1b443ab11",
      "tree": "d980282844c3636e60d6408984a52e613a88a530",
      "parents": [
        "516b4df1ce49304c188704decf60275c72d4cae1"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit@netxen.com",
        "time": "Sat Oct 24 16:03:58 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Oct 28 04:10:16 2009 -0700"
      },
      "message": "netxen: support for new firmware file format\n\nAdd support for extracting firmware from a unified\nfile format which embeds firmware images for all chip\nrevisions. Fallback to orginal file formats if new\nimage is not found.\n\nSigned-off-by: Amit Kumar Salecha \u003camit@netxen.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "0531d7b85177cda05f574ddf0aa4b25050159101",
      "tree": "3ae80d666da366187fafc4bcd514fe41c0ae804c",
      "parents": [
        "eef6dd65e331d6e91a39b90344c705bbcbe0825e"
      ],
      "author": {
        "name": "Randy Dunlap",
        "email": "randy.dunlap@oracle.com",
        "time": "Mon Oct 26 12:09:45 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Oct 28 02:36:24 2009 -0700"
      },
      "message": "netxen: fix builds for SYSFS\u003dn or MODULES\u003dn\n\nWhen CONFIG_MODULES\u003dn:\ndrivers/net/netxen/netxen_nic_main.c:2751: error: dereferencing pointer to incomplete type\ndrivers/net/netxen/netxen_nic_main.c:2764: error: dereferencing pointer to incomplete type\n\nAlso needs addition of \u003clinux/sysfs.h\u003e for sysfs function prototypes or\nstubs when CONFIG_SYSFS\u003dn.\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nAcked-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "cfadf853f6cd9689f79a63ca960c6f9d6665314f",
      "tree": "35418e342d9783f0974ea33ef03875aa21d2362a",
      "parents": [
        "05423b241311c9380b7280179295bac7794281b6",
        "f568a926a353d6816b3704d7367f34371df44ce7"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Oct 27 01:03:26 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Oct 27 01:03:26 2009 -0700"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/sh_eth.c\n"
    },
    {
      "commit": "0dc6d9cbe7df4d2c3cdf17cd2f78733102b0fea6",
      "tree": "8794a499d2c04c3543993fa0b45955f18e102c0b",
      "parents": [
        "ff8a306d63a01f15f166039de94c448c76140d1d"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Wed Oct 21 19:39:03 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Oct 22 18:27:50 2009 -0700"
      },
      "message": "netxen: avoid undue board config check\n\nOld code assumed board config version in the flash to be 1.\nWhen this will get changed by tools, driver just refuses to\nattach. This is unnecessary since driver does not have to\nparse board config structure directly (maintained by firmware).\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "ff8a306d63a01f15f166039de94c448c76140d1d",
      "tree": "7a78d3b3136874c3da202dfd2708eea84f2eb4cd",
      "parents": [
        "8bee0a91dd2f472d51dc107288c988ae0a0f371a"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit.salecha@qlogic.com",
        "time": "Wed Oct 21 19:39:02 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Oct 22 18:27:50 2009 -0700"
      },
      "message": "netxen: fix tx timeout handling on firmware hang\n\nClear NX_RESETING bit in netxen_tx_timeout_task() so that\nthe firmware watchdog task can catch need_reset request\nfrom tx timeout.\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "8bee0a91dd2f472d51dc107288c988ae0a0f371a",
      "tree": "00826fd8c12f97c9d4755ddd222a172962ac30df",
      "parents": [
        "845de8afa66550331dca164ab77fa49de930b699"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Wed Oct 21 19:39:01 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Oct 22 18:27:49 2009 -0700"
      },
      "message": "netxen: fix i2c init\n\nAvoid resetting subsys ID in i2c block. Also remove duplicate\ncheck for address tranlsation error.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "7194660da7a6d119fa469bd11b58e7367a5cbdf4",
      "tree": "ea947d2db06aae4ad7d453017fc47321bb8cd8f3",
      "parents": [
        "caa2dd53bc2f9c44938f2f261ebe15e2f26cc51e"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Fri Oct 16 15:50:12 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Oct 17 23:44:47 2009 -0700"
      },
      "message": "netxen; update version to 4.0.62\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "caa2dd53bc2f9c44938f2f261ebe15e2f26cc51e",
      "tree": "6fade4ac91dcd549acfec39891dc7bc57f0a6341",
      "parents": [
        "7cecdca133ea9791adce21819b9e9eed79045f23"
      ],
      "author": {
        "name": "Narender Kumar",
        "email": "narender.kumar@qlogic.com",
        "time": "Fri Oct 16 15:50:11 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Oct 17 23:44:46 2009 -0700"
      },
      "message": "netxen: sysfs control for auto firmware recovery\n\nFirmware hang detection and recovery (reset) need to\nbe disabled for diagnostic tools, which can run\nsome disruptive tests.\n\nThis adds a driver level control to turn off this\nfeature by diag tools.\n\nSigned-off-by: Narender Kumar \u003cnarender.kumar@qlogic.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "7cecdca133ea9791adce21819b9e9eed79045f23",
      "tree": "368fd8adec2d47e3e035631060a7fdf487876f66",
      "parents": [
        "6abb4b83eac25d91f6de834e97b2ea38e979575b"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Fri Oct 16 15:50:10 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Oct 17 23:44:44 2009 -0700"
      },
      "message": "netxen: fix error codes in for tools access\n\nUse -EIO or -EINVAL as error codes, these can get passed up\nto applications (tools).\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "6abb4b83eac25d91f6de834e97b2ea38e979575b",
      "tree": "d06065cc9c37f3bbc9a2a15a6c9e09535e3adb79",
      "parents": [
        "0be367bd5d10634c0836f57a684432fee935d929"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit@netxen.com",
        "time": "Fri Oct 16 15:50:09 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Oct 17 23:44:42 2009 -0700"
      },
      "message": "netxen: onchip memory access change\n\nAdd support for different windowing scheme for on chip\nmemory in future chip revisions. This is required by\ndiagnostic tools.\n\nSigned-off-by: Amit Kumar Salecha \u003camit@netxen.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "0be367bd5d10634c0836f57a684432fee935d929",
      "tree": "da3f8b320d4166e4132bc37653d22d3c4d6edcc1",
      "parents": [
        "fb1f6a4378fe211d8c1397311d26e747e5ec61c5"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit@qlogic.com",
        "time": "Fri Oct 16 15:50:08 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Oct 17 23:44:41 2009 -0700"
      },
      "message": "netxen: reset sequence changes\n\nFuture revisions need different chip reset sequence\nand firmware initialization.\n\nAlso clean up some never used debug code.\n\nSigned-off-by: Amit Kumar Salecha \u003camit@netxen.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "fb1f6a4378fe211d8c1397311d26e747e5ec61c5",
      "tree": "52c3c2b56b9887f920119c75c89cb7e4b0a0cef5",
      "parents": [
        "0a2aa440603f27ad40bcc14806f4d87aabbd8a0f"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit@qlogic.com",
        "time": "Fri Oct 16 15:50:07 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Oct 17 23:44:40 2009 -0700"
      },
      "message": "netxen: 128 memory controller support\n\nFuture revisions of the chip have 128 bit memory\ntransactions. Require drivers to implement rmw\nin case of sub-128 bit accesses by driver. This\nis mostly used by diagnostic tools.\n\nSigned-off-by: Amit Kumar Salecha \u003camit@netxen.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "0a2aa440603f27ad40bcc14806f4d87aabbd8a0f",
      "tree": "f3c425e1b380f63fb707ca53f8940b2665ac5633",
      "parents": [
        "12d7ea2c5a5c87834daf9fcd920aab80ff6248b1"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit@qlogic.com",
        "time": "Fri Oct 16 15:50:06 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Oct 17 23:44:39 2009 -0700"
      },
      "message": "netxen: defines for next revision\n\nSigned-off-by: Amit Kumar Salecha \u003camit@netxen.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "421355de876b9f3fcc7e4cb6026e416fb12a5068",
      "tree": "fb814456af86c75e1eb9e330994dda461fc5b4f7",
      "parents": [
        "aace495933a981274b6491d71b915165a61defdc",
        "0fe7463a35aadfaf22d1ca58325ab3851b8d757c"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Oct 13 12:55:20 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Oct 13 12:55:20 2009 -0700"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n"
    },
    {
      "commit": "70f9cf8951e5253cfef821f8dcb92f6fc3af50c6",
      "tree": "8ed392633d7064b79ed14bc0bfc0acad3c2adca6",
      "parents": [
        "f03b0ebd8e7132bd9adb41348070813feb280300"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Tue Oct 13 05:31:45 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Oct 13 11:48:25 2009 -0700"
      },
      "message": "netxen: add sysfs entries for diag tools\n\nAdd sysfs entries to enable register and memory access\nfor diagnostic tools.\n\nSigned-off-by: Narender Kumar \u003cnarender.kumar@qlogic.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "f03b0ebd8e7132bd9adb41348070813feb280300",
      "tree": "c7606724b4dcd84857980797c9d948f00cbeb185",
      "parents": [
        "907fa1201c76f426a13bdff5be2747fb62c2353f"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Tue Oct 13 05:31:44 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Oct 13 11:48:21 2009 -0700"
      },
      "message": "netxen: separate register and memory access lock\n\nSince register and onboard memory access has separate\nwindow registers, they need not be kept under same lock.\n\nAlso, memory is always accessed from process context\n(mostly for firmware init and diagnostic tools).\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "907fa1201c76f426a13bdff5be2747fb62c2353f",
      "tree": "2bffcd1f472f03f9a294e0e4b16bbac705b52ba6",
      "parents": [
        "47abe35610cbbfb3cc92847efdf588a8be1f5ebc"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Tue Oct 13 05:31:43 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Oct 13 11:48:20 2009 -0700"
      },
      "message": "netxen: annotate register windowing code\n\nUse common variables crb_win, ocm_win for all revisions of chip.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "47abe35610cbbfb3cc92847efdf588a8be1f5ebc",
      "tree": "13f9e7a04b31a4138e3e069f62377f75b049e31f",
      "parents": [
        "1f5e055db369a5d1c74174571585a4ec2e6c40fb"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Tue Oct 13 05:31:42 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Oct 13 11:48:19 2009 -0700"
      },
      "message": "netxen: add access to on chip memory for tools\n\nAdd access to on chip memory, this is used by\ndebug and diagnostic tools only.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "1f5e055db369a5d1c74174571585a4ec2e6c40fb",
      "tree": "ef35e48957f02d9f1b461bd82bbd36745cf8de63",
      "parents": [
        "89d71a66c40d629e3b1285def543ab1425558cd5"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit@netxen.com",
        "time": "Tue Oct 13 05:31:41 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Oct 13 11:48:19 2009 -0700"
      },
      "message": "netxen: remove sub 64-bit mem accesses\n\nSub 64-bit / unaligned access to oncard memory was only used\nby old diagnostic tools, causes some intermittent issues when\nmemory controller agent is used.  The new access method was\nadded by commit ea6828b8aa3a8ebae8d7740f32f212ba1d2f0742\n(\"netxen: improve pci memory access\").  Firmware init anyway\nuses 8-byte strides.\n\nThis also fixes address/offset calculation for NX2031 context\nmemory (SIU). For NX3031, SIU uses same register offsets\nas packet memory (MIU).\n\nSigned-off-by: Amit Kumar Salecha \u003camit@netxen.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "71fb62fb6dd4ed95e6f0240a2c627df396d9d057",
      "tree": "dc99a59013d88ef9767daf83b2f95e8b7e220873",
      "parents": [
        "4ce22537a28eeb6a29a2b4d1049c703a80c25bd1"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Tue Oct 13 00:26:04 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Oct 13 00:26:04 2009 -0700"
      },
      "message": "netxen: fix pci bar mapping\n\nUse resource_size_t for PCI resource remapping instead\nof unsigned long. Physical addresses can exceed range of\nlong data type (e.g with PAE).\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "7fe13c5733790ef582769a54693fa6a5abf3c032",
      "tree": "567eb4394b642ddc81ff05521329d75d1cf47b88",
      "parents": [
        "8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc",
        "10c435f18b8cb78a5870c08d52955594f5ec9c31"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Oct 11 23:15:47 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Oct 11 23:15:47 2009 -0700"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n"
    },
    {
      "commit": "5a4d631154de41bb43eefb03d2124224c23c1fa4",
      "tree": "61402c9fc26dff20c3110d42fcc892357e0df24b",
      "parents": [
        "7274c20f7b6a7bd6e3e8441e1727bf9cfd8235bb"
      ],
      "author": {
        "name": "Ajit Khaparde",
        "email": "ajitkhaparde@gmail.com",
        "time": "Wed Oct 07 02:45:34 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Oct 07 22:00:25 2009 -0700"
      },
      "message": "netxen: Use the instance of net_device_stats from net_device.\n\nSince net_device has an instance of net_device_stats,\nwe can remove the instance of this from the private adapter structure.\n\nSigned-off-by: Ajit Khaparde \u003cajitk@serverengines.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "fa9859ef2bb56d876db53c258001af115f38a272",
      "tree": "9b27bcdb9b903f1a3d319dbb23ef62bf86c11728",
      "parents": [
        "49682864b0270a0578b8321ed2686dc471ec37f1"
      ],
      "author": {
        "name": "Roel Kluin",
        "email": "roel.kluin@gmail.com",
        "time": "Tue Oct 06 19:34:39 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Oct 07 03:50:09 2009 -0700"
      },
      "message": "netxen: Fix Unlikely(x) \u003e y\n\nThe closing parenthesis was not on the right location.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nAcked-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "07653aa3afe7b74cbddfe3bca82a898c413855b1",
      "tree": "0d4834742f1e924ec12a74af6090e026306f4c33",
      "parents": [
        "a598ae177a11ebae065e20059d9bc63a5da4ccc3"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Sun Sep 20 19:20:39 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Sep 22 14:00:02 2009 -0700"
      },
      "message": "netxen: fix firmware init after resume\n\nAfter successful firmware init, return instead of\nfalling to error path (leading to detach) after\nresuming to D0 state. This was broken in recent\nfirmware reset rehaul.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "a598ae177a11ebae065e20059d9bc63a5da4ccc3",
      "tree": "8228a1815d3cd565561cc1c5baaff277a71942a3",
      "parents": [
        "03b88a66c040acb4b770221ca24a609527b47fc5"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Sun Sep 20 19:20:38 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Sep 22 14:00:01 2009 -0700"
      },
      "message": "netxen: fix minor tx timeout bug\n\nFix minor bug in netdev tx timeout handling which could\nalways lead to firmware reset instead of pci function reset.\n\nnetxen_nic_reset_context() requires __NX_RESETTING bit\ncleared.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "13af7a6ea502fcdd4c0e3d7de6e332b102309491",
      "tree": "cea083e14ac3469db1279a584d20a876606d315a",
      "parents": [
        "74c520da5414d15b0ab2839d67efab2e7227be75"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Fri Sep 11 11:28:15 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Sep 11 16:58:51 2009 -0700"
      },
      "message": "netxen: update copyright\n\no Add QLogic copyright, add linux-driver@qlogic.com to\n  MAINTAINERS.\no Delete old contact information.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "74c520da5414d15b0ab2839d67efab2e7227be75",
      "tree": "d079968ab0f36d4cf7521763ef64d165976537e7",
      "parents": [
        "ec5c50cb93c446a4686863df74e4b7a547628115"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit@qlogic.com",
        "time": "Fri Sep 11 11:28:14 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Sep 11 16:58:48 2009 -0700"
      },
      "message": "netxen: fix tx timeout recovery\n\nRedesign tx timeout handling in line with new firmware\nreset design that co-ordinates with other PCI function\ndrivers.\n\no For NX3031, first try to reset PCI function\u0027s own\n  context before requesting firmware reset.\n\no For NX2031, since firmware heartbit is not supported\n  directly request firmware reset.\n\nSigned-off-by: Amit Kumar Salecha \u003camit@netxen.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "ec5c50cb93c446a4686863df74e4b7a547628115",
      "tree": "276e2c1d4c0e806c429322e75f10f985da441ee4",
      "parents": [
        "ea6828b8aa3a8ebae8d7740f32f212ba1d2f0742"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Fri Sep 11 11:28:13 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Sep 11 16:58:45 2009 -0700"
      },
      "message": "netxen: fix file firmware leak\n\nRelease file firmware when no firmware reset is required.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "ea6828b8aa3a8ebae8d7740f32f212ba1d2f0742",
      "tree": "6a783fc6ceb9de3edf2577af1ed5d6acc0deca74",
      "parents": [
        "f78c0850d2ebe7a44a4b0263480a2f1a36a92218"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Fri Sep 11 11:28:12 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Sep 11 16:58:42 2009 -0700"
      },
      "message": "netxen: improve pci memory access\n\no Access on card memory through memory controller (agent)\n  rather than moving small pci window around. Clean up the\n  code for moving windows around.\n\no Restrict memory accesss to 64 bit, currently only firmware\n  download uses this.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "f78c0850d2ebe7a44a4b0263480a2f1a36a92218",
      "tree": "0965632234e9a3a306ad2c8cde5f0066bb6acf9f",
      "parents": [
        "5ea1c50662d447de344812054175d7151783ea25"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit@qlogic.com",
        "time": "Fri Sep 11 11:28:11 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Sep 11 16:58:38 2009 -0700"
      },
      "message": "netxen: change firmware write size\n\nUse 8 byte strides for firmware download into card\nmemory since oncard memory controller needs 8 byte\n(64 bit) accesses. This avoids unnecessary rmw cycles.\n\nSigned-off-by: Amit Kumar Salecha \u003camit@netxen.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "9feae56c0de65fdd8b1f64f376bb6578417d2b79",
      "tree": "84d3338d3813efffcee251b43af1ab234c9fcc18",
      "parents": [
        "02571f89871e009b66fb5f8d5ae222e90e9f357c"
      ],
      "author": {
        "name": "Randy Dunlap",
        "email": "randy.dunlap@oracle.com",
        "time": "Fri Sep 11 12:41:04 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Sep 11 15:51:39 2009 -0700"
      },
      "message": "netxen: build fix for INET\u003dn\n\nWhen CONFIG_INET is disabled, netxen has a build failure:\n\nnetxen_nic_main.c:(.text+0x118fd1): undefined reference to `netxen_config_indev_addr\u0027\n\nso make that function just an empty stub when CONFIG_INET\u003dn.\n(not \"inline\" since that conflicts with other declarations of it)\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nAcked-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "58f25468b5636c390ad2a58356b127c0055884b4",
      "tree": "5da1946a20912eb292760865227e2aa536f610fd",
      "parents": [
        "3db7675506ef7460bf6220545bfc69abb7dbceab"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit@netxen.com",
        "time": "Wed Sep 09 18:12:59 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Sep 09 18:12:59 2009 -0700"
      },
      "message": "netxen: fix tx descriptor structure\n\nFix the offset of vlan_TCI field in cmd_desc_type0.\n\nSigned-off-by: Amit Kumar Salecha \u003camit@qlogic.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "3db7675506ef7460bf6220545bfc69abb7dbceab",
      "tree": "89e9c6aa2772af4ab4ed2f88be03a25b86119bba",
      "parents": [
        "23bcf634c8bc0d84607a5b863333191d58baee4c"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit@netxen.com",
        "time": "Wed Sep 09 18:12:37 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Sep 09 18:12:37 2009 -0700"
      },
      "message": "netxen: fix check for ip addr hashing support\n\nFix typo in checking dest ip has support before\nprogramming destip addresses.\n\nSigned-off-by: Amit Kumar Salecha \u003camit@netxen.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "5877e55f32bb50956c9a1df8e7db3fbc67dc47b6",
      "tree": "23536b2d7f54cdc84fab1781b4177697fa300e07",
      "parents": [
        "2b9e62ee7b2f1971c01fdaa7653c9dae7b571187"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Sat Sep 05 17:43:12 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Sep 07 01:53:22 2009 -0700"
      },
      "message": "netxen: update version to 4.0.50\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "2b9e62ee7b2f1971c01fdaa7653c9dae7b571187",
      "tree": "2985333288b3c984009aca8db6b44a1cf99b4703",
      "parents": [
        "195c5f9829407857cba86f083caec6302b1fd8e1"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Sat Sep 05 17:43:11 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Sep 07 01:53:18 2009 -0700"
      },
      "message": "netxen: refactor firmware info code\n\no Combine netxen_get_firmware_info(), netxen_check_options()\n  so that they are updated every time firmware is reset.\no Set dma mask everytime firmware is reset.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "195c5f9829407857cba86f083caec6302b1fd8e1",
      "tree": "d208ca059eaa3f6dd0dd4fb23226f84584a341e4",
      "parents": [
        "d0725e4d3ccf603c4fcf3589850cb464c927d42a"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit@netxen.com",
        "time": "Sat Sep 05 17:43:10 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Sep 07 01:53:13 2009 -0700"
      },
      "message": "netxen: pre calculate register addresses\n\nFor registers accessed in fast path (interrupt / softirq)\navoid expensive I/O address translation. These registers\nare directly mapped in PCI bar 0 and do not require\nany window checks.\n\nSigned-off-by: Amit Kumar Salecha \u003camit@netxen.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "d0725e4d3ccf603c4fcf3589850cb464c927d42a",
      "tree": "bc7b737bab7b103796fd04479db4f28ced45090b",
      "parents": [
        "6a581e93981e8838c85e407303186faf937830d3"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit@netxen.com",
        "time": "Sat Sep 05 17:43:09 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Sep 07 01:53:09 2009 -0700"
      },
      "message": "netxen: fix ip addr hashing after firmware reset\n\nReprogram local IP addresses after firmware is reset\nor after resuming from suspend.\n\nSigned-off-by: Amit Kumar Salecha \u003camit@netxen.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "6a581e93981e8838c85e407303186faf937830d3",
      "tree": "3e2f083971fc33d4a3e88e7cc37e346f775d7168",
      "parents": [
        "db4cfd8a6149e778befb2ff6e6f91cdc6394cbe6"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Sat Sep 05 17:43:08 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Sep 07 01:53:06 2009 -0700"
      },
      "message": "netxen: firmware hang detection\n\nImplement state machine to detect firmware hung state\nand recover. Since firmware will be shared by all PCI\nfunctions that have different class drivers (NIC or\nFCOE or iSCSI), explicit hardware based serialization\nis required for initializing firmware.\n\no Used global scratchpad register to maintain device\n  reference count. Every probed pci function adds to\n  ref count.\n\no Implement timer (delayed work) for each pci func\n  that checks firmware heartbit every 5 sec and detaches\n  itself if firmware is dead. Last detaching function\n  reloads firmware. Other functions wait for firmware\n  init, and re-attach themselves.\n\nHeartbit is not supported by NX2031 firmware.\n\nSigned-off-by: Amit Kumar Salecha \u003camit@netxen.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "db4cfd8a6149e778befb2ff6e6f91cdc6394cbe6",
      "tree": "dd1faddbbce164b86e58a7cde54bfbd7b3f528bd",
      "parents": [
        "6ec1c69a8f6492fd25722f4762721921da074c12"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Sat Sep 05 17:43:07 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Sep 07 01:53:01 2009 -0700"
      },
      "message": "netxen: handle firmware load errors\n\nUnwind allocations and release file firmware when\nwhen firmware load fails.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "cf503e8f458cec455b18d3938b3b27de6db3105e",
      "tree": "1a74f7741be82cd6ded3371ee794f80f749e1a86",
      "parents": [
        "270e57e133a9e61c8c62ea4a0d1ffdf53f91caf1"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Thu Sep 03 13:10:55 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Sep 03 20:02:04 2009 -0700"
      },
      "message": "netxen: fix infinite loop on dma mapping failure\n\nFix a perpetual while() loop in unwinding partial\nmapped tx skb on dma mapping failure.\n\nReported-by: \"Juha Leppanen\" \u003cjuha_motorsportcom@luukku.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "270e57e133a9e61c8c62ea4a0d1ffdf53f91caf1",
      "tree": "a93b7dd4bdc0e8d61ccdbcf41e1001150d5ba846",
      "parents": [
        "bc75e5bfad2a6d24fc5a9885a2f6b93f82c6c5f1"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Thu Sep 03 13:10:54 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Sep 03 20:02:01 2009 -0700"
      },
      "message": "netxen: remove duplicate napi_add\n\nRemove duplicate calls to netxen_napi_add().\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "bc75e5bfad2a6d24fc5a9885a2f6b93f82c6c5f1",
      "tree": "52c4b697f034607cc6cc3b8505a26819cffc572e",
      "parents": [
        "d4ab88194e982a0d213000a75475d3e76b2626f0"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@qlogic.com",
        "time": "Thu Sep 03 13:10:53 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Sep 03 20:01:56 2009 -0700"
      },
      "message": "netxen: fix lro buffer allocation\n\nAlloc 12k skbuffs so that firmware can aggregate more\npackets into one buffer. This doesn\u0027t raise memory\nconsumption since 9k skbs use 16k slab cache anyway.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "0fc0b732eaa38beb93a6fb62f77c7bd9622c76ec",
      "tree": "2423b134116c16f027ebeae7954c098f27d6e619",
      "parents": [
        "daf09de817353f18bb81a23a023d429cfd258e62"
      ],
      "author": {
        "name": "Stephen Hemminger",
        "email": "shemminger@vyatta.com",
        "time": "Wed Sep 02 01:03:33 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Sep 02 01:03:33 2009 -0700"
      },
      "message": "netdev: drivers should make ethtool_ops const\n\nNo need to put ethtool_ops in data, they should be const.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "61357325f377889a1daffa14962d705dc814dd0e",
      "tree": "7b436f1097abbc5681de6d1e5901f62963b42220",
      "parents": [
        "d0cf9c0dadcdc89a755bcb301cfc9c796eb28ccf"
      ],
      "author": {
        "name": "Stephen Hemminger",
        "email": "shemminger@vyatta.com",
        "time": "Mon Aug 31 19:50:58 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Sep 01 01:14:07 2009 -0700"
      },
      "message": "netdev: convert bulk of drivers to netdev_tx_t\n\nIn a couple of cases collapse some extra code like:\n   int retval \u003d NETDEV_TX_OK;\n   ...\n   return retval;\ninto\n   return NETDEV_TX_OK;\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "fa3ce355c1bf1a83b843420228202fd6f8023ad3",
      "tree": "b8ebdbc86bfa36215d9cfc1f2920a44f3b0e4ae3",
      "parents": [
        "3ad4467ca43e7a2556e26e4e304faf3385048834"
      ],
      "author": {
        "name": "Narender Kumar",
        "email": "narender.kumar@qlogic.com",
        "time": "Mon Aug 24 19:23:28 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Aug 26 15:29:21 2009 -0700"
      },
      "message": "netxen: bridged mode optimizations\n\nWhen the interface is put in bridged mode, destination mac\naddresses are unknown to firmware. So packets take a slow\npath (lower priority) in firmware reducing performance.\n\nFirmware can cache limited number of remote unicast mac\naddresses for certain interval, if \"dynamic mac learning\"\nmode is enabled.\n\nDriver needs to enable this \"mac learning\" mode in firmware.\nCurrently this is done through net device class sysfs entry,\npossibly this can also be done upon netlink notifications to\nfrom bridge.\n\nSigned-off-by: Narender Kumar \u003cnarender.kumar@qlogic.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "3ad4467ca43e7a2556e26e4e304faf3385048834",
      "tree": "5b3e263674604ec0f15211f3de10d3cc65e93f63",
      "parents": [
        "c9517e5893db03ca8bd32b8783b39af58176947c"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Mon Aug 24 19:23:27 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Aug 26 15:29:19 2009 -0700"
      },
      "message": "netxen: remove netxen_nic_niu.c\n\nConsolidate all MAC/PHY access functions into netxen_nic_hw.c\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "c9517e5893db03ca8bd32b8783b39af58176947c",
      "tree": "5ae4d26af6f38e70a868e634d0576056c326027e",
      "parents": [
        "cb7e4b6e37144f5d131ee09296be3c21c41f28d8"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Mon Aug 24 19:23:26 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Aug 26 15:29:17 2009 -0700"
      },
      "message": "netxen: implement generic pcie semaphore functions\n\nImplement common function for locking/unlocking 8 hardware\nsemaphores used for serializing access to shared resouces\non a NIC board by different PCI functions.\n\nAs by definition, callers of these semaphore API can be\nput to sleep till the semaphore is locked.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "cb7e4b6e37144f5d131ee09296be3c21c41f28d8",
      "tree": "2344575b03a3ea33d086bef52eb8b09daa6c9d2c",
      "parents": [
        "940917226260d6e029f55742a34a7d7810983c75"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Mon Aug 24 19:23:25 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Aug 26 15:29:15 2009 -0700"
      },
      "message": "netxen: remove unused code\n\nRemove code for phy access on unreleased NX2031 based quad-gig board.\n\nNX3031 based production quad-gig boards do not require direct phy\naccess by driver.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "7d6fd5e7e97a2188d56441e4e96494c21c5994a7",
      "tree": "23cb119c2d2a094363f2dd5cc53e9443e87f5ae3",
      "parents": [
        "22b5794b5d58ea81e91d68d00e49357b66d5a559"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Sun Aug 23 08:35:13 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Aug 23 19:00:29 2009 -0700"
      },
      "message": "netxen: remove netxen_nic_phan_reg.h\n\nConsolidate register definitions in netxen_nic_hdr.h\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "22b5794b5d58ea81e91d68d00e49357b66d5a559",
      "tree": "dbeaa633fff4a990f83fac7003a350f1870db873",
      "parents": [
        "ce644ed4db3ee1075ebd9f4acc403e1f9410db21"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit@qlogic.com",
        "time": "Sun Aug 23 08:35:12 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Aug 23 19:00:26 2009 -0700"
      },
      "message": "netxen: implement pci driver shutdown\n\nImplement pci driver shutdown functionality, this helps\nquiescing all PCI transaction before chipset is reset.\n\nAmit Kumar Salecha \u003camit@qlogic.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "ce644ed4db3ee1075ebd9f4acc403e1f9410db21",
      "tree": "eb84575826cb9f38a140dea285883661228b9ca4",
      "parents": [
        "1dbc84a7f6c2ebd8c69299e1adef22ee26db38c0"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Sun Aug 23 08:35:11 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Aug 23 19:00:25 2009 -0700"
      },
      "message": "netxen: refactor tx dma mapping code\n\nMove all tx skb mapping code into netxen_map_tx_skb().\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "1dbc84a7f6c2ebd8c69299e1adef22ee26db38c0",
      "tree": "e46a7a771da5666dab3772831a5712a42e293bad",
      "parents": [
        "1bb482f8a46000f77577948ff1c350275bba7dc9"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Sun Aug 23 08:35:10 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Aug 23 19:00:22 2009 -0700"
      },
      "message": "netxen: fix firmware reset logic\n\nIf netxen_need_fw_reset() return 0 [ implies firmware is up\nand running], still go through dma mask check, etc.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "1bb482f8a46000f77577948ff1c350275bba7dc9",
      "tree": "3003df5a4414af44af0756f670531d9445bad397",
      "parents": [
        "8fea0f0db87a4aaed41a93eed147af61cc5f9e3f"
      ],
      "author": {
        "name": "Narender Kumar",
        "email": "narender.kumar@qlogic.com",
        "time": "Sun Aug 23 08:35:09 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Aug 23 19:00:20 2009 -0700"
      },
      "message": "netxen: ethtool statistics and control for LRO\n\nAdd ethtool -K knob to control LRO in firmware.\nLRO path is completely separated from GRO, LRO packets\nare still fed with netif_receive_skb().\n\nAlso fix ethtool statistics to include LRO packets.\nAlso use correct message type while configuring interrupt coalescing.\n\nSigned-off-by: Narender Kumar \u003cnarender.kumar@qlogic.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "5c16807d3d196203d2d3c9fae51ac7e422091904",
      "tree": "850c33533f80fe426b477c4660c61ba22315a808",
      "parents": [
        "e5e2a8fd8358d1b3a2c51c3248edee72e4194703",
        "232e7d68d50c9ac3a55d716e5ae215ecd1e043b9"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Aug 13 19:59:44 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Aug 13 19:59:44 2009 -0700"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/netxen/netxen_nic_main.c\n"
    },
    {
      "commit": "232e7d68d50c9ac3a55d716e5ae215ecd1e043b9",
      "tree": "2367d09f6c2a6f9edc7f674f27dfb987968083fa",
      "parents": [
        "e424fa9d6a0add1a9b812b07e3607daaa5b9e53d"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Thu Aug 13 07:03:01 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Aug 13 16:33:04 2009 -0700"
      },
      "message": "netxen: free napi resources during detach\n\no Defer napi resouce allocation to device attach.\n\no Free napi resources and delete napi during detach.\n\nThis ensures right behavior across firmware reset.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "e424fa9d6a0add1a9b812b07e3607daaa5b9e53d",
      "tree": "3c29efe8d877845647c32d60a9b20f3fa4950093",
      "parents": [
        "237057ad3fe5644fa471be474a160de2fc2e5870"
      ],
      "author": {
        "name": "Amit Kumar Salecha",
        "email": "amit@qlogic.com",
        "time": "Thu Aug 13 07:03:00 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Aug 13 16:33:03 2009 -0700"
      },
      "message": "netxen: remove netxen workqueue\n\no Remove private workqueue in the driver, move all\n  scheduled tasks to keventd workqueues. This makes\n  ports (interfaces) of same / different NIC boards\n  independent, in terms of their link watchdog and\n  reset tasks.\n\no Move quick checks for link status and temperature\n  in timer callback, schedule watchdog task only if\n  link status changed or temperature reached critical\n  threshold.\n\nThis also fixes deadlock when thermal panic occurs,\nwatchdog work was flushing workqueue that it was\nsitting on.\n\nSigned-off-by: Amit Kumar Salecha \u003camit@qlogic.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "aa11d958d1a6572eda08214d7c6a735804fe48a5",
      "tree": "d025b05270ad1e010660d17eeadc6ac3c1abbd7d",
      "parents": [
        "07f6642ee9418e962e54cbc07471cfe2e559c568",
        "9799218ae36910af50f002a5db1802d576fffb43"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Aug 12 17:44:53 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Aug 12 17:44:53 2009 -0700"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tarch/microblaze/include/asm/socket.h\n"
    },
    {
      "commit": "c1c00ab8626298ac784ea344bf10e94b5bd9bcb5",
      "tree": "49c6479ddaa4121b06cc762f1ee1e19fdfde3e65",
      "parents": [
        "06db58c0cd92e157a4ccf2b6836c9f4b931c7cda"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Wed Aug 05 07:34:09 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Aug 05 12:40:15 2009 -0700"
      },
      "message": "netxen: add hardware LRO support\n\nAdd support to handle aggregate packets from firmware.\nLocal TCP flows are automatically identified by firmware\nbased on the dest IP hash added by driver for local IP\naddresses.\n\nThe packets are sent down on the jumbo rx ring.\n\nSigned-off-by: Narender Kumar \u003cnarender.kumar@qlogic.com\u003e\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "06db58c0cd92e157a4ccf2b6836c9f4b931c7cda",
      "tree": "003f8a932093acfc073491b9e43e783b3a6ff088",
      "parents": [
        "545eb370087494dcf267e6285fe3aa20e5617c33"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Wed Aug 05 07:34:08 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Aug 05 12:40:14 2009 -0700"
      },
      "message": "netxen: remove unnecessary structures\n\nRemove unnecessary offsetof calulations on these structures:\nnetxen_board_info, netxen_user_old_info, netxen_new_user_info.\n\nThe offsets into the flash are fixed, don\u0027t need to be calculated.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "545eb370087494dcf267e6285fe3aa20e5617c33",
      "tree": "1eb7530f8a0b48f7c005b0b391b478bc5f326a69",
      "parents": [
        "839b04c4aba91dd175f60f45712680126fdc88f7"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Wed Aug 05 07:34:07 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Aug 05 12:40:14 2009 -0700"
      },
      "message": "netxen: fix vlan tso case\n\nFix the calculation of remaining header length in TSO\nover vlan device case. This was inadvertently missed\nout in patch 028afe719855a157e32450c (\"netxen: add vlan\ntx acceleration support\").\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "f60f785679b507cbeeb03d2db080ab649ac86027",
      "tree": "ee8d873ccdaaa9092359db79f949bfd1bf8fbfbe",
      "parents": [
        "0bf52b981770cbf006323bab5177f2858a196766"
      ],
      "author": {
        "name": "Dhananjay Phadke",
        "email": "dhananjay@netxen.com",
        "time": "Tue Aug 04 10:39:03 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Aug 05 10:21:58 2009 -0700"
      },
      "message": "netxen: fix dma mask update calculation\n\nFix dma mask calculation that caps at 63-bit addressing even\nwhen firmware advertises full 64-bit support.\n\nSigned-off-by: Dhananjay Phadke \u003cdhananjay@netxen.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    }
  ],
  "next": "50c643e7652458e649955408685a16e88ea6dbae"
}
