)]}' { "log": [ { "commit": "e8650a08232e75274304b812ff04cfce9af9671c", "tree": "0609c942e6ca99016e788ff2ee2bbed1bb9215a4", "parents": [ "3c2c4b73aa79e4a1b601710b59e092441175f4bb", "f70d4a95edc7da87f39cd8b603ba131df2c198ed" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 19:22:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 19:22:50 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\nPull trivial updates from Jiri Kosina:\n \"As usual, it\u0027s mostly typo fixes, redundant code elimination and some\n documentation updates.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (57 commits)\n edac, mips: don\u0027t change code that has been removed in edac/mips tree\n xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer\n lib: Change mail address of Oskar Schirmer\n net: Change mail address of Oskar Schirmer\n arm/m68k: Change mail address of Sebastian Hess\n i2c: Change mail address of Oskar Schirmer\n net: Fix tcp_build_and_update_options comment in struct tcp_sock\n atomic64_32.h: fix parameter naming mismatch\n Kconfig: replace \"--- help ---\" with \"---help---\"\n c2port: fix bogus Kconfig \"default no\"\n edac: Fix spelling errors.\n qla1280: Remove redundant NULL check before release_firmware() call\n remoteproc: remove redundant NULL check before release_firmware()\n qla2xxx: Remove redundant NULL check before release_firmware() call.\n aic94xx: Get rid of redundant NULL check before release_firmware() call\n tehuti: delete redundant NULL check before release_firmware()\n qlogic: get rid of a redundant test for NULL before call to release_firmware()\n bna: remove redundant NULL test before release_firmware()\n tg3: remove redundant NULL test before release_firmware() call\n typhoon: get rid of redundant conditional before all to release_firmware()\n ...\n" }, { "commit": "813a95e5b4fa936bbde10ef89188932745dcd7f4", "tree": "571ca345861ffb89b45fabe26fcab4e133c8537b", "parents": [ "9f639269ed1522c7d69c54cc8b80ab8ee53fcb10", "f3f08dcb9965f42378851ce888fb7539607712e6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:39:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:39:42 2012 -0700" }, "message": "Merge tag \u0027pinctrl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm soc-specific pinctrl changes from Olof Johansson:\n \"With this, five platforms are moving to the relatively new pinctrl\n subsystem for their pin management, replacing the older soc specific\n in-kernel interfaces with common code.\n\n There is quite a bit of net addition of code for each platform being\n added to the pinctrl subsystem. But the payback comes later when\n adding new boards can be done by only providing new device trees\n instead.\"\n\nFix up trivial conflicts in arch/arm/mach-ux500/{Makefile,board-mop500.c}\n\n* tag \u0027pinctrl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (61 commits)\n mtd: nand: gpmi: fix compile error caused by pinctrl call\n ARM: PRIMA2: select PINCTRL and PINCTRL_SIRF in Kconfig\n ARM: nomadik: enable PINCTRL_NOMADIK where needed\n ARM: mxs: enable pinctrl support\n video: mxsfb: adopt pinctrl support\n ASoC: mxs-saif: adopt pinctrl support\n i2c: mxs: adopt pinctrl support\n mtd: nand: gpmi: adopt pinctrl support\n mmc: mxs-mmc: adopt pinctrl support\n serial: mxs-auart: adopt pinctrl support\n serial: amba-pl011: adopt pinctrl support\n spi/imx: adopt pinctrl support\n i2c: imx: adopt pinctrl support\n can: flexcan: adopt pinctrl support\n net: fec: adopt pinctrl support\n ARM: ux500: switch MSP to using pinctrl for pins\n ARM: ux500: alter MSP registration to return a device pointer\n ARM: ux500: switch to using pinctrl for uart0\n ARM: ux500: delete custom pin control system\n ARM: ux500: switch over to Nomadik pinctrl driver\n ...\n" }, { "commit": "a53157c21c699c392921e243fa96abc27722f910", "tree": "5298e54022a20e86ef7fb5b782c131890cc231b8", "parents": [ "b2bccee1793ebcf47272fc6556e741a9fba896c7" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Sun May 06 20:25:13 2012 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Sat May 12 09:43:09 2012 +0800" }, "message": "can: flexcan: adopt pinctrl support\n\nCc: linux-can@vger.kernel.org\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nAcked-by: Dong Aisheng \u003cdong.aisheng@linaro.org\u003e\n" }, { "commit": "f24001941c99776f41bd3f09c07d91205c2ad9d4", "tree": "0ab31480ccdf343b61db045e195d096068ef7c73", "parents": [ "a108d5f35adc5c5d5cdc882dc0bb920565551bff", "4d634ca35a8b38530b134ae92bc9e3cc9c23c030" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 23 23:14:36 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 23 23:15:17 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nFix merge between commit 3adadc08cc1e (\"net ax25: Reorder ax25_exit to\nremove races\") and commit 0ca7a4c87d27 (\"net ax25: Simplify and\ncleanup the ax25 sysctl handling\")\n\nThe former moved around the sysctl register/unregister calls, the\nlater simply removed them.\n\nWith help from Stephen Rothwell.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "59bf896406471ac49d124b3e5f4edcafe28e5360", "tree": "40360c346a159f947d6284bf9c2fe38c70a7751c", "parents": [ "3773b4540721a2e8d4b957f4619ada4bf0bc8e45" ], "author": { "name": "Masanari Iida", "email": "standby24x7@gmail.com", "time": "Wed Apr 18 00:01:21 2012 +0900" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Apr 18 14:12:27 2012 +0200" }, "message": "Fix \"the the\" in various Kconfig\n\nFix typo \"the the\" in various Kconfig.\n\nSigned-off-by: Masanari Iida \u003cstandby24x7@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "a49bcabedc18319f673319d5e71b5751e3978179", "tree": "beefbfa8bee452e5876bff2fef0b49b397c1b332", "parents": [ "8a9a0ea6032186e3030419262678d652b88bf6a8" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Wed Apr 11 23:23:41 2012 +0200" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Mon Apr 16 21:34:50 2012 +0200" }, "message": "can: usb: PCAN-USB Pro: fix mem leaks in pcan_usb_pro_init() on error paths\n\nIf either call to pcan_usb_pro_send_req() in\ndrivers/net/can/usb/peak_usb/pcan_usb_pro.c::pcan_usb_pro_init()\nfails, we\u0027ll leak the memory we allocated to \u0027usb_if\u0027 with kzalloc()\nwhen the \u0027usb_if\u0027 variable goes out of scope without having been\nassigned to anything as we \u0027return err;\u0027.\nFix this by adding appropriate kfree(usb_if) calls to the error paths.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nAcked-by: Stephane Grosjean \u003cs.grosjean@peak-system.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "fb7944b36931d77ea2cde061ff714415ef6e4cef", "tree": "3d2cf39d8d7d607d0d482783f311841cb3f2424d", "parents": [ "a75afd4770d401186b130b2bbb58ad23d4d01ae3" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Sat Apr 14 12:38:43 2012 +0800" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Mon Apr 16 21:08:18 2012 +0200" }, "message": "net/can: use module_pci_driver\n\nThis patch converts the drivers in drivers/net/can/* to use\nmodule_pci_driver() macro which makes the code smaller and a bit simpler.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nCc: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nCc: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: linux-can@vger.kernel.org\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "06eb4eafbdc0796d741d139a44f1253278da8611", "tree": "fbdb44317130c371928154c9e6903e699fe2b995", "parents": [ "32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48", "f68e556e23d1a4176b563bcb25d8baf2c5313f91" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 10 14:30:45 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 10 14:30:45 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "31e0e328899af2ee677dbede5b236eb59b762444", "tree": "448b655ec6a10eaa15610b1442a4bfe8e10a9e84", "parents": [ "4e24ffa4d9fed762147c954755f8cb124e85740a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 01 20:21:11 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 02 04:33:42 2012 -0400" }, "message": "can: Stop using NLA_PUT*().\n\nThese macros contain a hidden goto, and are thus extremely error\nprone and make code hard to audit.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9ffc93f203c18a70623f21950f1dd473c9ec48cd", "tree": "1eb3536ae183b0bfbf7f5152a6fe4f430ae881c2", "parents": [ "96f951edb1f1bdbbc99b0cd458f9808bb83d58ae" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "message": "Remove all #inclusions of asm/system.h\n\nRemove all #inclusions of asm/system.h preparatory to splitting and killing\nit. Performed with the following command:\n\nperl -p -i -e \u0027s!^#\\s*include\\s*\u003casm/system[.]h\u003e.*\\n!!\u0027 `grep -Irl \u0027^#\\s*include\\s*\u003casm/system[.]h\u003e\u0027 *`\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "1ccba2103a8b3a1041f261301b08b9e16f76df8a", "tree": "4175fcc3a863d8f4f94873ff11bf32dc414f4478", "parents": [ "ae5d33723e325392c48bc0ff481d9ec8d646a0ed" ], "author": { "name": "Stephane Grosjean", "email": "s.grosjean@peak-system.com", "time": "Wed Mar 07 15:31:30 2012 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Wed Mar 07 15:51:01 2012 +0100" }, "message": "can: peak_usb: PCAN-USB specific part: fix little endian usage\n\nThat patch fixes some bad usage of two little-endian variables, which lead to\nsome warning/error when building the peak_usb driver.\n\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nSigned-off-by: Stephane Grosjean \u003cs.grosjean@peak-system.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "d8a199355f8f8a0797c00d98788d7282c9ea38bd", "tree": "011d2c16d02c8b257aca14aa20359d19612ce7d0", "parents": [ "46be265d3388339d8168c863791f0c7bbf3f2fed" ], "author": { "name": "Stephane Grosjean", "email": "s.grosjean@peak-system.com", "time": "Fri Mar 02 16:13:06 2012 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Sat Mar 03 17:40:58 2012 +0100" }, "message": "can: usb: PEAK-System Technik PCAN-USB Pro specific part\n\nThis patch adds the specific part which handles the PCAN-USB Pro adapter\nfrom PEAK-System Technik (http://www.peak-system.com). The PCAN-USB Pro\nadapter is a dual-channel USB 2.0 adapter compliant with CAN specifications\n\nTested-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: Stephane Grosjean \u003cs.grosjean@peak-system.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "46be265d3388339d8168c863791f0c7bbf3f2fed", "tree": "e330159305bebee1874001cc2815a8346b61a213", "parents": [ "bb4785551f64e18b2c8bb15a3bd2b22f5ebf624d" ], "author": { "name": "Stephane Grosjean", "email": "s.grosjean@peak-system.com", "time": "Fri Mar 02 16:13:05 2012 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Sat Mar 03 17:40:55 2012 +0100" }, "message": "can: usb: PEAK-System Technik PCAN-USB specific part\n\nThis patch adds the specific part which handles the PCAN-USB adapter from\nPEAK-System Technik (http://www.peak-system.com). The PCAN-USB adapter is\na sja1000 based, mono-channel USB 1.1 adapter compliant with CAN\nspecifications 2.0A (11-bit ID) and 2.0B (29-bit ID).\n\nTested-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: Stephane Grosjean \u003cs.grosjean@peak-system.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "bb4785551f64e18b2c8bb15a3bd2b22f5ebf624d", "tree": "4a515acc5afb744a15f202cfb62889767ec06ad4", "parents": [ "2b61972b74219d21ef1e91178349bdb840357688" ], "author": { "name": "Stephane Grosjean", "email": "s.grosjean@peak-system.com", "time": "Fri Mar 02 16:13:04 2012 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Sat Mar 03 17:40:51 2012 +0100" }, "message": "can: usb: PEAK-System Technik USB adapters driver core\n\nThis patch adds the core of the peak_usb driver which handles PEAK-System\nTechnik PCAN USB adapters. It defines the parts which are common to the\nPCAN-USB adapters: can network interfaces management, network-to/from-usb\ndata path interface, timestamps management...\n\nTested-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: Stephane Grosjean \u003cs.grosjean@peak-system.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "2b61972b74219d21ef1e91178349bdb840357688", "tree": "301fe796580eb42a04e5176f323617c62e97cf24", "parents": [ "e6d9c80b7ca1504411ad6d7acdb8683e4ae1c9cd" ], "author": { "name": "Stephane Grosjean", "email": "s.grosjean@peak-system.com", "time": "Fri Mar 02 16:21:20 2012 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Sat Mar 03 17:40:46 2012 +0100" }, "message": "can: sja1000: add support for PEAK-System PCMCIA card\n\nThis patch adds support to the PCAN-PC Card PCMCIA card from\nPEAK-System Technik (www.peak-system.com). This card is a CAN interface\nfor the PC Card slot. It is available as a single or dual-channel version.\n\nTested-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Stephane Grosjean \u003cs.grosjean@peak-system.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "e6d9c80b7ca1504411ad6d7acdb8683e4ae1c9cd", "tree": "0bb7a7b48fe5e79053b92708612ad1f10df0572c", "parents": [ "224223aaf9a44cd484019d2b765b6ca2beee6dd4" ], "author": { "name": "Stephane Grosjean", "email": "s.grosjean@peak-system.com", "time": "Fri Mar 02 16:21:19 2012 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Sat Mar 03 17:40:39 2012 +0100" }, "message": "can: peak_pci: add support of some new PEAK-System PCI cards\n\nThis patch adds the support of some new PEAK-System PCI cards in the CAN\nnetwork sub-system. These are:\n\nPCAN-PCIeC (PCI-ExpressCard)\nPCAN-mminiPCI (mini-PCI)\nPCAN-PCI (PCI next-gen)\n\nThis patch also adds the control of the blinking leds of the PCAN-PCIeC.\n\nTested-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: Stephane Grosjean \u003cs.grosjean@peak-system.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "224223aaf9a44cd484019d2b765b6ca2beee6dd4", "tree": "597cb38cc303a495ebf86a7b6d35b502e5ad715a", "parents": [ "b4017c5368f992fb8fb3a2545a0977082c6664e4" ], "author": { "name": "Danny Kukawka", "email": "danny.kukawka@bisect.de", "time": "Wed Feb 15 18:55:01 2012 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Sat Mar 03 17:40:32 2012 +0100" }, "message": "can: cc770: linux/can/dev.h included twice\n\ndrivers/net/can/cc770/cc770.c included \u0027linux/can/dev.h\u0027 twice,\nremove the duplicate.\n\nSigned-off-by: Danny Kukawka \u003cdanny.kukawka@bisect.de\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "ff4783ce78c08d2990126ce1874250ae8e72bbd2", "tree": "5c95885a4ab768101dd72942b57c238d452a7565", "parents": [ "622121719934f60378279eb440d3cec2fc3176d2", "203738e548cefc3fc3c2f73a9063176c9f3583d5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 26 21:55:51 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 26 21:55:51 2012 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tdrivers/net/ethernet/sfc/rx.c\n\nOverlapping changes in drivers/net/ethernet/sfc/rx.c, one to change\nthe rx_buf-\u003eis_page boolean into a set of u16 flags, and another to\nadjust how -\u003eip_summed is initialized.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a7762b10c12a70c5dbf2253142764b728ac88c3a", "tree": "dd2dba7c245118fee835fb72935ff885e7fddda8", "parents": [ "64f0a836f600e9c31ffd511713ab5d328aa96ac8" ], "author": { "name": "Oliver Hartkopp", "email": "socketcan@hartkopp.net", "time": "Wed Feb 15 17:51:56 2012 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Mon Feb 20 11:36:56 2012 +0100" }, "message": "can: sja1000: fix isr hang when hw is unplugged under load\n\nIn the case of hotplug enabled devices (PCMCIA/PCIeC) the removal of the\nhardware can cause an infinite loop in the common sja1000 isr.\n\nUse the already retrieved status register to indicate a possible hardware\nremoval and double check by reading the mode register in sja1000_is_absent.\n\nCc: stable@kernel.org [3.2+]\nSigned-off-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "d07d4c239bbf428db5581ccd5ca3770bbd15bfbd", "tree": "969df78fbbc76b9ff1289e154b641a06f983569b", "parents": [ "dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb", "aabdfd6adb804d0aaba0188ade0f1afe42a52e31" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 04 16:42:19 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 04 16:42:19 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://gitorious.org/linux-can/linux-can-next\n\nConflicts:\n\tdrivers/net/can/usb/ems_usb.c\n\nMinor dev_warn --\u003e netdev_warn conversion conflicts.\n" }, { "commit": "dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb", "tree": "f16ace0ae09edab16bf6d0be9e8280dfbb7100da", "parents": [ "8d9eb069eafce49307f839783e4a4673414b1fd5", "5962b35c1de3254a2f03b95efd3b7854b874d7b7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 04 16:39:32 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 04 16:39:32 2012 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "aabdfd6adb804d0aaba0188ade0f1afe42a52e31", "tree": "b329ab5b070c5340f60bc1d125e1655d340ee457", "parents": [ "79d0d8a7d5edca459f544c2ad75088e99307795e" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Wed Feb 01 11:02:05 2012 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Fri Feb 03 01:21:26 2012 +0100" }, "message": "can: replace the dev_dbg/info/err/... with the new netdev_xxx macros\n\nCc: uclinux-dist-devel@blackfin.uclinux.org\nCc: Anant Gole \u003canantgole@ti.com\u003e\nCc: Chris Elston \u003ccelston@katalix.com\u003e\nCc: Sebastian Haas \u003chaas@ems-wuensche.com\u003e\nCc: Matthias Fuchs \u003cmatthias.fuchs@esd.eu\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nAcked-by: Sebastian Haas \u003cdev@sebastianhaas.info\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "79d0d8a7d5edca459f544c2ad75088e99307795e", "tree": "97126b05dd6906f42ce717ba97f5ac9361bfaecb", "parents": [ "03c49daa8168b58e6256f0cad88771b9440ca5f7" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Wed Feb 01 11:14:13 2012 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Fri Feb 03 01:21:26 2012 +0100" }, "message": "can: bfin_can/ti_hecc/mscan: add missing do_get_berr_counter callback\n\nCc: Anant Gole \u003canantgole@ti.com\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "03c49daa8168b58e6256f0cad88771b9440ca5f7", "tree": "95ba97d581c47b536084bb945f378a461c3ee06c", "parents": [ "74b5127884d76ccbf4f445f650f9e969ccb4a374" ], "author": { "name": "Tomoya MORINAGA", "email": "tomoya.rohm@gmail.com", "time": "Fri Jan 27 20:05:22 2012 +0900" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Fri Feb 03 01:21:26 2012 +0100" }, "message": "can: Kconfig: add more information about Intel EG20T PCH CAN controller\n\nCurrent menu description, not easy to understand what the description\nmeans. So, add information about the device.\n\nSigned-off-by: Tomoya MORINAGA \u003ctomoya.rohm@gmail.com\u003e\n[mkl: Added space before opening parentheses in Kconfig.\n Make commit message more descriptive.]\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "74b5127884d76ccbf4f445f650f9e969ccb4a374", "tree": "1418d8aaf4071647f5e3b6cc3a4af887493058a6", "parents": [ "e08534b57e79fa722e3136b79868a725a8eea0f0" ], "author": { "name": "Tomoya MORINAGA", "email": "tomoya.rohm@gmail.com", "time": "Fri Jan 27 20:05:21 2012 +0900" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Fri Feb 03 01:21:25 2012 +0100" }, "message": "can: pch_can: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor\n\nOn October 1 in 2011,\n OKI SEMICONDUCTOR Co., Ltd. changed the company name in to LAPIS Semiconductor\n\nSigned-off-by: Tomoya MORINAGA \u003ctomoya.rohm@gmail.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "e08534b57e79fa722e3136b79868a725a8eea0f0", "tree": "927f73b51ac38077cda3f430c9f9b91ba92f14da", "parents": [ "2ee6850ca0cac95101d2a36c8b186b40d4fc7311" ], "author": { "name": "James Kime", "email": "kime@ixxat.de", "time": "Mon Dec 12 13:45:58 2011 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Fri Feb 03 01:21:25 2012 +0100" }, "message": "can: plx_pci: add support for IXXAT PCI cards\n\nThis patch adds support for IXXAT passive CAN controllers\n\nSigned-off-by: James Kime \u003ckime@ixxat.de\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "2ee6850ca0cac95101d2a36c8b186b40d4fc7311", "tree": "002e25689ba79cab63cdcde606c0f7f9e6b1d1da", "parents": [ "9a12349663061d25b49e6542d005fa7193a2cb44" ], "author": { "name": "Sebastian Haas", "email": "dev@sebastianhaas.info", "time": "Thu Dec 22 23:58:34 2011 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Fri Feb 03 01:21:25 2012 +0100" }, "message": "can: ems_usb: Improved memory handling on ems_usb_start\n\nDo not return from ems_usb_start if allocation fails. If not all URBs\ncould be allocated use the one already submitted.\n\nSigned-off-by: Sebastian Haas \u003cdev@sebastianhaas.info\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "9a12349663061d25b49e6542d005fa7193a2cb44", "tree": "210da3ec770010d9e814a368de051ad01e0e6bb3", "parents": [ "cf5046b309b3a05c444a8edba6b44108510b7d7d" ], "author": { "name": "Reuben Dowle", "email": "Reuben.Dowle@navico.com", "time": "Tue Nov 01 11:18:03 2011 +1300" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Fri Feb 03 01:21:25 2012 +0100" }, "message": "can: flexcan: Fix CAN_RAW_RECV_OWN_MSGS and CAN_RAW_LOOPBACK\n\nCurrently the flexcan driver uses hardware local echo. This blindly\nechos all transmitted frames to all receiving sockets, regardless what\nCAN_RAW_RECV_OWN_MSGS and CAN_RAW_LOOPBACK are set to.\n\nThis patch now submits transmitted frames to be echoed in the transmit\ncomplete interrupt, preserving the reference to the sending\nsocket. This allows the can protocol to correctly handle the local\necho.\n\nFurther this patch moves tx_bytes statistic accounting into the tx_complete\nhandler.\n\nSigned-off-by: Reuben Dowle \u003creuben.dowle@navico.com\u003e\n[mkl: move tx_bytes accounting into tx_complete handler; cleanups]\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "cf5046b309b3a05c444a8edba6b44108510b7d7d", "tree": "f0603d9caf8d3ce1050447c8817dfed25452eca8", "parents": [ "f84cbda06f79f05b748707b33b925b50c2fedc84" ], "author": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Mon Oct 10 23:43:53 2011 +0200" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Fri Feb 03 01:21:25 2012 +0100" }, "message": "can: dev: let can_get_echo_skb() return dlc of CAN frame\n\ncan_get_echo_skb() is usually called in the TX complete handler.\nThe stats-\u003etx_packets and stats-\u003etx_bytes should be updated there, too.\nThis patch simplifies to figure out the size of the sent CAN frame.\n\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "f84cbda06f79f05b748707b33b925b50c2fedc84", "tree": "80e13e6acb403b1af8f189bf90799c12fc7954c6", "parents": [ "e1f4c485cdb2b1d7aae172b731f6c2b403381ebb" ], "author": { "name": "Sebastian Haas", "email": "dev@sebastianhaas.info", "time": "Thu Dec 22 23:57:49 2011 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Fri Feb 03 01:20:51 2012 +0100" }, "message": "can: ems_usb: Removed double netif_device_detach\n\nnetif_device_attched is called twice when ems_usb_start fails with -ENODEV\n\nSigned-off-by: Sebastian Haas \u003cdev@sebastianhaas.info\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "29830406415c227a54af429d7b300aabd4754237", "tree": "9cc1aa1db2647819273ff7b8b74840327da534c0", "parents": [ "d0a71a7e6de0e0ce9f86c8ba6e13414a9df63e0b" ], "author": { "name": "Stephane Grosjean", "email": "s.grosjean@peak-system.com", "time": "Wed Feb 01 11:05:48 2012 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Fri Feb 03 00:26:27 2012 +0100" }, "message": "can: peak_pci: Fix the way channels are linked together\n\nChange the way channels objects are linked together by peak_pci_probe()\navoiding any kernel oops when driver is removed. Side effect is that\nthe list is now browsed from last to first channel.\n\nSigned-off-by: Stephane Grosjean \u003cs.grosjean@peak-system.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "d0a71a7e6de0e0ce9f86c8ba6e13414a9df63e0b", "tree": "650e1a68242a6bc949492359e50ede968ef27ff1", "parents": [ "44b0052c5cb4e75389ed3eb9e98c29295a7dadfb" ], "author": { "name": "Sebastian Haas", "email": "dev@sebastianhaas.info", "time": "Thu Dec 22 23:57:49 2011 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Fri Feb 03 00:25:31 2012 +0100" }, "message": "can: ems_usb: Removed double netif_device_detach\n\nnetif_device_attched is called twice when ems_usb_start fails with -ENODEV\n\nSigned-off-by: Sebastian Haas \u003cdev@sebastianhaas.info\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "44b0052c5cb4e75389ed3eb9e98c29295a7dadfb", "tree": "6ad88cbbf1b75e65f98220e449b62ac1acb387d1", "parents": [ "e3f240f460a36b158217944b52a85f304914c1a6" ], "author": { "name": "Xi Wang", "email": "xi.wang@gmail.com", "time": "Mon Dec 12 02:16:20 2011 -0500" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Fri Feb 03 00:25:22 2012 +0100" }, "message": "can: pch_can: fix error passive level test\n\nThe test (((errc \u0026 PCH_REC) \u003e\u003e 8) \u003e 127) would always be false because\nthe receive error counter ((errc \u0026 PCH_REC) \u003e\u003e 8) is at most 127, where\nPCH_REC is defined as 0x7f00. To test whether the receive error counter\nhas reached the error passive level, the RP bit (15) should be used.\n\nSigned-off-by: Xi Wang \u003cxi.wang@gmail.com\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "e3f240f460a36b158217944b52a85f304914c1a6", "tree": "bcdfad758df83296f712a6479fe412ac2178fb33", "parents": [ "2d5091e08c684912ed6b9ca03d1f7b01501b7bf6" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Wed Feb 01 10:50:23 2012 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Fri Feb 03 00:25:15 2012 +0100" }, "message": "can: ti_hecc: use netif_rx in the interrupt\n\nThis patch fixes locking problems by using netif_rx() instead of\nnetif_receive_skb() in ti_hecc_error() called from the interrupt\ncontext.\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "2d5091e08c684912ed6b9ca03d1f7b01501b7bf6", "tree": "62ae0aca80b9fd4d219e5ab4c7ba5ea37dc6613c", "parents": [ "7bb4db93ae59e0faf810a83a8578f56bc968ab01" ], "author": { "name": "Wolfgang Zarre", "email": "lkdev@essax.com", "time": "Sun Jan 15 13:21:34 2012 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Fri Feb 03 00:25:06 2012 +0100" }, "message": "can: cc770: Fix indirect access deadlock on ISA cards\n\nThis fix avoids a deadlock if an interrupt occurs\nduring consecutive port operations on ISA cards\nutilising indirect access via address and data\nport.\n\nTested on a B\u0026R ISA card.\n\nCc: linux-can@vger.kernel.org\nCc: netdev@vger.kernel.org\nSigned-off-by: Wolfgang Zarre \u003clkdev@essax.com\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "7bb4db93ae59e0faf810a83a8578f56bc968ab01", "tree": "416de109d52a28d60759d0dd44b18416a8c4d445", "parents": [ "6e9d554fa6e481a848358c215f129432262123c0" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Mon Dec 12 16:07:16 2011 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Fri Feb 03 00:24:59 2012 +0100" }, "message": "can: cc770: store echo skb before starting the transfer\n\nOn slow systems and high CAN bitrates, the error message\n\"can_put_echo_skb: BUG! echo_skb is occupied!\" did show up because\ncan_put_echo_skb() was called after starting the transfer.\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "6e9d554fa6e481a848358c215f129432262123c0", "tree": "74929f3f9fe8e3108f214ad28d60bbbb4762ca8b", "parents": [ "ba7605745d5c99f0e71b3ec6c7cb5ed6afe540ad" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Mon Dec 12 16:09:28 2011 +0100" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Fri Feb 03 00:24:50 2012 +0100" }, "message": "can: flexcan: fix irq flooding by clearing all interrupt sources\n\nAs pointed out by Reuben Dowle and Lothar Waßmann, the TWRN_INT,\nRWRN_INT, BOFF_INT interrupt sources need to be cleared as well\nto avoid interrupt flooding, at least for the Flexcan on i.MX28\nSOCs. Furthermore, the interrupts are only cleared, if really one\nof those interrupt sources are pending (which is not the case for\nrx and tx done).\n\nCc: Reuben Dowle \u003cReuben.Dowle@navico.com\u003e\nCc: Lothar Waßmann \u003cLW@KARO-electronics.de\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "e404decb0fb017be80552adee894b35307b6c7b4", "tree": "19b2324328eb1f8cef599f9f164dc9ca6e5699c9", "parents": [ "5f3d9cb2962967d9d7e03abb4a7ca275a9a3fea5" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jan 29 12:56:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 31 16:20:21 2012 -0500" }, "message": "drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages\n\nalloc failures use dump_stack so emitting an additional\nout-of-memory message is an unnecessary duplication.\n\nRemove the allocation failure messages.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3396c7823efb3a5b8630388c464e1034ea031ced", "tree": "35a61f96c9c4fe1a2e191b78d93e6cdaa1e95596", "parents": [ "e94d5b7aec6a93d8ed3b9fc8e1c75285351eb17e" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri Jan 27 13:36:01 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 30 12:54:40 2012 -0500" }, "message": "drivers/net: fix up stale paths from driver reorg\n\nThe reorganization of the driver layout in drivers/net\nleft behind some stale paths in comments and in Kconfig\nhelp text. Bring them up to date. No actual change to\nany code takes place here.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nCC: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "979ecef5b89a8003902299566d9cdc08de34a3ee", "tree": "2a695d557adab1dec5263f014789f5b59238bac8", "parents": [ "e8cbce976050a9f874a8b07012ddeb9b9eb59603", "8c3b2296f1aa13d7504d2c09bc819cef3759562a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:44:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:44:15 2012 -0800" }, "message": "Merge tag \u0027clk\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nclock management changes for i.MX\n\nAnother simple series related to clock management, this time only for\nimx.\n\n* tag \u0027clk\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: mxs: select HAVE_CLK_PREPARE for clock\n clk: add config option HAVE_CLK_PREPARE into Kconfig\n ASoC: mxs-saif: convert to clk_prepare/clk_unprepare\n video: mxsfb: convert to clk_prepare/clk_unprepare\n serial: mxs-auart: convert to clk_prepare/clk_unprepare\n net: flexcan: convert to clk_prepare/clk_unprepare\n mtd: gpmi-lib: convert to clk_prepare/clk_unprepare\n mmc: mxs-mmc: convert to clk_prepare/clk_unprepare\n dma: mxs-dma: convert to clk_prepare/clk_unprepare\n net: fec: add clk_prepare/clk_unprepare\n ARM: mxs: convert platform code to clk_prepare/clk_unprepare\n clk: add helper functions clk_prepare_enable and clk_disable_unprepare\n\nFix up trivial conflicts in drivers/net/ethernet/freescale/fec.c due to\ncommit 0ebafefcaa7a (\"net: fec: add clk_prepare/clk_unprepare\") clashing\ntrivially with commit e163cc97f9ac (\"net/fec: fix the .remove code\").\n" }, { "commit": "7affca3537d74365128e477b40c529d6f2fe86c8", "tree": "20be92bd240029182fc89c2c4f25401b7715dcae", "parents": [ "356b95424cfb456e14a59eaa579422ce014c424b", "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\n* \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits)\n arm: fix up some samsung merge sysdev conversion problems\n firmware: Fix an oops on reading fw_priv-\u003efw in sysfs loading file\n Drivers:hv: Fix a bug in vmbus_driver_unregister()\n driver core: remove __must_check from device_create_file\n debugfs: add missing #ifdef HAS_IOMEM\n arm: time.h: remove device.h #include\n driver-core: remove sysdev.h usage.\n clockevents: remove sysdev.h\n arm: convert sysdev_class to a regular subsystem\n arm: leds: convert sysdev_class to a regular subsystem\n kobject: remove kset_find_obj_hinted()\n m86k: gpio - convert sysdev_class to a regular subsystem\n mips: txx9_sram - convert sysdev_class to a regular subsystem\n mips: 7segled - convert sysdev_class to a regular subsystem\n sh: dma - convert sysdev_class to a regular subsystem\n sh: intc - convert sysdev_class to a regular subsystem\n power: suspend - convert sysdev_class to a regular subsystem\n power: qe_ic - convert sysdev_class to a regular subsystem\n power: cmm - convert sysdev_class to a regular subsystem\n s390: time - convert sysdev_class to a regular subsystem\n ...\n\nFix up conflicts with \u0027struct sysdev\u0027 removal from various platform\ndrivers that got changed:\n - arch/arm/mach-exynos/cpu.c\n - arch/arm/mach-exynos/irq-eint.c\n - arch/arm/mach-s3c64xx/common.c\n - arch/arm/mach-s3c64xx/cpu.c\n - arch/arm/mach-s5p64x0/cpu.c\n - arch/arm/mach-s5pv210/common.c\n - arch/arm/plat-samsung/include/plat/cpu.h\n - arch/powerpc/kernel/sysfs.c\nand fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h\n" }, { "commit": "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df", "tree": "d851c923f85566572112d4c0f884cff388a3cc05", "parents": [ "805a6af8dba5dfdd35ec35dc52ec0122400b2610", "ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 into Linux 3.2\n\nThis resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,\nand it fixes the build error in the arch/x86/kernel/microcode_core.c\nfile, that the merge did not catch.\n\nThe microcode_core.c patch was provided by Stephen Rothwell\n\u003csfr@canb.auug.org.au\u003e who was invaluable in the merge issues involved\nwith the large sysdev removal process in the driver-core tree.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "e735489976c356a189f7332e6ff4b0dee2ede434", "tree": "56ac9a3c9bb130ca68d173fd950837782b8983d3", "parents": [ "f1f802c9026da6774a72963178ff7435f539fb09" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Tue Dec 20 14:05:52 2011 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Wed Dec 28 21:30:47 2011 +0800" }, "message": "net: flexcan: convert to clk_prepare/clk_unprepare\n\nThe patch converts flexcan driver to clk_prepare/clk_unprepare by\nusing helper functions clk_prepare_enable/clk_disable_unprepare.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nCc: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb93992207dadb946a3b5cf4544957dc924a6f58", "tree": "8d840ea0e0e5eb3cf6207a2608d434475a9076b4", "parents": [ "3db1cd5c05f35fb43eb134df6f321de4e63141f2" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Dec 19 14:08:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 19 22:27:29 2011 -0500" }, "message": "module_param: make bool parameters really bool (net \u0026 drivers/net)\n\nmodule_param(bool) used to counter-intuitively take an int. In\nfddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy\ntrick.\n\nIt\u0027s time to remove the int/unsigned int option. For this version\nit\u0027ll simply give a warning, but it\u0027ll break next kernel version.\n\n(Thanks to Joe Perches for suggesting coccinelle for 0/1 -\u003e true/false).\n\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: netdev@vger.kernel.org\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e285e44d91fe5a89e0d9fe4f5dda4f9e8c8a3c7e", "tree": "71cb2e9689c289a533a63f0fb6e732988dc92b57", "parents": [ "edd2c26ffb7742bf0d3bd324694d220281844a01" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Wed Nov 30 23:41:20 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 01 13:09:31 2011 -0500" }, "message": "can: cc770: add platform bus driver for the CC770 and AN82527\n\nThis driver works with both, static platform data and device tree\nbindings. It has been tested on a TQM855L board with two AN82527\nCAN controllers on the local bus.\n\nCC: Devicetree-discuss@lists.ozlabs.org\nCC: linuxppc-dev@ozlabs.org\nCC: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "edd2c26ffb7742bf0d3bd324694d220281844a01", "tree": "33d00224c3cd59439176fb3ca122747c5034f444", "parents": [ "2a367c3a82557cd11a04949ef2160658987fa772" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Wed Nov 30 23:41:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 01 13:09:31 2011 -0500" }, "message": "can: cc770: add legacy ISA bus driver for the CC770 and AN82527\n\nThis patch adds support for legacy Bosch CC770 and Intel AN82527 CAN\ncontrollers on the ISA or PC-104 bus. The I/O port or memory address\nand the IRQ number must be specified via module parameters:\n\n insmod cc770_isa.ko port\u003d0x310,0x380 irq\u003d7,11\n\nfor ISA devices using I/O ports or:\n\n insmod cc770_isa.ko mem\u003d0xd1000,0xd1000 irq\u003d7,11\n\nfor memory mapped ISA devices.\n\nIndirect access via address and data port is supported as well:\n\n insmod cc770_isa.ko port\u003d0x310,0x380 indirect\u003d1 irq\u003d7,11\n\nFurthermore, the following mode parameter can be defined:\n\n clk: External oscillator clock frequency (default\u003d16000000 [16 MHz])\n cir: CPU interface register (default\u003d0x40 [DSC])\n bcr: Bus configuration register (default\u003d0x40 [CBY])\n cor: Clockout register (default\u003d0x00)\n\nNote: for clk, cir, bcr and cor, the first argument re-defines the\ndefault for all other devices, e.g.:\n\n insmod cc770_isa.ko mem\u003d0xd1000,0xd1000 irq\u003d7,11 clk\u003d24000000\n\nis equivalent to\n\n insmod cc770_isa.ko mem\u003d0xd1000,0xd1000 irq\u003d7,11 clk\u003d24000000,24000000\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a367c3a82557cd11a04949ef2160658987fa772", "tree": "bec35118af9683ded1f4a8430fa66a9d63d78ed7", "parents": [ "d7d75960ea74e524d75ba8b067523471f39a7bf3" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Wed Nov 30 23:41:18 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 01 13:09:31 2011 -0500" }, "message": "can: cc770: add driver core for the Bosch CC770 and Intel AN82527\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "de565664041d954b60f87e3d576a784cf25672d0", "tree": "09415cad71cd51359b259ffcd34dbcd1a27eb61f", "parents": [ "ec2a5466b3ce680c92e8e05617b020fd825854b9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 30 16:00:48 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 30 16:01:46 2011 -0500" }, "message": "can: Revert outdated cc770 driver patches.\n\nNewer versions have been floating about, and I applied\nto older variant unfortunately.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7e02e5433e004713a89f5f865a243133b55dcc88", "tree": "4a81ab2de7a37d187bc6d580bf8a07b7dcf83ee5", "parents": [ "b440752d5dc9255195bb15152facef093c30fbac" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Thu Nov 24 02:07:28 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 18:38:48 2011 -0500" }, "message": "can: cc770: legacy CC770 ISA bus driver\n\nThis patch adds support for legacy Bosch CC770 and Intel AN82527 CAN\ncontrollers on the ISA or PC-104 bus. The I/O port or memory address\nand the IRQ number must be specified via module parameters:\n\n insmod cc770_isa.ko port\u003d0x310,0x380 irq\u003d7,11\n\nfor ISA devices using I/O ports or:\n\n insmod cc770_isa.ko mem\u003d0xd1000,0xd1000 irq\u003d7,11\n\nfor memory mapped ISA devices.\n\nIndirect access via address and data port is supported as well:\n\n insmod cc770_isa.ko port\u003d0x310,0x380 indirect\u003d1 irq\u003d7,11\n\nFurthermore, the following mode parameter can be defined:\n\n clk: External oscillator clock frequency (default\u003d16000000 [16 MHz])\n cir: CPU interface register (default\u003d0x40 [CPU_DSC])\n ocr, Bus configuration register (default\u003d0x00)\n cor, Clockout register (default\u003d0x00)\n\nNote: for clk, cir, bcr and cor, the first argument re-defines the\ndefault for all other devices, e.g.:\n\n insmod cc770_isa.ko mem\u003d0xd1000,0xd1000 irq\u003d7,11 clk\u003d24000000\n\nis equivalent to\n\n insmod cc770_isa.ko mem\u003d0xd1000,0xd1000 irq\u003d7,11 clk\u003d24000000,24000000\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b440752d5dc9255195bb15152facef093c30fbac", "tree": "0d6370d1faa3635fde710cf60aadd315f7b22fac", "parents": [ "c7e963f6888816f04d1f5da0e07bec4e0092f227" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Thu Nov 24 02:07:27 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 18:38:47 2011 -0500" }, "message": "can: cc770: add driver core for the Bosch CC770 and Intel AN82527\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1839a6c6f1eb8c0e20dc87d57024a85707f1a2f8", "tree": "0c00692dd88faf21efe74716fe4781c7bb15df29", "parents": [ "e92036a6516d07f61d4c214970a35ff05b919c25" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Wed Nov 23 23:58:22 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 18:35:51 2011 -0500" }, "message": "can: sja1000_isa: convert to platform driver to support x86_64 systems\n\nThis driver is currently not supported on x86_64 systems because the\n\"isa_driver\" interface is used (CONFIG_ISA\u003dy). To overcome this\nlimitation, the driver is converted to a platform driver, similar to\nthe serial 8250 driver.\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "115d2a3de2fd7d501369b0091c5c485a72ed90ed", "tree": "f105e25d86411043aa2d8309661e336131d0f719", "parents": [ "6977a79d36baf8b295b1893621874202e1d02094" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Wed Nov 23 23:08:35 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 18:28:55 2011 -0500" }, "message": "can: sja1000_isa: fix \"limited range\" compiler warnings\n\nThis patch fixes the compiler warnings: \"comparison is always\nfalse due to limited range of data type\" by using \"0xff\" instead\nof \"-1\" for unsigned values.\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "871d33725545ca2e402b4526f38f89d041ba930f", "tree": "fb52710f1208db2a85d8080c38038c58804c8487", "parents": [ "0f20f5a7de1ee48ced284e960828017cc2f5d52b" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Sun Nov 27 15:42:31 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 00:25:05 2011 -0500" }, "message": "net/can: convert drivers/net/can/* to use module_platform_driver()\n\nThis patch converts the drivers in drivers/net/can/* to use the\nmodule_platform_driver() macro which makes the code smaller and a bit\nsimpler.\n\nCc: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Bhupesh Sharma \u003cbhupesh.sharma@st.com\u003e\nCc: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Anatolij Gustschin \u003cagust@denx.de\u003e\nCc: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nCc: Kurt Van Dijck \u003ckurt.van.dijck@eia.be\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c", "tree": "cd71e597bbbe677820bb229c6aedbad412758959", "parents": [ "d6f03f29f7cdf064289f941bf0b838348e996e65", "fc0b927d9a5024e138c4318fe19a590f23e3eeec" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:47:03 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:47:03 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tnet/ipv4/inet_diag.c\n" }, { "commit": "fbe54e3b7a7ad7de92b65e8b10fae300eeec6ef3", "tree": "73fe3bc116e6c708ce9b744450131dd1a440b8ae", "parents": [ "5ccb3ea72097ee0c8ea1f200a2ade101caf08aa4" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Sun Nov 20 11:07:09 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 21 16:43:53 2011 -0500" }, "message": "net, sja1000: Don\u0027t include version.h in peak_pci.c when not needed\n\nIt was pointed out by \"make versioncheck\" that we do not need to include\nversion.h in drivers/net/can/sja1000/peak_pci.c\nThis patch removes the unneeded include.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d632eb1bf22e11def74e4e53cc47d790fbdba105", "tree": "3cc5f929264ac1c3cffd9646f8ebdaf4e5a9fd33", "parents": [ "bac2c126e452eb00f91305ba2c04a8b2bd95acf0" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Nov 18 09:44:20 2011 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Nov 18 09:44:20 2011 -0800" }, "message": "USB: convert drivers/net/* to use module_usb_driver()\n\nThis converts the drivers in drivers/net/* to use the\nmodule_usb_driver() macro which makes the code smaller and a bit\nsimpler.\n\nAdded bonus is that it removes some unneeded kernel log messages about\ndrivers loading and/or unloading.\n\nCc: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nCc: Samuel Ortiz \u003csamuel@sortiz.org\u003e\nCc: Oliver Neukum \u003coliver@neukum.name\u003e\nCc: Peter Korsgaard \u003cjacmet@sunsite.dk\u003e\nCc: Petko Manolov \u003cpetkan@users.sourceforge.net\u003e\nCc: Steve Glendinning \u003csteve.glendinning@smsc.com\u003e\nCc: Christian Lamparter \u003cchunkeey@googlemail.com\u003e\nCc: \"John W. Linville\" \u003clinville@tuxdriver.com\u003e\nCc: Dan Williams \u003cdcbw@redhat.com\u003e\nCc: Jussi Kivilinna \u003cjussi.kivilinna@mbnet.fi\u003e\nCc: Ivo van Doorn \u003cIvDoorn@gmail.com\u003e\nCc: Gertjan van Wingerde \u003cgwingerde@gmail.com\u003e\nCc: Helmut Schaa \u003chelmut.schaa@googlemail.com\u003e\nCc: Herton Ronaldo Krzesinski \u003cherton@canonical.com\u003e\nCc: Hin-Tak Leung \u003chtl10@users.sourceforge.net\u003e\nCc: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nCc: Chaoming Li \u003cchaoming_li@realsil.com.cn\u003e\nCc: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Roel Kluin \u003croel.kluin@gmail.com\u003e\nCc: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nCc: Jiri Pirko \u003cjpirko@redhat.com\u003e\nCc: Pavel Roskin \u003cproski@gnu.org\u003e\nCc: Yoann DI-RUZZA \u003cy.diruzza@lim.eu\u003e\nCc: George \u003cgeorge0505@realtek.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "34324dc2bf27c1773045fea63cb11f7e2a6ad2b9", "tree": "47cd1f4ea5590c405dc60aee70b49fb14f56859b", "parents": [ "a861a8b233e9024303fb8e73e465e81ad7119d5a" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Tue Nov 15 15:29:55 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 16 17:43:12 2011 -0500" }, "message": "net: remove NETIF_F_NO_CSUM feature bit\n\nOnly distinct use is checking if NETIF_F_NOCACHE_COPY should be\nenabled by default. The check heuristics is altered a bit here,\nso it hits other people than before. The default shouldn\u0027t be\ntrusted for performance-critical cases anyway.\n\nFor all other uses NETIF_F_NO_CSUM is equivalent to NETIF_F_HW_CSUM.\n\nSigned-off-by: Michał Mirosław \u003cmirq-linux@rere.qmqm.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "abbd00b82a2771b0460ba2cffdb1343aa827ccde", "tree": "a90d2c5f10d362e47cee8e6f193a23a179451137", "parents": [ "612a94d6f24eb2427eabf554392080302da664dd" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Mon Nov 14 14:30:05 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 14 14:30:05 2011 -0500" }, "message": "net/can/mscan: Fix buggy listen only mode setting\n\nThis patch fixes an issue introduced recently with commit\n452448f9283e1939408b397e87974a418825b0a8.\n\nCC: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "452448f9283e1939408b397e87974a418825b0a8", "tree": "8c4a3f41eff61985f1afc53149ad10538e3df3ea", "parents": [ "8b5c171bb3dc0686b2647a84e990199c5faa9ef8" ], "author": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Wed Nov 09 10:50:49 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 14 00:51:22 2011 -0500" }, "message": "net/can/mscan: add listen only mode\n\nThis patch adds listen only mode to the mscan controller.\n\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8a9ea3237e7eb5c25f09e429ad242ae5a3d5ea22", "tree": "a0a63398a9983667d52cbbbf4e2405b4f22b1d83", "parents": [ "1be025d3cb40cd295123af2c394f7229ef9b30ca", "8b3408f8ee994973869d8ba32c5bf482bc4ddca4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 13:25:22 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 13:25:22 2011 +0200" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)\n dp83640: free packet queues on remove\n dp83640: use proper function to free transmit time stamping packets\n ipv6: Do not use routes from locally generated RAs\n |PATCH net-next] tg3: add tx_dropped counter\n be2net: don\u0027t create multiple RX/TX rings in multi channel mode\n be2net: don\u0027t create multiple TXQs in BE2\n be2net: refactor VF setup/teardown code into be_vf_setup/clear()\n be2net: add vlan/rx-mode/flow-control config to be_setup()\n net_sched: cls_flow: use skb_header_pointer()\n ipv4: avoid useless call of the function check_peer_pmtu\n TCP: remove TCP_DEBUG\n net: Fix driver name for mdio-gpio.c\n ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT\n rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces\n ipv4: fix ipsec forward performance regression\n jme: fix irq storm after suspend/resume\n route: fix ICMP redirect validation\n net: hold sock reference while processing tx timestamps\n tcp: md5: add more const attributes\n Add ethtool -g support to virtio_net\n ...\n\nFix up conflicts in:\n - drivers/net/Kconfig:\n\tThe split-up generated a trivial conflict with removal of a\n\tstale reference to Documentation/networking/net-modules.txt.\n\tRemove it from the new location instead.\n - fs/sysfs/dir.c:\n\tFairly nasty conflicts with the sysfs rb-tree usage, conflicting\n\twith Eric Biederman\u0027s changes for tagged directories.\n" }, { "commit": "59e52534172d845ebffb0d7e85fc56fb7b857051", "tree": "49552e03f1bdb413cd8b5f7542e91770688d7047", "parents": [ "73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26", "0d89e54c8249645404283436d952afc261a04e1e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 12:11:02 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 12:11:02 2011 +0200" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)\n MAINTAINERS: linux-m32r is moderated for non-subscribers\n linux@lists.openrisc.net is moderated for non-subscribers\n Drop default from \"DM365 codec select\" choice\n parisc: Kconfig: cleanup Kernel page size default\n Kconfig: remove redundant CONFIG_ prefix on two symbols\n cris: remove arch/cris/arch-v32/lib/nand_init.S\n microblaze: add missing CONFIG_ prefixes\n h8300: drop puzzling Kconfig dependencies\n MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers\n tty: drop superfluous dependency in Kconfig\n ARM: mxc: fix Kconfig typo \u0027i.MX51\u0027\n Fix file references in Kconfig files\n aic7xxx: fix Kconfig references to READMEs\n Fix file references in drivers/ide/\n thinkpad_acpi: Fix printk typo \u0027bluestooth\u0027\n bcmring: drop commented out line in Kconfig\n btmrvl_sdio: fix typo \u0027btmrvl_sdio_sd6888\u0027\n doc: raw1394: Trivial typo fix\n CIFS: Don\u0027t free volume_info-\u003eUNC until we are entirely done with it.\n treewide: Correct spelling of successfully in comments\n ...\n" }, { "commit": "1805b2f04855f07afe3a71d620a68f483b0ed74f", "tree": "b823b90f37f5404fcaef70f785c70112ca74a329", "parents": [ "78d81d15b74246c7cedf84894434890b33da3907", "f42af6c486aa5ca6ee62800cb45c5b252020509d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 24 18:18:09 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 24 18:18:09 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "f861c2b80c45954e1ea04ead24cafcb1806dd536", "tree": "ed44b9b49b9d1a9ebfbb235a6270a42188dd6320", "parents": [ "1caa60b6d28a15be409002226145f0067a3070da" ], "author": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Mon Oct 17 09:32:00 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 17 19:22:46 2011 -0400" }, "message": "can: remove references to berlios mailinglist\n\nThe BerliOS project, which currently hosts our mailinglist, will\nclose with the end of the year. Now take the chance and remove all\noccurrences of the mailinglist address from the source files.\n\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a3a4bfde8a271df7ee56fcf31b8d907d50e7f216", "tree": "a9ef98f3da1e449b0a430705ab8b9abea036467b", "parents": [ "cdaf557034bb4397b2c86bb424de1788b134f610" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Fri Oct 07 09:28:14 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 10 14:31:00 2011 -0400" }, "message": "mscan: too much data copied to CAN frame due to 16 bit accesses\n\nDue to the 16 bit access to mscan registers there\u0027s too much data copied to\nthe zero initialized CAN frame when having an odd number of bytes to copy.\nThis patch ensures that only the requested bytes are copied by using an\n8 bit access for the remaining byte.\n\nReported-by: Andre Naujoks \u003cnautsch@gmail.com\u003e\nSigned-off-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2e1143742789463c00ed5e7f9bf471f2b707b493", "tree": "e0b3aa72bccbbf8aa5e5236a5c310c6ee4eaeef3", "parents": [ "d4fa0e35fdbd54acf791fa3793d6d17f7795f7ae" ], "author": { "name": "Oliver Hartkopp", "email": "socketcan@hartkopp.net", "time": "Wed Sep 28 02:50:11 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 28 13:41:51 2011 -0400" }, "message": "candev: allow SJW user setting for bittiming calculation\n\nThis patch adds support for SJW user settings to not set the synchronization\njump width (SJW) to 1 in any case when using the in-kernel bittiming\ncalculation.\n\nThe ip-tool from iproute2 already supports to pass the user defined SJW\nvalue. The given SJW value is sanitized with the controller specific sjw_max\nand the calculated tseg2 value. As the SJW can have values up to 4 providing\nthis value will lead to the maximum possible SJW automatically. A higher SJW\nallows higher controller oscillator tolerances.\n\nSigned-off-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fd734c6f25aea4b2b44b045e489aec67b388577e", "tree": "d2ff70a1b48016d6821930ddd1a9b9ff20e7e489", "parents": [ "f786ecba4158880f8cdc0ebb93e7d78e6c125449" ], "author": { "name": "Oliver Hartkopp", "email": "socketcan@hartkopp.net", "time": "Fri Sep 23 06:59:48 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 28 13:41:50 2011 -0400" }, "message": "can/sja1000: add driver for EMS PCMCIA card\n\nThis patch adds the driver for the SJA1000 based PCMCIA card \u0027CPC-Card\u0027 from\nEMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).\n\nSigned-off-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nAcked-by: Markus Plessing \u003cplessing@ems-wuensche.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "395cf9691d72173d8cdaa613c5f0255f993af94b", "tree": "813be524794fe1c0850805d7faca90e45fd0e60b", "parents": [ "e060c38434b2caa78efe7cedaff4191040b65a15" ], "author": { "name": "Paul Bolle", "email": "pebolle@tiscali.nl", "time": "Mon Aug 15 02:02:26 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Sep 27 18:08:04 2011 +0200" }, "message": "doc: fix broken references\n\nThere are numerous broken references to Documentation files (in other\nDocumentation files, in comments, etc.). These broken references are\ncaused by typo\u0027s in the references, and by renames or removals of the\nDocumentation files. Some broken references are simply odd.\n\nFix these broken references, sometimes by dropping the irrelevant text\nthey were part of.\n\nSigned-off-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "8decf868790b48a727d7e7ca164f2bcd3c1389c0", "tree": "b759a5f861f842af7ea76f9011b579d06e9d5508", "parents": [ "3fc72370186be2f9d4d6ef06d99e1caa5d92c564", "d93dc5c4478c1fd5de85a3e8aece9aad7bbae044" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 22 03:23:13 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 22 03:23:13 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of github.com:davem330/net\n\nConflicts:\n\tMAINTAINERS\n\tdrivers/net/Kconfig\n\tdrivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c\n\tdrivers/net/ethernet/broadcom/tg3.c\n\tdrivers/net/wireless/iwlwifi/iwl-pci.c\n\tdrivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c\n\tdrivers/net/wireless/rt2x00/rt2800usb.c\n\tdrivers/net/wireless/wl12xx/main.c\n" }, { "commit": "38034518c086fc48232b641cab97396a615864d0", "tree": "4b25baf8fcdf1661a21a838d23166b1fff0de739", "parents": [ "9c9b1f24f2aa31a3cea94939edc551f68ebadc89" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Mon Sep 12 21:16:06 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 21 02:29:02 2011 -0400" }, "message": "can/sja1000: driver for PEAK PCAN PCI/PCIe cards\n\nThis patch add the peak_pci driver for the PCAN PCI/PCIe cards (1, 2, 3\nor 4 channels) from PEAK Systems (http://www.peak-system.com).\n\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nTested-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "34b8686d278f00fb16234e74be44c253d6d6b676", "tree": "a3467bb920e5066aedf12665ccf73fae57741b33", "parents": [ "9566042ef84fd2a282d00d3163074ec9b3f93a70" ], "author": { "name": "Daniel Mack", "email": "zonque@gmail.com", "time": "Fri Sep 16 07:57:43 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 16 19:21:27 2011 -0400" }, "message": "can: ti_hecc: include linux/io.h\n\nThis fixes a build breakage for OMAP3 boards.\n\nSigned-off-by: Daniel Mack \u003czonque@gmail.com\u003e\nCc: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nCc: netdev@vger.kernel.org\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "86ad47fff97a9e416aadedfe68909b2d9143dc42", "tree": "fc88c4921b561b734115f30d46605e1ce56a0e57", "parents": [ "6f288cc52f478e6f58d96158e7cd857fedb6d111" ], "author": { "name": "Abhilash K V", "email": "abhilash.kv@ti.com", "time": "Tue Aug 23 03:05:57 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 26 12:48:24 2011 -0400" }, "message": "can: ti_hecc: Fix uninitialized spinlock in probe\n\nIn ti_hecc_probe(), the spinlock priv-\u003embx_lock is not\ninited, causing a spinlock lockup BUG.\n\nAcked-by: Anant Gole \u003canantgole@ti.com\u003e\nSigned-off-by: Abhilash K V \u003cabhilash.kv@ti.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6f288cc52f478e6f58d96158e7cd857fedb6d111", "tree": "b4d145d3b0de634f502f50f89febe193a1f93dee", "parents": [ "69558eeeaba7d79364bb9ac4743dc1ad209508b7" ], "author": { "name": "Abhilash K V", "email": "abhilash.kv@ti.com", "time": "Tue Aug 23 03:05:48 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 26 12:48:24 2011 -0400" }, "message": "can: ti_hecc: Fix unintialized variable\n\nIn ti_hecc_xmit(), local variable \"data\" is not initialized before\nbeing used.\nThis initialization got inadvertently removed in the following patch:\n\n\tcan: Unify droping of invalid tx skbs and netdev stats\n\nAcked-by: Anant Gole \u003canantgole@ti.com\u003e\nSigned-off-by: Abhilash K V \u003cabhilash.kv@ti.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "823dcd2506fa369aeb8cbd26da5663efe2fda9a9", "tree": "853b3e3c05f0b9ee1b5df8464db19b7acc57150c", "parents": [ "eaa36660de7e174498618d69d7277d44a2f24c3d", "98e77438aed3cd3343cbb86825127b1d9d2bea33" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 20 10:39:12 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 20 10:39:12 2011 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "97efe9aef1ae8922666d32f28d712745a86859e9", "tree": "c02a00d17b63b8454dd69d874bc207fccb8d0aa7", "parents": [ "c8aef4cb788b760331e6df06a5d93389824882b4" ], "author": { "name": "holt@sgi.com", "email": "holt@sgi.com", "time": "Tue Aug 16 17:32:23 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 17 20:36:38 2011 -0700" }, "message": "flexcan: Prefer device tree clock frequency if available.\n\nIf our CAN device\u0027s device tree node has a clock-frequency property,\nthen use that value for the can devices clock frequency. If not, fall\nback to asking the platform/mach code for the clock frequency associated\nwith the flexcan device.\n\nSigned-off-by: Robin Holt \u003cholt@sgi.com\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e,\nCc: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\nCc: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e,\nCc: U Bhaskar-B22300 \u003cB22300@freescale.com\u003e\nCc: Scott Wood \u003cscottwood@freescale.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: socketcan-core@lists.berlios.de,\nCc: netdev@vger.kernel.org,\nCc: PPC list \u003clinuxppc-dev@lists.ozlabs.org\u003e\nCc: devicetree-discuss@lists.ozlabs.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c8aef4cb788b760331e6df06a5d93389824882b4", "tree": "c37077d02bf411b6551b03d39bf475f98c438ab3", "parents": [ "243abbf2a610d801904bf1e44917e9ac4ccf823e" ], "author": { "name": "holt@sgi.com", "email": "holt@sgi.com", "time": "Tue Aug 16 17:32:22 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 17 20:36:38 2011 -0700" }, "message": "flexcan: Add of_match to platform_device definition.\n\nOn powerpc, the OpenFirmware devices are not matched without specifying\nan of_match array. Introduce that array as that is used for matching\non the Freescale P1010 processor.\n\nSigned-off-by: Robin Holt \u003cholt@sgi.com\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nCc: U Bhaskar-B22300 \u003cB22300@freescale.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: socketcan-core@lists.berlios.de\nCc: netdev@vger.kernel.org\nCc: PPC list \u003clinuxppc-dev@lists.ozlabs.org\u003e\nCc: devicetree-discuss@lists.ozlabs.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "61e271ee64f1da6f69e56419ecf2ca7330884564", "tree": "a6490f207c0485c55f6f7942fde8a013a733229b", "parents": [ "12732c308340ad786d540b3a85f7b164189f2108" ], "author": { "name": "holt@sgi.com", "email": "holt@sgi.com", "time": "Tue Aug 16 17:32:20 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 17 20:36:38 2011 -0700" }, "message": "flexcan: Abstract off read/write for big/little endian.\n\nMake flexcan driver handle register reads in the appropriate endianess.\nThis was a basic search and replace and then define some inlines.\n\nSigned-off-by: Robin Holt \u003cholt@sgi.com\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nCc: U Bhaskar-B22300 \u003cB22300@freescale.com\u003e\nCc: socketcan-core@lists.berlios.de\nCc: netdev@vger.kernel.org\nCc: PPC list \u003clinuxppc-dev@lists.ozlabs.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "12732c308340ad786d540b3a85f7b164189f2108", "tree": "3f3af7397fbc01a09285efbbc21d6040f3e78051", "parents": [ "b81693d9149c598302e8eb9c20cb20330d922c8e" ], "author": { "name": "holt@sgi.com", "email": "holt@sgi.com", "time": "Tue Aug 16 17:32:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 17 20:36:38 2011 -0700" }, "message": "flexcan: Remove #include \u003cmach/clock.h\u003e\n\npowerpc does not have a mach-####/clock.h. When testing, I found neither\narm nor powerpc needed the mach/clock.h at all so I removed it.\n\nSigned-off-by: Robin Holt \u003cholt@sgi.com\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nCc: U Bhaskar-B22300 \u003cB22300@freescale.com\u003e\nCc: socketcan-core@lists.berlios.de\nCc: netdev@vger.kernel.org\nCc: PPC list \u003clinuxppc-dev@lists.ozlabs.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "665d7eb8877c6bb777039efb22f894740be10bcb", "tree": "1eb2756354cd5a29c1a49c27a25066f410972056", "parents": [ "b333293058aa2d401737c7246bce58f8ba00906d" ], "author": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Mon Aug 15 12:45:08 2011 +0200" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Mon Aug 15 12:52:20 2011 +0200" }, "message": "net/can/mscan: add __iomem annotations\n\nThis patch fixes the following sparse warning by adding the missing\n__iomem annotation.\n\ndrivers/net/can/mscan/mscan.c:73:32: warning: incorrect type in argument 1 (different address spaces)\ndrivers/net/can/mscan/mscan.c:73:32: expected unsigned char volatile [noderef] [usertype] \u003casn:2\u003e*addr\ndrivers/net/can/mscan/mscan.c:73:32: got unsigned char *\u003cnoident\u003e\n\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "951f2f960e5bbce20309de44626cf11d17847712", "tree": "23b4a76dbb70f036e9b756c70205e5c740f9ce12", "parents": [ "75bc8ef528f7c4ea7e80384c5593487b6b3b535e" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Mon Aug 08 06:28:50 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 13 18:00:32 2011 -0700" }, "message": "drivers/net/can/sja1000/plx_pci.c: eliminate double free\n\nIn this code, the failure_cleanup label calls the function\nplx_pci_del_card, which frees everything in the card-\u003enet_dev array. dev\nis placed in this array immediately after allocation, so the two subsequent\njumps to failure_cleanup should not also call free_sja1000dev, but the\nsecond one does.\n\nIf plx_pci_check_sja1000 fails, then free_sja1000dev is also called on\ndev. Because dev is already in the card-\u003enet_dev array, this implies that\nwhen plx_pci_del_card is later called, it may get freed again. So that\nentry is reset to NULL after the free.\n\nFinally, if there is a problem with one channel, there will be a hole in the\narray. card-\u003echannels counts the number of channels that have succeeded,\nand does not keep track of the index of the largest element in the array\nthat is valid. So the loop in plx_pci_del_card is changed to go up to\nPLX_PCI_MAX_CHAN, which is only 2.\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "174c95d2526afbf974d9134f7f91fca8c4c8b538", "tree": "e38aa3277bb55a2d298bc857b1042267f0e021eb", "parents": [ "e33f7a9f37d486f4c6cce5de18a6eea11d68f64f" ], "author": { "name": "Oliver Hartkopp", "email": "socketcan@hartkopp.net", "time": "Wed Aug 10 05:18:59 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 11 05:52:57 2011 -0700" }, "message": "slcan: ldisc generated skbs are received in softirq context\n\nAs this discussion pointed out\n\nhttp://marc.info/?l\u003dlinux-netdev\u0026m\u003d131257225602375\n\nnetdevices that are based on serial line disciplines should use netif_rx_ni()\nwhen pushing received socketbuffers into the netdev rx queue.\n\nFollowing commit 614851601c121b1320a35757ab88292d6272f906 (\"slip: fix NOHZ\nlocal_softirq_pending 08 warning\") this patch updates the slcan driver\naccordingly.\n\nSigned-off-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nCC: Matvejchikov Ilya \u003cmatvejchikov@gmail.com\u003e\nCC: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d3ec4844d449cf7af9e749f73ba2052fb7b72fc2", "tree": "c515913e85f7e50878c83da2a88bc5a7269d087c", "parents": [ "0003230e8200699860f0b10af524dc47bf8aecad", "df2e301fee3c2c2a87592151397ad7699bb14c37" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 13:56:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 13:56:39 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n fs: Merge split strings\n treewide: fix potentially dangerous trailing \u0027;\u0027 in #defined values/expressions\n uwb: Fix misspelling of neighbourhood in comment\n net, netfilter: Remove redundant goto in ebt_ulog_packet\n trivial: don\u0027t touch files that are removed in the staging tree\n lib/vsprintf: replace link to Draft by final RFC number\n doc: Kconfig: `to be\u0027 -\u003e `be\u0027\n doc: Kconfig: Typo: square -\u003e squared\n doc: Konfig: Documentation/power/{pm \u003d\u003e apm-acpi}.txt\n drivers/net: static should be at beginning of declaration\n drivers/media: static should be at beginning of declaration\n drivers/i2c: static should be at beginning of declaration\n XTENSA: static should be at beginning of declaration\n SH: static should be at beginning of declaration\n MIPS: static should be at beginning of declaration\n ARM: static should be at beginning of declaration\n rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check\n Update my e-mail address\n PCIe ASPM: forcedly -\u003e forcibly\n gma500: push through device driver tree\n ...\n\nFix up trivial conflicts:\n - arch/arm/mach-ep93xx/dma-m2p.c (deleted)\n - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)\n - drivers/net/r8169.c (just context changes)\n" }, { "commit": "4570a5248bafd9d06d31ab6f6ef337c90a2a4bc0", "tree": "aad09cef771b5c07ab85f03681b1688e3027299f", "parents": [ "4fa5ee31b4fd109536aa5745d8c6af7c3bfd6d3b" ], "author": { "name": "Huang Weiyi", "email": "weiyi.huang@gmail.com", "time": "Fri Jul 22 22:19:40 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jul 23 20:01:15 2011 -0700" }, "message": "can: c_can: remove duplicated #include\n\nRemove duplicated #include(\u0027s) in\n drivers/net/can/c_can/c_can.c\n drivers/net/can/c_can/c_can_platform.c\n\nSigned-off-by: Huang Weiyi \u003cweiyi.huang@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "61463a30f65225e19e68f59dbd7b888bb308ec99", "tree": "5aba1af2b73848430fc7270342e8b26cba6410ec", "parents": [ "e3dbc46c2a62688d1aaa1f7291a054fb2b502849" ], "author": { "name": "Thadeu Lima de Souza Cascardo", "email": "cascardo@holoscopio.com", "time": "Thu Jul 21 16:22:31 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 21 20:39:47 2011 -0700" }, "message": "can: make function can_get_bittiming static\n\nThe function can_get_bittiming is not used anywhere else, so it should be\nstatic.\n\nSigned-off-by: Thadeu Lima de Souza Cascardo \u003ccascardo@holoscopio.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7ad711b49e661a0979ed1a84bed16bc9fa7f872b", "tree": "c00d8448d17f627d026e525643fa3bfb466fb5fb", "parents": [ "a9481a38b1474aab0f686b30e4e2b57880065ad2" ], "author": { "name": "Matvejchikov Ilya", "email": "matvejchikov@gmail.com", "time": "Mon Jul 18 21:58:48 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 19 16:55:42 2011 -0700" }, "message": "slcan: remove unused \u0027leased\u0027, \u0027line\u0027 and \u0027pid\u0027 fields from the \u0027slcan\u0027 structure\n\nSigned-off-by: Matvejchikov Ilya \u003cmatvejchikov@gmail.com\u003e\nAcked-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "81fc70d86527a1450560709500ca5f52e661da1f", "tree": "81533323709564030b859af95191a2c64bfac4f8", "parents": [ "61b8013a114cb041db2c56f747953cac69637f26" ], "author": { "name": "Andy Shevchenko", "email": "andriy.shevchenko@linux.intel.com", "time": "Sun Jul 17 22:26:37 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 18 11:31:43 2011 -0700" }, "message": "net: can: remove custom hex_to_bin()\n\nSigned-off-by: Andy Shevchenko \u003candriy.shevchenko@linux.intel.com\u003e\nCc: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nAcked-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2af4ba85913bb1755a06193109917c3ddc130265", "tree": "2bc140b52c0c5826ba10cf7c70b9f9007916bc32", "parents": [ "8279171a5fe95902be12f4018907f246d51616d4" ], "author": { "name": "Oliver Hartkopp", "email": "socketcan@hartkopp.net", "time": "Thu Jul 14 21:49:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 15 08:08:26 2011 -0700" }, "message": "slcan: remove obsolete code in slcan initialisation\n\nThis patch removes obsolete code in the initialisation/creation of\nslcan devices.\n\nIt follows the suggested cleanups from Ilya Matvejchikov in\ndrivers/net/slip.c that where recently applied to net-next-2.6:\n\n- slip: remove dead code within the slip initialization\n- slip: remove redundant check slip_devs for NULL\n\nSigned-off-by: Oliver Hartkopp \u003csocketcan@hartkopp.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b7e9c223be8ce335e30f2cf6ba588e6a4092275c", "tree": "2d1e3b75606abc18df7ad65e51ac3f90cd68b38d", "parents": [ "c172d82500a6cf3c32d1e650722a1055d72ce858", "e3bbfa78bab125f58b831b5f7f45b5a305091d72" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jul 11 14:15:48 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jul 11 14:15:55 2011 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nSync with Linus\u0027 tree to be able to apply pending patches that\nare based on newer code already present upstream.\n" }, { "commit": "e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4", "tree": "83c0e192ccaa4752c80b6131a7d0aa8272b5d0d0", "parents": [ "7329f0d58de01878d9ce4f0be7a76e136f223eef", "712ae51afd55b20c04c5383d02ba5d10233313b1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 05 23:23:37 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 05 23:23:37 2011 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "b21f3c7ed98a153865a7094af7d85d84c188667e", "tree": "0eb2db1a82b8317a1a1a3d1485c362c77e502d09", "parents": [ "ea7ea65a3b37bf207d5c352ac6254506b3dc3901" ], "author": { "name": "Kurt Van Dijck", "email": "kurt.van.dijck@eia.be", "time": "Mon Jun 27 05:00:13 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 30 22:13:15 2011 -0700" }, "message": "can: remove useless defaults in Kconfig\n\nThere\u0027s no need for \"default N\u0027 (or \u0027default n\u0027) as it\u0027s default.\n\nSigned-off-by: Kurt Van Dijck \u003ckurt.van.dijck@eia.be\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a30d5155a4f80af3cbe1fe0366e9f0c6fdbfd8dd", "tree": "d6d5104872ba7c02e48bdbfd3c905bb92162a089", "parents": [ "55caa9241ece1c07a930e3d05a624061adcf2653" ], "author": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Sun Jun 26 21:39:51 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 29 05:58:42 2011 -0700" }, "message": "net/can: activate bit-timing calculation and netlink based drivers by default\n\nThe two options \"CAN bit-timing calculation\" and\n\"Platform CAN drivers with Netlink support\" have a \"default Y\". In order to\nactivate them by default, change to \"default y\".\n\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nAcked-by: Kurt Van Dijck \u003ckurt.van.dijck@eia.be\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8d0f7cea7aa1bb63ddd0e94589d2c33bc99f0d9a", "tree": "264e0bf5910028c27dba65edada156f899712ca7", "parents": [ "213ade8ca8c854435d99e4d2927655b2ae4191e9" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Wed Jun 29 02:55:28 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 29 02:55:28 2011 -0700" }, "message": "net: include io.h in sja1000_of_platform.c for iounmap etc\n\nfixes these build errors:\n\ndrivers/net/can/sja1000/sja1000_of_platform.c: In function \u0027sja1000_ofp_read_reg\u0027:\ndrivers/net/can/sja1000/sja1000_of_platform.c:61:2: error: implicit declaration of function \u0027in_8\u0027\ndrivers/net/can/sja1000/sja1000_of_platform.c: In function \u0027sja1000_ofp_write_reg\u0027:\ndrivers/net/can/sja1000/sja1000_of_platform.c:67:2: error: implicit declaration of function \u0027out_8\u0027\ndrivers/net/can/sja1000/sja1000_of_platform.c: In function \u0027sja1000_ofp_remove\u0027:\ndrivers/net/can/sja1000/sja1000_of_platform.c:81:2: error: implicit declaration of function \u0027iounmap\u0027\ndrivers/net/can/sja1000/sja1000_of_platform.c: In function \u0027sja1000_ofp_probe\u0027:\ndrivers/net/can/sja1000/sja1000_of_platform.c:113:2: error: implicit declaration of function \u0027ioremap_nocache\u0027\ndrivers/net/can/sja1000/sja1000_of_platform.c:113:7: warning: assignment makes pointer from integer without a cast\n\nCaused by commit b7f080cfe223 (\"net: remove mm.h inclusion from\nnetdevice.h\").\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cfbf7586bc07cd6d14cd93ca56d8a3f90e248625", "tree": "16418209e4bea1c9c54ada013867f46f3d6295e6", "parents": [ "9118f08a7794e9a4908afbb0f9bc9455325a5631" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Fri Jun 24 04:33:02 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 27 20:42:24 2011 -0700" }, "message": "can: bfin_can: auto-calculate accessor sizes\n\nSince we have a struct that defines the sizes of the registers, we don\u0027t\nneed to explicitly use the 16bit read/write helpers. Let the code figure\nout which size access to make based on the size of the C type.\n\nThere should be no functional changes here.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9118f08a7794e9a4908afbb0f9bc9455325a5631", "tree": "c1294f851b788220d5a829ba8ed8afac1e69a610", "parents": [ "aca7a3acb19a7a4b1084f6f2411f6eaf52dd79c0" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Fri Jun 24 04:33:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 27 20:42:24 2011 -0700" }, "message": "can: bfin_can: simplify xmit id1 setup\n\nIf we look closely, the 4 writes to TRANSMIT_CHL.id1 can be collapsed\ndown into much simpler code. So do just that.\n\nThis also fixes a build failure due to the I/O macros no longer\ngetting pulled in. Their minor (and accidental) usage here gets\ndropped as part of the unification.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nAcked-by: Kurt Van Dijck \u003ckurt.van.dijck@eia.be\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "95cb3656c09fcf6577138337216c27744ebc91e2", "tree": "fbcd06dcad2f7b8daeecc649e4b34079ef16adf2", "parents": [ "22c8c9343258feda9ea9ebb9e5f8cbb727b69454" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Fri Jun 24 02:40:08 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 24 02:40:08 2011 -0700" }, "message": "net: Remove unneeded version.h includes from drivers/net/\n\nIt was pointed out by \u0027make versioncheck\u0027 that some includes of\nlinux/version.h are not needed in drivers/net/.\nThis patch removes them.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b7f080cfe223b3b7424872639d153695615a9255", "tree": "605390854789a6ba53e6813ffc69a948a0466530", "parents": [ "4003b65871c101eb5ce8f37a325feac54aa5c681" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Thu Jun 16 11:01:34 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 21 19:17:20 2011 -0700" }, "message": "net: remove mm.h inclusion from netdevice.h\n\nRemove linux/mm.h inclusion from netdevice.h -- it\u0027s unused (I\u0027ve checked manually).\n\nTo prevent mm.h inclusion via other channels also extract \"enum dma_data_direction\"\ndefinition into separate header. This tiny piece is what gluing netdevice.h with mm.h\nvia \"netdevice.h \u003d\u003e dmaengine.h \u003d\u003e dma-mapping.h \u003d\u003e scatterlist.h \u003d\u003e mm.h\".\nRemoval of mm.h from scatterlist.h was tried and was found not feasible\non most archs, so the link was cutoff earlier.\n\nHope people are OK with tiny include file.\n\nNote, that mm_types.h is still dragged in, but it is a separate story.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e44ba033c5654dbfda53461c9b1f7dd9bd1d198f", "tree": "92654523983a855e466a332e104c0e51550a642d", "parents": [ "1816315b10862277a961a70ec394b6607983041d" ], "author": { "name": "Vitaliy Ivanov", "email": "vitalivanov@gmail.com", "time": "Mon Jun 20 16:08:07 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jun 20 16:08:19 2011 +0200" }, "message": "treewide: remove duplicate includes\n\nMany stupid corrections of duplicated includes based on the output of\nscripts/checkincludes.pl.\n\nSigned-off-by: Vitaliy Ivanov \u003cvitalivanov@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "28f65c11f2ffb3957259dece647a24f8ad2e241b", "tree": "6b7621d09d10df89eedd908d4506fb9f457a909f", "parents": [ "140a1ef2f91a00e1d25f0878c193abdc25bf6ebe" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Jun 09 09:13:32 2011 -0700" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Jun 10 14:55:36 2011 +0200" }, "message": "treewide: Convert uses of struct resource to resource_size(ptr)\n\nSeveral fixes as well where the +1 was missing.\n\nDone via coccinelle scripts like:\n\n@@\nstruct resource *ptr;\n@@\n\n- ptr-\u003eend - ptr-\u003estart + 1\n+ resource_size(ptr)\n\nand some grep and typing.\n\nMostly uncompiled, no cross-compilers.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "cb2bad862e66eafbc97c26011ab7ab6cedc82810", "tree": "b3c0d31062642421c3d5af17a61b6f89fa3d6816", "parents": [ "a6b7a407865aab9f849dd99a71072b7cd1175116", "b9e379bccda6913f7baece42cd249824c0758b97" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 07 01:03:56 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 07 01:03:56 2011 -0700" }, "message": "Merge branch \u0027can/at91-sam9x5\u0027 of git://git.pengutronix.de/git/mkl/linux-2.6\n" }, { "commit": "a6b7a407865aab9f849dd99a71072b7cd1175116", "tree": "42995f2e25b777e8930b5ac180599f8d4e655df6", "parents": [ "aedfebbaa7a4883dc568d8d32b7b32a0f9833f41" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Mon Jun 06 10:43:46 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 06 22:55:11 2011 -0700" }, "message": "net: remove interrupt.h inclusion from netdevice.h\n\n* remove interrupt.g inclusion from netdevice.h -- not needed\n* fixup fallout, add interrupt.h and hardirq.h back where needed.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b9e379bccda6913f7baece42cd249824c0758b97", "tree": "615f56ad8ca67330dae842f5fa2d706be4983b0a", "parents": [ "6388b39614208d63661607f45157e3326548eb62" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Tue Apr 26 15:05:59 2011 +0200" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Mon Jun 06 15:18:33 2011 +0200" }, "message": "net/can: allow CAN_AT91 on AT91SAM9X5\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" } ], "next": "6388b39614208d63661607f45157e3326548eb62" }