)]}'
{
  "log": [
    {
      "commit": "03f18991614cba1fa5be5dcd1a79b0e30ac44c50",
      "tree": "2b01d55c9c106d391c0ce9f01c9a6d240672ec81",
      "parents": [
        "a19d2158439d6fba8160d7d2446f233f525f09e7"
      ],
      "author": {
        "name": "Jie Yang",
        "email": "jie.yang@atheros.com",
        "time": "Thu Sep 17 10:27:28 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Sep 17 10:27:28 2009 -0700"
      },
      "message": "atl1e: fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA\n\nuse the wrong API when free dma. So when map dma use a flag to\ndemostrate whether it is \u0027pci_map_single\u0027 or \u0027pci_map_page\u0027. When free\nthe dma, check the flags to select the right APIs(\u0027pci_unmap_single\u0027\nor \u0027pci_unmap_page\u0027).\n\nset the flags type to u16  instead of unsigned long  on David\u0027s comments.\n\nSigned-off-by: Jie Yang \u003cjie.yang@atheros.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "7ab0f2736bfe137a82a7084bbfb5f809da95cabd",
      "tree": "e305ec96eceebb285efee4b6fd307822ab257fe6",
      "parents": [
        "aae5e7c30fc660c50dfecbdd745799b05af90f01"
      ],
      "author": {
        "name": "Ben Hutchings",
        "email": "bhutchings@solarflare.com",
        "time": "Thu Sep 03 10:39:43 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Sep 03 20:02:11 2009 -0700"
      },
      "message": "netdev: Remove redundant checks for CAP_NET_ADMIN in MDIO implementations\n\ndev_ioctl() already checks capable(CAP_NET_ADMIN) before calling the\ndriver\u0027s implementation of MDIO ioctls.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.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": "0d6ab58da0465c42f34d9d4e7d91510278183c80",
      "tree": "5d87b55c6b82c1596b60db802a4e891fad0cbeef",
      "parents": [
        "005fb4f0330afb2916ddc3f3c4c70e4555d64758"
      ],
      "author": {
        "name": "Dean Nelson",
        "email": "dnelson@redhat.com",
        "time": "Fri Jul 31 09:13:10 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Aug 01 23:11:44 2009 -0700"
      },
      "message": "atl1e: return PCI_ERS_RESULT_DISCONNECT on permanent failure\n\nPCI drivers that implement the struct pci_error_handlers\u0027 error_detected\ncallback should return PCI_ERS_RESULT_DISCONNECT if the state passed in is\npci_channel_io_perm_failure. This patch fixes the issue for atl1e.\n\nSigned-off-by: Dean Nelson \u003cdnelson@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "d8146bb23ea045fb75c56b4e3b53f0964eed4076",
      "tree": "6a9a6c09770d27719fc4a03e1ca1e956f036f2b6",
      "parents": [
        "2be6fa4c7e5731375cc5e70843a3444293c27514"
      ],
      "author": {
        "name": "Brandon Philips",
        "email": "brandon@ifup.org",
        "time": "Wed Jun 24 14:09:14 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Jun 25 02:58:17 2009 -0700"
      },
      "message": "atl1*: add device_set_wakeup_enable to atl1*_set_wol\n\nTell PCI core that atl1* device can wakeup the system when WOL is\nenabled by calling device_set_wakeup_enable.\n\nJoerg noted that his atl1e device WOL fine after enabling it with\nethtool and changing /sys/class/net/eth0/device/power/wakeup to enabled\nTested on atl1e: https://bugzilla.novell.com/show_bug.cgi?id\u003d493214\n\nTested by: Joerg Reuter \u003cjreuter@novell.com\u003e\nSigned-off-by: Brandon Philips \u003cbphilips@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "17d0cdfa8f3c09a110061c67421d662b3e149d0a",
      "tree": "5e707b8787db0a8571b983a6c8c1d7bf88579788",
      "parents": [
        "3ee40c376ad3252d13946141588db7e2f435f958"
      ],
      "author": {
        "name": "Eric Dumazet",
        "email": "eric.dumazet@gmail.com",
        "time": "Thu Jun 11 17:23:24 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Jun 11 17:23:24 2009 -0700"
      },
      "message": "net: ntohs() misuse\n\nSome drivers incorrectly use ntohs() instead of htons()\n\nA cleanup as htons() returns same result than ntohs(),\nbut better to use the proper one.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "b2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768",
      "tree": "71ae1801d264bca62efa0d22376b49de7f206e9a",
      "parents": [
        "d455e5b165a367a628110ec2d18807ea10052cd1",
        "12186be7d2e1106cede1cc728526e3d7998cbe94"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Jun 03 02:43:41 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Jun 03 02:43:41 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/forcedeth.c\n"
    },
    {
      "commit": "bdb0e010bf0061a73027cc84dd7ad192c663eca3",
      "tree": "8c61f59e17733b7b917205f140276beff89920f8",
      "parents": [
        "465440d2720543669841db5b0691ba41892ed0ae"
      ],
      "author": {
        "name": "Greg Kroah-Hartman",
        "email": "gregkh@suse.de",
        "time": "Fri May 29 22:04:54 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri May 29 22:04:54 2009 -0700"
      },
      "message": "ath1e: add new device id for asus hardware\n\nGary Lin reports that a new device id needs to be added to the atl1e in\norder to get some new Asus hardware to work properly.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "cdd0db058d64f2619b08e7d098ee0014aa0a5bc1",
      "tree": "a5e31f6687eff581309b095781c7e2f0bc676182",
      "parents": [
        "28679751a924c11f7135641f26e99249385de5b4"
      ],
      "author": {
        "name": "Eric Dumazet",
        "email": "eric.dumazet@gmail.com",
        "time": "Thu May 28 00:00:41 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri May 29 01:46:27 2009 -0700"
      },
      "message": "net: dont update dev-\u003etrans_start\n\nSecond round of drivers for Gb cards (and NIU one I forgot in the 10GB round)\n\nNow that core network takes care of trans_start updates, dont do it\nin drivers themselves, if possible. Drivers can avoid one cache miss\n(on dev-\u003etrans_start) in their start_xmit() handler.\n\nExceptions are NETIF_F_LLTX drivers\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "d3f65f7c3cf11b036bbc01f22ac5c958570e724c",
      "tree": "497eaf85949b0ae1fe8a38094c320c0b66b569a9",
      "parents": [
        "08baf561083bc27a953aa087dd8a664bb2b88e8e"
      ],
      "author": {
        "name": "Eric Dumazet",
        "email": "eric.dumazet@gmail.com",
        "time": "Mon May 25 23:48:43 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon May 25 23:48:43 2009 -0700"
      },
      "message": "atl1: use netdev-\u003estats\n\nGet rid of private struct net_device_stats in \"struct atl1e_adapter\",\nand use one provided in struct net_device instead.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "0ee904c35cc3fdd26a9c76077d9692d458309186",
      "tree": "ce1dee044974b7c6040bbdb794747cd1baa8f6bb",
      "parents": [
        "710b523ac59426e8bfdea3533f42118e46b9cbfb"
      ],
      "author": {
        "name": "Alexander Beregalov",
        "email": "a.beregalov@gmail.com",
        "time": "Sat Apr 11 14:50:23 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Apr 13 15:44:36 2009 -0700"
      },
      "message": "drivers/net: replace BUG() with BUG_ON() if possible\n\nSigned-off-by: Alexander Beregalov \u003ca.beregalov@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "284901a90a9e0b812ca3f5f852cbbfb60d10249d",
      "tree": "06c1b5a0f83c90cfb662f756e7781977ce739ce8",
      "parents": [
        "6afd142fd0dfba497246d0fab236c20a7b4bf778"
      ],
      "author": {
        "name": "Yang Hongyang",
        "email": "yanghy@cn.fujitsu.com",
        "time": "Mon Apr 06 19:01:15 2009 -0700"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Tue Apr 07 08:31:11 2009 -0700"
      },
      "message": "dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)\n\nReplace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)\n\nSigned-off-by: Yang Hongyang\u003cyanghy@cn.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n"
    },
    {
      "commit": "fd8ef49edd81405e80e00eb81365ae4d6733d602",
      "tree": "ac745c6aa18b52788f9149f175e97ddcda508c56",
      "parents": [
        "18c4c35ecbeda253ce7532a6ed7f2fa144147d64"
      ],
      "author": {
        "name": "Hannes Eder",
        "email": "hannes@hanneseder.net",
        "time": "Sat Feb 14 11:14:58 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Feb 17 17:26:06 2009 -0800"
      },
      "message": "drivers/net/atl1e: fix sparse warnings: fix signedness\n\nFix this sparse warnings:\n  drivers/net/atl1e/atl1e_main.c:716:39: warning: incorrect type in argument 2 (different signedness)\n  drivers/net/atl1e/atl1e_param.c:57:1: warning: incorrect type in initializer (different signedness)\n  drivers/net/atl1e/atl1e_param.c:68:1: warning: incorrect type in initializer (different signedness)\n  drivers/net/atl1e/atl1e_param.c:81:1: warning: incorrect type in initializer (different signedness)\n  drivers/net/atl1e/atl1e_param.c:92:1: warning: incorrect type in initializer (different signedness)\n\nSigned-off-by: Hannes Eder \u003channes@hanneseder.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "288379f050284087578b77e04f040b57db3db3f8",
      "tree": "ac5f5c83e2778a1966327d87316fc94067363b45",
      "parents": [
        "627af770c63acddc2402dd19fec70df5c3ad8ab7"
      ],
      "author": {
        "name": "Ben Hutchings",
        "email": "bhutchings@solarflare.com",
        "time": "Mon Jan 19 16:43:59 2009 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Jan 21 14:33:50 2009 -0800"
      },
      "message": "net: Remove redundant NAPI functions\n\nFollowing the removal of the unused struct net_device * parameter from\nthe NAPI functions named *netif_rx_* in commit 908a7a1, they are\nexactly equivalent to the corresponding *napi_* functions and are\ntherefore redundant.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "2d5451d2614583de0c9aaf61cf5f77faf5694105",
      "tree": "03237a37f949b384ca59698b24f72f397c99959d",
      "parents": [
        "0da2afd59653d2edf5c8e0f09b23f367ab5bc80f"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Dec 26 15:10:00 2008 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Dec 26 15:10:00 2008 -0800"
      },
      "message": "net: Fix warning fallout from recent NAPI interface changes.\n\nWhen we removed the network device argument from several\nNAPI interfaces in 908a7a16b852ffd618a9127be8d62432182d81b4\n(\"net: Remove unused netdev arg from some NAPI interfaces.\")\nseveral drivers now started getting unused variable warnings.\n\nThis fixes those up.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "908a7a16b852ffd618a9127be8d62432182d81b4",
      "tree": "a0b509227e26bef7edd347575761e0dbeb5756e7",
      "parents": [
        "889bd9b6dbcd426b8698c4a779dd7dbf247f57b8"
      ],
      "author": {
        "name": "Neil Horman",
        "email": "nhorman@tuxdriver.com",
        "time": "Mon Dec 22 20:43:12 2008 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Dec 22 20:43:12 2008 -0800"
      },
      "message": "net: Remove unused netdev arg from some NAPI interfaces.\n\nWhen the napi api was changed to separate its 1:1 binding to the net_device\nstruct, the netif_rx_[prep|schedule|complete] api failed to remove the now\nvestigual net_device structure parameter.  This patch cleans up that api by\nproperly removing it..\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "008298231abbeb91bc7be9e8b078607b816d1a4a",
      "tree": "8cb0c17720086ef97c614b96241f06aa63ce8511",
      "parents": [
        "6ab33d51713d6d60c7677c0d020910a8cb37e513"
      ],
      "author": {
        "name": "Stephen Hemminger",
        "email": "shemminger@vyatta.com",
        "time": "Thu Nov 20 20:14:53 2008 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Nov 20 20:14:53 2008 -0800"
      },
      "message": "netdev: add more functions to netdevice ops\n\nThis patch moves neigh_setup and hard_start_xmit into the network device ops\nstructure. For bisection, fix all the previously converted drivers as well.\nBonding driver took the biggest hit on this.\n\nAdded a prefetch of the hard_start_xmit in the fast path to try and reduce\nany impact this would have.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "1e058ab58f03fedbd2aa202c3a81c777d623be3a",
      "tree": "715fe20509169071b571ae8b6a347de186e7848c",
      "parents": [
        "758e43b74c903ad368ceced31601ba5d96f31238"
      ],
      "author": {
        "name": "Stephen Hemminger",
        "email": "shemminger@vyatta.com",
        "time": "Wed Nov 19 22:12:06 2008 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Nov 19 22:42:47 2008 -0800"
      },
      "message": "atl1e: convert to net_device_ops\n\nConvert this driver to network device ops. Compile tested only.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "198d6ba4d7f48c94f990f4604f0b3d73925e0ded",
      "tree": "56bbdf8ba2553c23c8099da9344a8f1d1aba97ab",
      "parents": [
        "9a57f7fabd383920585ed8b74eacd117c6551f2d",
        "7f0f598a0069d1ab072375965a4b69137233169c"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Nov 18 23:38:23 2008 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Nov 18 23:38:23 2008 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\n\tdrivers/isdn/i4l/isdn_net.c\n\tfs/cifs/connect.c\n"
    },
    {
      "commit": "7ee0fddfe05f105d3346aa8774695e7130697836",
      "tree": "25b22879da0a897a151216a12ab7afe275026119",
      "parents": [
        "81183059e89c36f9b4c41f9332d642c2e0bff971"
      ],
      "author": {
        "name": "J. K. Cliburn",
        "email": "jcliburn@gmail.com",
        "time": "Tue Nov 11 16:21:48 2008 -0600"
      },
      "committer": {
        "name": "Jeff Garzik",
        "email": "jgarzik@redhat.com",
        "time": "Fri Nov 14 18:18:55 2008 -0500"
      },
      "message": "atl1e: fix broken multicast by removing unnecessary crc inversion\n\nInverting the crc after calling ether_crc_le() is unnecessary and breaks\nmulticast. Remove it.\n\nTested-by: David Madore \u003cdavid.madore@ens.fr\u003e\nSigned-off-by: Jay Cliburn \u003cjcliburn@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n"
    },
    {
      "commit": "454d7c9b14e20fd1949e2686e9de4a2926e01476",
      "tree": "fae8bd1bfb5fd496977a0639ad71c54a2ee278ae",
      "parents": [
        "7a12122c7a00347da9669cfcde82954c9e3d6f5e"
      ],
      "author": {
        "name": "Wang Chen",
        "email": "wangchen@cn.fujitsu.com",
        "time": "Wed Nov 12 23:37:49 2008 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Nov 12 23:37:49 2008 -0800"
      },
      "message": "netdevice: safe convert to netdev_priv() #part-1\n\nWe have some reasons to kill netdev-\u003epriv:\n1. netdev-\u003epriv is equal to netdev_priv().\n2. netdev_priv() wraps the calculation of netdev-\u003epriv\u0027s offset, obviously\n   netdev_priv() is more flexible than netdev-\u003epriv.\nBut we cann\u0027t kill netdev-\u003epriv, because so many drivers reference to it\ndirectly.\n\nThis patch is a safe convert for netdev-\u003epriv to netdev_priv(netdev).\nSince all of the netdev-\u003epriv is only for read.\nBut it is too big to be sent in one mail.\nI split it to 4 parts and make every part smaller than 100,000 bytes,\nwhich is max size allowed by vger.\n\nSigned-off-by: Wang Chen \u003cwangchen@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "9eeda9abd1faf489f3df9a1f557975f4c8650363",
      "tree": "3e0a58e25b776cfbee193195460324dccb1886c7",
      "parents": [
        "61c9eaf90081cbe6dc4f389e0056bff76eca19ec",
        "4bab0ea1d42dd1927af9df6fbf0003fc00617c50"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Nov 06 22:43:03 2008 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Nov 06 22:43:03 2008 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\n\tdrivers/net/wireless/ath5k/base.c\n\tnet/8021q/vlan_core.c\n"
    },
    {
      "commit": "54074d59320581a6d7e4f4dd405e8cac1d174b75",
      "tree": "57e510086daa9ea6a398900f2432e818c4156275",
      "parents": [
        "a75952b72a0fff3031124003e62118111aed42c1"
      ],
      "author": {
        "name": "Jianjun Kong",
        "email": "jianjun@zeuux.org",
        "time": "Tue Nov 04 21:47:07 2008 +0800"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Tue Nov 04 08:18:19 2008 -0800"
      },
      "message": "drivers: remove duplicated #include\n\nSigned-off-by: Jianjun Kong \u003cjianjun@zeuux.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n"
    },
    {
      "commit": "babcda74e9d96bb58fd9c6c5112dbdbff169e695",
      "tree": "fcbe5e70f1fff01ad49504171e964c387a5ad7f8",
      "parents": [
        "ab2910921064b657610a3b501358a305e13087ea"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Nov 03 21:11:17 2008 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Nov 03 21:11:17 2008 -0800"
      },
      "message": "drivers/net: Kill now superfluous -\u003elast_rx stores.\n\nThe generic packet receive code takes care of setting\nnetdev-\u003elast_rx when necessary, for the sake of the\nbonding ARP monitor.\n\nDrivers need not do it any more.\n\nSome cases had to be skipped over because the drivers\nwere making use of the -\u003elast_rx value themselves.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "a4e77d063d61e4703db813470fefe90dac672b55",
      "tree": "2ac83169013b2f54261d7190b9e4dc9f6d00e8e9",
      "parents": [
        "ac7198bb124e7007cfd48990d382678341886dba"
      ],
      "author": {
        "name": "Jie Yang",
        "email": "jie.yang@atheros.com",
        "time": "Mon Sep 22 14:52:25 2008 -0700"
      },
      "committer": {
        "name": "Jeff Garzik",
        "email": "jgarzik@redhat.com",
        "time": "Wed Sep 24 20:49:05 2008 -0400"
      },
      "message": "atl1e: remove the unneeded (struct atl1e_adapter *)\n\nRemove the unneeded (struct atl1e_adapter *) casts, for hw-\u003eadapter\nalready has type atl1e_adapter *.\n\nSigned-off-by: Jie Yang \u003cjie.yang@atheros.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n"
    },
    {
      "commit": "f382a0a8e9403c6d7f8b2cfa21e41fefb5d0c9bd",
      "tree": "2fa31ffb8dc9c32d5e497309c3388e57f19b9e95",
      "parents": [
        "70666c71957b62c8e9ea5c0d999a4bfd214c80d2"
      ],
      "author": {
        "name": "Matthew Wilcox",
        "email": "matthew@wil.cx",
        "time": "Tue Aug 12 07:13:14 2008 -0600"
      },
      "committer": {
        "name": "Jeff Garzik",
        "email": "jgarzik@redhat.com",
        "time": "Wed Sep 24 18:49:01 2008 -0400"
      },
      "message": "[netdrvr] atl1e: Don\u0027t take the mdio_lock in atl1e_probe\n\nLockdep warns about the mdio_lock taken with interrupts enabled then later\ntaken from interrupt context.  Initially, I considered changing these\nto spin_lock_irq/spin_unlock_irq, but then I looked at atl1e_phy_init()\nand saw that it calls msleep().  Sleeping while holding a spinlock is\nnot allowed either.\n\nIn the probe path, we haven\u0027t registered the interrupt handler, so\nit can\u0027t poke at this card yet.  It\u0027s before we call register_netdev(),\nso I don\u0027t think any other threads can reach this card either.  If I\u0027m\nright, we don\u0027t need a spinlock at all.\n\nSigned-off-by: Matthew Wilcox \u003cwilly@linux.intel.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n"
    },
    {
      "commit": "50f684b900de431729d6f77e69c941560936f275",
      "tree": "8b47f5213a4c5b58dc9231dede2feb27ad953336",
      "parents": [
        "17fc7004a3f552b52274b6b2fbbebd7ff76dc1d5"
      ],
      "author": {
        "name": "Ilpo Järvinen",
        "email": "ilpo.jarvinen@helsinki.fi",
        "time": "Tue Aug 19 10:32:06 2008 +0300"
      },
      "committer": {
        "name": "Jeff Garzik",
        "email": "jgarzik@redhat.com",
        "time": "Wed Aug 27 05:36:20 2008 -0400"
      },
      "message": "atl1e: multistatement if missing braces\n\nDoesn\u0027t cause problems (yet) because err gets zeroed earlier.\n\nSigned-off-by: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n"
    },
    {
      "commit": "1a3c4bc61547e5a75fd3b85b425624756da4cffb",
      "tree": "e7403a51157e31bd30b8a5bae38434f7691053dc",
      "parents": [
        "c7e65c17d75f29c846ff711b1dc5e823ba8de314"
      ],
      "author": {
        "name": "roel kluin",
        "email": "roel.kluin@gmail.com",
        "time": "Thu Aug 07 12:24:42 2008 -0400"
      },
      "committer": {
        "name": "Jeff Garzik",
        "email": "jgarzik@redhat.com",
        "time": "Thu Aug 14 04:44:18 2008 -0400"
      },
      "message": "atl1e: WAKE_MCAST 2x. 1st WAKE_UCAST?\n\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n"
    },
    {
      "commit": "1595ab5d7d99bc6c9a5548ab3fb83e278eeae409",
      "tree": "5392d4ea2ca259ee19b90fb01b3c8e465f767349",
      "parents": [
        "11d89d639352ef27bb3f0e7513dd406284bf034a"
      ],
      "author": {
        "name": "Adrian Bunk",
        "email": "bunk@kernel.org",
        "time": "Fri Aug 08 21:33:34 2008 +0300"
      },
      "committer": {
        "name": "Jeff Garzik",
        "email": "jgarzik@redhat.com",
        "time": "Thu Aug 14 04:43:40 2008 -0400"
      },
      "message": "[netdrvr] uninline atl1e_setup_mac_ctrl()\n\nThere doesn\u0027t seem to be a compelling reason why atl1e_setup_mac_ctrl()\nis marked as \"inline\":\n\nIt\u0027s not used in any place where speed would matter much, and as long as\nit has only one caller non-ancient gcc versions anyway inline it\nautomatically.\n\nThis patch fixes the following compile error with gcc 3.4:\n\n\u003c--  snip  --\u003e\n\n...\n  CC      drivers/net/atl1e/atl1e_main.o\natl1e_main.c: In function `atl1e_check_link\u0027:\natl1e_main.c:50: sorry, unimplemented: inlining failed in call to\natl1e_main.c:196: sorry, unimplemented: called from here\nmake[4]: *** [drivers/net/atl1e/atl1e_main.o] Error 1\n\n\u003c--  snip  --\u003e\n\nReported-by: Adrian Bunk \u003cbunk@kernel.org\u003e\nSigned-off-by: Adrian Bunk \u003cbunk@kernel.org\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n"
    },
    {
      "commit": "d6f8aa8586dabe605454f3c98a5c1a577c3e0cfb",
      "tree": "18043a736d2a6d33aab704128b601c3c90ed3895",
      "parents": [
        "b0e453902ad53580a77c2b1baddcc0b2d8ce8acc"
      ],
      "author": {
        "name": "Jeff Garzik",
        "email": "jeff@garzik.org",
        "time": "Tue Jul 22 21:17:38 2008 -0400"
      },
      "committer": {
        "name": "Jeff Garzik",
        "email": "jgarzik@redhat.com",
        "time": "Tue Jul 22 21:17:38 2008 -0400"
      },
      "message": "[netdrvr] atl1d: fix !CONFIG_PM build\n\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n"
    },
    {
      "commit": "a6a5325239c20202e18e21e94291bccc659fbf9e",
      "tree": "21c3208a8483fce3754222d80ade5ac5bd4f2d81",
      "parents": [
        "bb5d10ac8cc315d53306963001fe650d88a1cbb2"
      ],
      "author": {
        "name": "Jie Yang",
        "email": "jie.yang@atheros.com",
        "time": "Fri Jul 18 11:37:13 2008 +0800"
      },
      "committer": {
        "name": "Jeff Garzik",
        "email": "jgarzik@redhat.com",
        "time": "Tue Jul 22 19:31:04 2008 -0400"
      },
      "message": "atl1e: Atheros L1E Gigabit Ethernet driver\n\nFull patch for the Atheros L1E Gigabit Ethernet driver.\nSupportring AR8121, AR8113 and AR8114\n\nSigned-off-by: Jie Yang \u003cjie.yang @atheros.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n"
    }
  ]
}
