)]}' { "log": [ { "commit": "bca476139d2ded86be146dae09b06e22548b67f3", "tree": "50a894c3ccce5f2f629a8e535a8bd6132f759ef9", "parents": [ "0813e22d4e0d618eac9b47bec942bf856adca4c5" ], "author": { "name": "Dick Hollenbeck", "email": "dick@softplc.com", "time": "Wed Dec 09 12:31:34 2009 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Feb 16 15:55:51 2010 -0800" }, "message": "serial: 8250: add serial transmitter fully empty test\n\nWhen controlling an industrial radio modem it can be necessary to\nmanipulate the handshake lines in order to control the radio modem\u0027s\ntransmitter, from userspace.\n\nThe transmitter should not be turned off before all characters have been\ntransmitted. serial8250_tx_empty() was reporting that all characters were\ntransmitted before they actually were.\n\n\u003d\u003d\u003d\n\nDiscovered in parallel with more testing and analysis by Kees Schoenmakers\nas follows:\n\nI ran into an NetMos 9835 serial pci board which behaves a little\ndifferent than the standard. This type of expansion board is very common.\n\n\"Standard\" 8250 compatible devices clear the \u0027UART_LST_TEMT\" bit together\nwith the \"UART_LSR_THRE\" bit when writing data to the device.\n\nThe NetMos device does it slightly different\n\nI believe that the TEMT bit is coupled to the shift register. The problem\nis that after writing data to the device and very quickly after that one\ndoes call serial8250_tx_empty, it returns the wrong information.\n\nMy patch makes the test more robust (and solves the problem) and it does\nnot affect the already correct devices.\n\nAlan:\n\n We may yet need to quirk this but now we know which chips we have a\n way to do that should we find this breaks some other 8250 clone with\n dodgy THRE.\n\nSigned-off-by: Dick Hollenbeck \u003cdick@softplc.com\u003e\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Kees Schoenmakers \u003ck.schoenmakers@sigmae.nl\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "03eac7bb882a75e6ee5705288f7ec36ad2e7d0d5", "tree": "893948c6d009ccbce351be43a81a1c9662ab8478", "parents": [ "1ec562035ba64e724652cb12b8a770b3906e9bf5" ], "author": { "name": "Richard Röjfors", "email": "richard.rojfors@pelagicore.com", "time": "Tue Feb 02 13:44:12 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 02 18:11:22 2010 -0800" }, "message": "uartlite: fix crash when using as console\n\nMove the ulite_console_setup to the .devinit section since it might be\ncalled on probe, which is in devinit. Fixes the crash below where the\nuartlite hw is probed after the .init section is freed from the kernel.\n\nuartlite: ttyUL0 at MMIO 0xc8000100 (irq \u003d 30) is a uartlite\nBUG: unable to handle kernel NULL pointer dereference at (null)\nIP: [\u003cc176720e\u003e] ulite_console_setup+0x6f/0xa8\n*pdpt \u003d 0000000036fb0001 *pde \u003d 0000000000000000\nOops: 0000 [#1] PREEMPT SMP\nlast sysfs file: /sys/devices/pci0000:00/0000:00:1f.1/host0/uevent\nModules linked in: puffin(+) serio_raw\n\nPid: 151, comm: modprobe Not tainted (2.6.31.5-1.0.b1-b1 #1) POULSBO\nEIP: 0060:[\u003cc176720e\u003e] EFLAGS: 00010246 CPU: 0\nEIP is at ulite_console_setup+0x6f/0xa8\nEAX: c16ec824 EBX: c16ec824 ECX: c176719f EDX: 00000000\nESI: 00000000 EDI: c17b42c4 EBP: f6fd1cf0 ESP: f6fd1cd8\n DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068\nProcess modprobe (pid: 151, ti\u003df6fd0000 task\u003df6fa1020 task.ti\u003df6fd0000)\nStack:\n c1031f51 00000000 00000000 00000246 c182237c f7742000 f6fd1d5c c11fd316\n\u003c0\u003e c16ec85c f77420d4 0000001e 00000000 00000000 c1633e78 4f494d4d 63783020\n\u003c0\u003e 30303038 00303031 f6fd1d3c c10e0786 f6fd1d48 00000000 f6fd1d48 00000000\nCall Trace:\n [\u003cc1031f51\u003e] ? register_console+0xf6/0x1fc\n [\u003cc11fd316\u003e] ? uart_add_one_port+0x237/0x2bb\n [\u003cc10e0786\u003e] ? sysfs_add_one+0x13/0xd3\n [\u003cc10e142f\u003e] ? sysfs_do_create_link+0xba/0xfc\n [\u003cc146f200\u003e] ? ulite_probe+0x198/0x1eb\n [\u003cc12064ee\u003e] ? platform_drv_probe+0xc/0xe\n [\u003cc120597b\u003e] ? driver_probe_device+0x79/0x105\n [\u003cc1205a8e\u003e] ? __device_attach+0x28/0x30\n [\u003cc120511f\u003e] ? bus_for_each_drv+0x3d/0x67\n [\u003cc1205af9\u003e] ? device_attach+0x44/0x58\n [\u003cc1205a66\u003e] ? __device_attach+0x0/0x30\n [\u003cc1204fb8\u003e] ? bus_probe_device+0x1f/0x34\n [\u003cc1203e68\u003e] ? device_add+0x385/0x4c0\n [\u003cc148491f\u003e] ? _write_unlock+0x8/0x1f\n [\u003cc1206aac\u003e] ? platform_device_add+0xd9/0x11c\n [\u003cc120c685\u003e] ? mfd_add_devices+0x165/0x1bc\n [\u003cf831b378\u003e] ? puffin_probe+0x2d0/0x390 [puffin]\n [\u003cc11a08ef\u003e] ? pci_match_device+0xa0/0xa7\n [\u003cc11a07bc\u003e] ? local_pci_probe+0xe/0x10\n [\u003cc11a11db\u003e] ? pci_device_probe+0x43/0x66\n [\u003cc120597b\u003e] ? driver_probe_device+0x79/0x105\n [\u003cc1205a4a\u003e] ? __driver_attach+0x43/0x5f\n [\u003cc120535d\u003e] ? bus_for_each_dev+0x3d/0x67\n [\u003cc1205852\u003e] ? driver_attach+0x14/0x16\n [\u003cc1205a07\u003e] ? __driver_attach+0x0/0x5f\n [\u003cc1204dea\u003e] ? bus_add_driver+0xf9/0x220\n [\u003cc1205c8f\u003e] ? driver_register+0x8b/0xeb\n [\u003cc11a1518\u003e] ? __pci_register_driver+0x43/0x9f\n [\u003cc10477ef\u003e] ? __blocking_notifier_call_chain+0x40/0x4c\n [\u003cf831f000\u003e] ? puffin_init+0x0/0x48 [puffin]\n [\u003cf831f017\u003e] ? puffin_init+0x17/0x48 [puffin]\n [\u003cc1001139\u003e] ? do_one_initcall+0x4c/0x131\n [\u003cc105607b\u003e] ? sys_init_module+0xa7/0x1b7\n [\u003cc1002a61\u003e] ? syscall_call+0x7/0xb\n Code: 6e 74 00 00 00 92 33 00 00 18 00 0e 01 73 79 6e 63 65 2d 72 65 67 69 73 74 72 79 0c 00 49 32\n00 00 14 00 09 01 61 6c 73 61 2d 69 \u003c6e\u003e 66 6f 00 00 00 42 37 00 00 10 00 07 01 6b 69 6c 6c 61 6c 6c\nEIP: [\u003cc176720e\u003e] ulite_console_setup+0x6f/0xa8 SS:ESP 0068:f6fd1cd8\nCR2: 0000000000000000\n\nSigned-off-by: Richard Röjfors \u003crichard.rojfors@pelagicore.com\u003e\nAcked-by: Peter Korsgaard \u003cjacmet@sunsite.dk\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "33d7959a7a9ef36573bfd0cc85ebef29ed4b846d", "tree": "ebe69072c18645f4e9aa5bac33e61140910f8ebc", "parents": [ "fa4281bbbcb44d1f8bdac894ad0696535272cc43" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Fri Jan 22 11:56:25 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 01:08:52 2010 -0800" }, "message": "fmvj18x_cs: add new id (Panasonic lan \u0026 modem card)\n\nfmvj18x_cs, serial_cs:\n add new id\n Panasonic lan \u0026 modem card (model name:AL-VML101)\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "18c576f950167ff3ec1e56dcbbec7b87288b3237", "tree": "564e0e9cb7b08ba5a4f76b509eb135a802cb307e", "parents": [ "2e2eb509aa7a333fe9931cf306fc7dbc3473f25b" ], "author": { "name": "Pavel Machek", "email": "pavel@ucw.cz", "time": "Wed Dec 09 12:31:31 2009 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 20 15:03:31 2010 -0800" }, "message": "serial: serial_cs: oxsemi quirk breaks resume\n\nQuirk is applied on all cards with given manfid (is it that correct?).\nUnfortunately, that quirk breaks resume on zaurus with billionton\nbluetooth card inserted: c950ctrl is 0 and outb() faults.\n\nI believe it is simply not a multiport card. (info-\u003emulti \u003d\u003d 1). ...\n... confirmed by printks.\n\nSigned-off-by: Pavel Machek \u003cpavel@ucw.cz\u003e\nAcked-by: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "2e2eb509aa7a333fe9931cf306fc7dbc3473f25b", "tree": "175318968883c5aeadf4ad4552fa51554865898e", "parents": [ "16ae2a877bf4179737921235e85ceffd7b79354f" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Wed Dec 09 12:31:36 2009 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 20 15:03:30 2010 -0800" }, "message": "serial: imx: bit \u0026/| confusion\n\nSince UCR1_UARTEN is defined 1, the port was always treated as enabled.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nAcked-by: Oskar Schirmer \u003cos@emlix.com\u003e\nCc: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nCc: Fabian Godehardt \u003cfg@emlix.com\u003e\nCc: Daniel Glöckner \u003cdg@emlix.com\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "16ae2a877bf4179737921235e85ceffd7b79354f", "tree": "48a72ef071d1c89dc6d49aa88bb3ee98af6ce7ad", "parents": [ "4547be7809a3b775ce750ec7f8b5748954741523" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Mon Jan 04 16:26:21 2010 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 20 15:03:29 2010 -0800" }, "message": "serial: Fix crash if the minimum rate of the device is \u003e 9600 baud\n\nIn that situation if the old rate is invalid and the new rate is invalid\nand the chip cannot do 9600 baud we report zero, which makes all the\ndrivers explode.\n\nInstead force the rate based on min/max\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "4547be7809a3b775ce750ec7f8b5748954741523", "tree": "c4da7e9e0e461c42501299c355c03a9920ccdce6", "parents": [ "6d34855d9aa281f72c533ecb827405139d1b0fe9" ], "author": { "name": "Stanislav Brabec", "email": "sbrabec@suse.cz", "time": "Wed Dec 02 16:20:56 2009 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 20 15:03:29 2010 -0800" }, "message": "serial-core: resume serial hardware with no_console_suspend\n\nPerform a tricky suspend/resume even with no_console_suspend.\n\nWith no_console_suspend, kernel skips serial port suspend/resume and the\nserial hardware may remain in undefined state after resume. It actually\nhappens on devices that don\u0027t have BIOS that handle serial\ninitialization. It makes impossible to use serial console after resume.\n\nDevices affected by this problem include:\nSharp Zaurus devices\nSeveral PXA based ARM embedded boards\n\nThe patch does:\n- Save the hardware state\n- Perform buffer flush in time of its suspend call\n- Tell the driver that port is suspended\n- But still accept new data\n- And keep console hardware in state that allows to send them\n\nIt allows to capture late console messages without breaking console\nafter resume.\n\nThis is just a resend of a patch discussed in these threads, as the\npatch was not yet applied.\n\n\"Possible suspend/resume regression in .32-rc?\" (Nov 1-5, 2009, ARM\nlist, later LKML)\n\n\"serial-core: resume serial hardware with no_console_suspend\" (Sep\n15-Oct 18, 2009, LKML \u0026 ARM lists)\n\nSigned-off-by: Stanislav Brabec \u003csbrabec@suse.cz\u003e\nTested-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\nTested-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "6d34855d9aa281f72c533ecb827405139d1b0fe9", "tree": "b3b9d2084b67505f12055de841a8d9bd847cec24", "parents": [ "eeec32a731631a9bad9abb21c626b9f2840bee0d" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Wed Dec 09 12:31:37 2009 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 20 15:03:27 2010 -0800" }, "message": "serial: 8250_pnp: use wildcard for serial Wacom tablets\n\nWacom claims that the WACF namespace will always be devoted to serial\nWacom tablets. Remove the existing entries and add a wildcard to avoid\nhaving to update the kernel every time they add a new device.\n\nSigned-off-by: Ping Cheng \u003cpingc@wacom.com\u003e\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nTested-by: Ping Cheng \u003cpingc@wacom.com\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "8888be69adea1d86d694096cb206ef570e2d691a", "tree": "ba3fd0c0b7d7dd7c8d7b7afeb56f094b65ebdb66", "parents": [ "1e868d8e6d2c4b8736cdf7a4bd5701e4f527f722", "78924577f493c6fa62e2b38356faa542fa7583e6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 18 14:08:55 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 18 14:08:55 2010 -0800" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc: Move cpu hotplug driver lock from pseries to powerpc\n powerpc: Move /proc/ppc64 to /proc/powerpc update\n powerpc/8xx: Fix user space TLB walk in dcbX fixup\n powerpc: Fix decrementer setup on 1GHz boards\n powerpc/iseries: Initialise on-stack completion\n powerpc/hvc: Driver build breaks with !HVC_CONSOLE\n serial/pmac_zilog: Workaround problem due to interrupt on closed port\n powerpc/macintosh: Make Open Firmware device id constant\n powerpc: Use helpers for rlimits\n powerpc: cpumask_of_node() should handle -1 as a node\n powerpc/pseries: Fix dlpar compile warning without CONFIG_PROC_DEVICETREE\n powerpc/pseries: Fix xics interrupt affinity\n powerpc/swsusp_32: Fix TLB invalidation\n powerpc/8xx: Always pin kernel instruction TLB\n powerpc: 2.6.33 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx\n powerpc: Use scripts/mkuboot.sh instead of \u0027mkimage\u0027\n powerpc/5200: update defconfigs\n" }, { "commit": "3018aa4b1a46946dfd0ee73a533038f24e390539", "tree": "bf4931e81c2b86310fdc36de725423a843f0b037", "parents": [ "1f8cdae43929d32e3706c314eb2a302dc3683fba" ], "author": { "name": "Ping", "email": "pinglinux@gmail.com", "time": "Fri Jan 15 17:01:07 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 16 12:15:37 2010 -0800" }, "message": "serial/8250_pnp: add a new Fujitsu Wacom Tablet PC device\n\nThis is a new two finger touch Fujitsu Wacom Tablet PC.\n\nSigned-off-by: Ping Cheng \u003cpingc@wacom.com\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: Dmitry Torokhov \u003cdtor@mail.ru\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "02ab851324dc7e2fc75787f7fae71187092be7ed", "tree": "b7019a603013ccdeb176349a5b0e315111b2e538", "parents": [ "46759a7c132648d79121518d2f7c34edc3f0cf58" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Sun Jan 10 17:51:42 2010 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri Jan 15 13:26:13 2010 +1100" }, "message": "serial/pmac_zilog: Workaround problem due to interrupt on closed port\n\nIt seems that in qemu, we can see an interrupt in R3 despite the\nfact that it\u0027s masked in W1. The chip doesn\u0027t actually issue an\ninterrupt, but we can \"see\" it when taking an interrupt for the\nother channel. This may be a qemu bug ... or not, so let\u0027s be\nsafe and avoid calling into the UART layer when that happens which\nwoulc cause a crash.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Rob Landley \u003crob@landley.net\u003e\n" }, { "commit": "75136d48e85915fd78a072f22897622b5d4c1814", "tree": "4ec35fb2c0e53ddd69dbe80615be35f87caeaa9d", "parents": [ "ea4407834118405ef419e9b07794ceacadc01bae" ], "author": { "name": "Markus Pietrek", "email": "Markus.Pietrek@emtrion.de", "time": "Fri Jan 15 08:33:20 2010 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Jan 15 08:33:20 2010 +0900" }, "message": "serial: sh-sci: using correct fifo size for SCIF and SCIFA ports.\n\nThe sh-sci driver used the wrong fifosize for PORT_SCIFA and PORT_SCIF\nports. If an incorrect size is used, the serial core will enforce an\nearly shutdown on the port, especially with baudrates \u003c 9600.\n\nSigned-off-by: Markus Pietrek \u003cMarkus.Pietrek@emtrion.de\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "1f0e14bbc065c88ddb68fec42b317f487cc85410", "tree": "ed8d6206d3362e92db3f5dd981a2e865200bde9c", "parents": [ "f25bb39f8adfe980df223f415f3b845953ca1147", "aff7b4f86737f1ae364bf5ece9a9b8586ddb2db4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 12 20:56:01 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 12 20:56:01 2010 -0800" }, "message": "Merge master.kernel.org:/home/rmk/linux-2.6-arm\n\n* master.kernel.org:/home/rmk/linux-2.6-arm:\n ARM: Ensure ARMv6/7 mm files are built using appropriate assembler options\n ARM: Fix wrong dmb\n ARM: 5874/1: serial21285: fix disable_irq-from-interrupt-handler deadlock\n ARM: 5873/1: ARM: Fix the reset logic for ARM RealView boards\n ARM: 5872/1: ARM: include needed linux/cpu.h in asm/cpu.h\n ARM: 5871/1: arch/arm: Fix build failure for lpd7a404_defconfig caused by missing includes\n ARM: 5870/1: arch/arm: Fix build failure for defconfigs without CONFIG_ISA_DMA_API set\n ARM: 5868/1: ARM: fix \"BUG: using smp_processor_id() in preemptible code\"\n ARM: 5867/1: Update U300 defconfig\n ARM: 5866/1: arm ptrace: use unsigned types for kernel pt_regs\n [ARM] pxa: fix strange characters in zaurus gpio .desc\n ARM: add missing recvmmsg syscall number\n [ARM] pxa: fix compiler warnings of unused variable \u0027id\u0027 in cpu_is_pxa9*()\n [ARM] pxa: update pwm_backlight-\u003enotify() to include missed \u0027struct device *\u0027\n [ARM] pxa: enable L2 if present in XSC3\n [ARM] pxa: do not enable L2 after MMU is enabled\n" }, { "commit": "597d8c717856f6094837850f3eb4850820b36451", "tree": "44c1b1115df6a80f6cee3684a01cdbc18b034134", "parents": [ "682137f7e6bc78e3c324874c0c213123ddc5e261", "9db2f1bec36805e57a003f7bb90e003815d96de8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 12 20:53:29 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 12 20:53:29 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (56 commits)\n sky2: Fix oops in sky2_xmit_frame() after TX timeout\n Documentation/3c509: document ethtool support\n af_packet: Don\u0027t use skb after dev_queue_xmit()\n vxge: use pci_dma_mapping_error to test return value\n netfilter: ebtables: enforce CAP_NET_ADMIN\n e1000e: fix and commonize code for setting the receive address registers\n e1000e: e1000e_enable_tx_pkt_filtering() returns wrong value\n e1000e: perform 10/100 adaptive IFS only on parts that support it\n e1000e: don\u0027t accumulate PHY statistics on PHY read failure\n e1000e: call pci_save_state() after pci_restore_state()\n netxen: update version to 4.0.72\n netxen: fix set mac addr\n netxen: fix smatch warning\n netxen: fix tx ring memory leak\n tcp: update the netstamp_needed counter when cloning sockets\n TI DaVinci EMAC: Handle emac module clock correctly.\n dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips\n ixgbe: Fix compiler warning about variable being used uninitialized\n netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq()\n mv643xx_eth: don\u0027t include cache padding in rx desc buffer size\n ...\n\nFix trivial conflict in drivers/scsi/cxgb3i/cxgb3i_offload.c\n" }, { "commit": "cc20b900be7aa8e456aff82dfcb55fb15c508962", "tree": "e031b4397bf585a3c9cf97a373400c2e269416a5", "parents": [ "4c9f8be7dab831c78b5f491739fc5cd01f2efb03" ], "author": { "name": "Simon Kagstrom", "email": "simon.kagstrom@netinsight.net", "time": "Mon Jan 11 15:57:24 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 11 15:39:21 2010 +0000" }, "message": "ARM: 5874/1: serial21285: fix disable_irq-from-interrupt-handler deadlock\n\nThe console hangs during bootup when disable_irq is called from the\ntransmit interrupt handler (it will wait forever for it\u0027s \"own\"\ninterrupt in synchronize_irq). Fix by using disable_irq_nosync()\ninstead.\n\nSigned-off-by: Simon Kagstrom \u003csimon.kagstrom@netinsight.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "abe8806901086b6cb29b4d4d4c616bbff3f0e7e1", "tree": "761b006fa598ceb3a093068b6bfa3621f5ab6088", "parents": [ "7ad6848c7e81a603605fad3f3575841aab004eea" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Wed Jan 06 20:37:58 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 06 20:37:58 2010 -0800" }, "message": "pcnet_cs: add cis of KTI PE520 pcmcia network card\n\npcnet_cs,serial_cs:\n\nadd cis of KTI PE520 pcmcia network card,\nand serial card(Sierra Wireless AC860).\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "32b53076c31ce9159740b744d5eb5d9505312add", "tree": "6687980a51c74629085eb8fa2e62172f480b3d53", "parents": [ "154280fd0e890814a249bf4a79b4340fb367f1a7" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Thu Dec 24 14:52:43 2009 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Thu Dec 24 14:52:43 2009 +0900" }, "message": "serial: sh-sci: Convert tremaining ctrl_xxx I/O routines to __raw_xxx.\n\nctrl_xxx() is an antiquated SH interface, while __raw_xxx is the standard\nAPI that accomplishes the same thing. As such, this converts the\nremaining sh-sci straggles over, which enables the driver to be wired up\nfor ARM SH-Mobile CPUs as well.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "154280fd0e890814a249bf4a79b4340fb367f1a7", "tree": "50b5fcc1763329a72526385d063884e433144b8c", "parents": [ "2f99f5c8f05e02f3df1bb4d93b6704e6f5972872" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Tue Dec 22 03:37:28 2009 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Thu Dec 24 14:50:55 2009 +0900" }, "message": "serial: sh-sci: earlyprintk zero uartclk fix\n\nThis establishes a sensible max baud rate for the earlyprintk cases where\nthe port\u0027s uartclk has not yet been determined.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "9b2831704e9250269032e3b8c2ffdfca09fd2851", "tree": "f0707f9cb808371e185f18268a14213a2e4fc392", "parents": [ "337e4a1ab4d736b8c39a4c3a233ac21f1a6c036f", "204fc390d86f7087201ec4a146bc07483186c35b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 10:29:52 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 10:29:52 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (33 commits)\n sh: Fix test of unsigned in se7722_irq_demux()\n sh: mach-ecovec24: Add FSI sound support\n sh: mach-ecovec24: Add mt9t112 camera support\n sh: mach-ecovec24: Add tw9910 support\n sh: MSIOF/mmc_spi platform data for the Ecovec24 board\n sh: ms7724se: Add ak4642 support\n sh: Fix up FPU build for SH5\n sh: Remove old early serial console code V2\n sh: sh5 scif pdata (sh5-101/sh5-103)\n sh: sh4a scif pdata (sh7757/sh7763/sh7770/sh7780/sh7785/sh7786/x3)\n sh: sh4a scif pdata (sh7343/sh7366/sh7722/sh7723/sh7724)\n sh: sh4 scif pdata (sh7750/sh7760/sh4-202)\n sh: sh3 scif pdata (sh7705/sh770x/sh7710/sh7720)\n sh: sh2a scif pdata (sh7201/sh7203/sh7206/mxg)\n sh: sh2 scif pdata (sh7616)\n sh-sci: Extend sh-sci driver with early console V2\n sh: Stub in P3 ioremap support for nommu parts.\n sh: wire up vmallocinfo support in ioremap() implementations.\n sh: Make the unaligned trap handler always obey notification levels.\n sh: Couple kernel and user write page perm bits for CONFIG_X2TLB\n ...\n" }, { "commit": "9385565e20c4acf97cd8e2fd7155750e578edcc4", "tree": "55ee76523bb308ef73a2f91942953db6b79fe1c9", "parents": [ "2ea5d35a49f5c89d1d2d677fe90c71ad5a6278b6" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Dec 14 18:00:28 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 15 08:53:27 2009 -0800" }, "message": "ioc3/ioc4: fix error path on driver registration\n\nTwo IOC3 and IOC4 drivers have broken error paths on registration. Fix\nthem.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Pat Gefre \u003cpfg@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2ea5d35a49f5c89d1d2d677fe90c71ad5a6278b6", "tree": "3e5eb8efe966320b93ec948c8f95674d79912c5e", "parents": [ "e4c570c4cb7a95dbfafa3d016d2739bf3fdfe319" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Dec 14 18:00:27 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 15 08:53:27 2009 -0800" }, "message": "ioc3/ioc4: various section fixes\n\nSeveral IOC3 and IOC4 drivers misuse the __devinit and __devexit section\nmarkers. Use __init and __exit instead as appropriate, then add __devinit\nand __devexit where they really belong for PCI drivers.\n\nAlso make ioc4_serial_init static.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Pat Gefre \u003cpfg@sgi.com\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "471452104b8520337ae2fb48c4e61cd4896e025d", "tree": "8594ae4a8362014e3cccf72a4e8834cdbb610bdd", "parents": [ "0ead0f84e81a41c3e98aeceab04af8ab1bb08d1f" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Mon Dec 14 18:00:08 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 15 08:53:25 2009 -0800" }, "message": "const: constify remaining dev_pm_ops\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e0aa51f54faa0659b529143de6c608e76675326f", "tree": "22fc566b74bfe6bd612a858ba354818900cdc394", "parents": [ "9f815a1765b0ce766ab1d26ef192d30410f70b2b", "3ea6b3d0e6d0ffd91c0f8cadeb69b7133c038b32" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Dec 15 12:10:10 2009 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Dec 15 12:10:10 2009 +0900" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n" }, { "commit": "7b6fd3bf82c4901f6ba0101ba71a5c507c24f9cf", "tree": "088bfc0216c0a0db902d3df1f8f6cd9695381f3b", "parents": [ "0eb37e26ed332b2a96630cf7f7ebe9fddb41cc3c" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Mon Dec 14 10:24:42 2009 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Dec 15 12:06:29 2009 +0900" }, "message": "sh-sci: Extend sh-sci driver with early console V2\n\nThis is V2 of early serial console support for the sh-sci\ndriver. The early serial console is using early platform\ndevices and \"earlyprintk\". To use this feature the early\nplatform devices must be broken out to one device per port\nand the desired port should be selected on the kernel command\nline like: \"earlyprintk\u003dsh-sci.N[,baudrate][,keep]\"\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "0f4974c439dd7826c85bae4e6a8088ce2db0f498", "tree": "fdabc7d9bb7d7bc49aad547c0aac3a633ce01f09", "parents": [ "3126c136bc30225d7a43af741778aa50e95e467a", "36ba782e9674cdc29ec7003757df0b375e99fa96" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 11 15:34:40 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 11 15:34:40 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (58 commits)\n tty: split the lock up a bit further\n tty: Move the leader test in disassociate\n tty: Push the bkl down a bit in the hangup code\n tty: Push the lock down further into the ldisc code\n tty: push the BKL down into the handlers a bit\n tty: moxa: split open lock\n tty: moxa: Kill the use of lock_kernel\n tty: moxa: Fix modem op locking\n tty: moxa: Kill off the throttle method\n tty: moxa: Locking clean up\n tty: moxa: rework the locking a bit\n tty: moxa: Use more tty_port ops\n tty: isicom: fix deadlock on shutdown\n tty: mxser: Use the new locking rules to fix setserial properly\n tty: mxser: use the tty_port_open method\n tty: isicom: sort out the board init logic\n tty: isicom: switch to the new tty_port_open helper\n tty: tty_port: Add a kref object to the tty port\n tty: istallion: tty port open/close methods\n tty: stallion: Convert to the tty_port_open/close methods\n ...\n" }, { "commit": "68cb4f8e246bbbc649980be0628cae9265870a91", "tree": "ac21578ae76e640af2584726a80c20673f25ef1a", "parents": [ "7e11a0fb3b7ab83871b7a56c7a67c603283ec4b9" ], "author": { "name": "Ian Jackson", "email": "ian.jackson@eu.citrix.com", "time": "Wed Nov 18 11:08:11 2009 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 11 15:18:05 2009 -0800" }, "message": "Serial: Do not read IIR in serial8250_start_tx when UART_BUG_TXEN\n\nDo not read IIR in serial8250_start_tx when UART_BUG_TXEN\n\nReading the IIR clears some oustanding interrupts so it is not safe.\nInstead, simply transmit immediately if the buffer is empty without\nregard to IIR.\n\nSigned-off-by: Ian Jackson \u003cian.jackson@eu.citrix.com\u003e\nReviewed-by: Markus Armbruster \u003carmbru@redhat.com\u003e\nReviewed-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n\n" }, { "commit": "c934878cc09fdd4a06ffa554c5149b11d972456f", "tree": "ab839436bb2bf7bae0d3359f121d9de6161f38f1", "parents": [ "4c0ebb8057bc335d345c8e205a3e6fd1320be21e" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Fri Nov 06 21:40:46 2009 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 11 15:18:04 2009 -0800" }, "message": "Serial: pxa: work around Errata #75\n\nIntel(R) PXA27x Processor Family Specification Update (Nov 2005)\nsays:\n\n E75. UART: Baud rate may not be programmed correctly on\n back-to-back writes.\n\n Problem:\n When programming the Divisor Latch registers, Low and High (DLL and\n DLH), with back-to-back writes, the second register write may not\n take effect. The result is an incorrect baud rate.\n\n Workaround:\n After programming the first Divisor Latch register, read and verify\n it before programming the second Divisor Latch register.\n\nThis was hit when changing the baud rate from 115200 to 9600 while\nreceiving characters at 9600 Bd.\n\nAnd fixed indention of some comments nearby.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nAcked-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nCc: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Mike Rapoport \u003cmike@compulab.co.il\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "4c0ebb8057bc335d345c8e205a3e6fd1320be21e", "tree": "71625bdd54cbc50b6abaaa92a3b2d063b45947fe", "parents": [ "82cb7ba10deafe17686bf22ce4a7a303a77a197f" ], "author": { "name": "André Goddard Rosa", "email": "andre.goddard@gmail.com", "time": "Sun Oct 25 12:01:34 2009 -0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 11 15:18:04 2009 -0800" }, "message": "serial, 8250: calculate irqflags bitmask before loop\n\nSigned-off-by: André Goddard Rosa \u003candre.goddard@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "82cb7ba10deafe17686bf22ce4a7a303a77a197f", "tree": "729580b675f6788ede78700339452c8304e939fa", "parents": [ "9e845abfc8a8973373821aa05302794fd254514b" ], "author": { "name": "André Goddard Rosa", "email": "andre.goddard@gmail.com", "time": "Sun Oct 25 11:18:26 2009 -0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 11 15:18:04 2009 -0800" }, "message": "serial: cascade needless conditionals\n\nSigned-off-by: André Goddard Rosa \u003candre.goddard@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "9e845abfc8a8973373821aa05302794fd254514b", "tree": "0dbd44e16a4fbe9554d25b4dcbc17fea7207a933", "parents": [ "2a0785ea375fe93cd480599bb40d0c837ff72a2e" ], "author": { "name": "André Goddard Rosa", "email": "andre.goddard@gmail.com", "time": "Sun Oct 25 11:16:32 2009 -0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 11 15:18:04 2009 -0800" }, "message": "serial: fix NULL pointer dereference\n\nIf kzalloc() or alloc_tty_driver() fails, we call:\n put_tty_driver(normal \u003d NULL).\n\nThen:\n put_tty_driver -\u003e tty_driver_kref_put -\u003e kref_put(\u0026NULL-\u003ekref, ...)\n\nSigned-off-by: André Goddard Rosa \u003candre.goddard@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "e6bdf24cf2992e1775fc095ed021f6b886707c41", "tree": "54a43dece085e8a0601599dcb423ba26255a1d05", "parents": [ "f9d1dff276c40157638415cdddf6a051869e8d92" ], "author": { "name": "Breno Leitao", "email": "leitao@linux.vnet.ibm.com", "time": "Wed Oct 14 14:57:51 2009 -0300" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 11 15:18:03 2009 -0800" }, "message": "jsm: adding EEH handlers\n\nAdding EEH handlers for the serial jsm driver. This patch adds\nthe PCI error handlers and also register them to be called when\na error is detected.\n\nSigned-off-by: Breno Leitao \u003cleitao@linux.vnet.ibm.com\u003e\nAcked-by: Scott Kilau \u003cscottk@digi.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "f9d1dff276c40157638415cdddf6a051869e8d92", "tree": "3b1f512b10bc740877dfce4524ce16838931e874", "parents": [ "a44829dd8bcd5335f0498275bb63f1028b32f141" ], "author": { "name": "Breno Leitão", "email": "leitao@linux.vnet.ibm.com", "time": "Tue Sep 29 15:16:59 2009 -0300" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 11 15:18:03 2009 -0800" }, "message": "jsm: removing the field jsm_board-\u003eintr_count\n\nCurrently there is a field in the jsm_board structure to cont\nthe number of interrupt that the card recevived, but it\u0027s not\nworking properly when the IRQ line is shared, and also nowhere\nelse this field is used. So, This patch is removing it.\n\nSigned-off-by: Breno Leitão \u003cleitao@linux.vnet.ibm.com\u003e\nCc: Scott Kilau \u003cScott.Kilau@digi.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "a44829dd8bcd5335f0498275bb63f1028b32f141", "tree": "8525de8c3f6cdd1ef38235626aa1eaef13885997", "parents": [ "2fd107c01567673c85f724a24d56614478d40f89" ], "author": { "name": "Breno Leitão", "email": "leitao@linux.vnet.ibm.com", "time": "Tue Sep 29 15:16:58 2009 -0300" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 11 15:18:03 2009 -0800" }, "message": "jsm: Removing unused jsm_channel-\u003ech_wopen field\n\nCurrently the jsm_channel-\u003ech_wopen field is defined and never\nused. So, this patch removes it.\n\nSigned-off-by: Breno Leitão \u003cleitao@linux.vnet.ibm.com\u003e\nCc: Scott Kilau \u003cScott.Kilau@digi.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "2fd107c01567673c85f724a24d56614478d40f89", "tree": "26bf65fa67f430882a423656200f2f7a6fb28a51", "parents": [ "cead486f407bbf152feccfe3734dd3966f9ff166" ], "author": { "name": "Breno Leitão", "email": "leitao@linux.vnet.ibm.com", "time": "Tue Sep 29 15:16:57 2009 -0300" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 11 15:18:03 2009 -0800" }, "message": "jsm: Remove ch_cpstime field\n\nCurrently the field jsm_channel-\u003ech_cpstime is defined but never\nused, so this patch removes it.\n\nSigned-off-by: Breno Leitão \u003cleitao@linux.vnet.ibm.com\u003e\nCc: Scott Kilau \u003cScott.Kilau@digi.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "cead486f407bbf152feccfe3734dd3966f9ff166", "tree": "258cb4af57edcf0814bf0940330e3cfde86dec20", "parents": [ "a53568a22adf6881183096d0863b0ff301173cbd" ], "author": { "name": "Breno Leitão", "email": "leitao@linux.vnet.ibm.com", "time": "Tue Sep 29 15:16:56 2009 -0300" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 11 15:18:02 2009 -0800" }, "message": "jsm: removing ch_old_baud field\n\nCurrently the field jsm_channel-\u003ech_old_baud is not used, just\nassigned in a lot of places but never used. This patches removes\nthis field.\n\nSigned-off-by: Breno Leitão \u003cleitao@linux.vnet.ibm.com\u003e\nCc: Scott Kilau \u003cscottk@digi.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "a53568a22adf6881183096d0863b0ff301173cbd", "tree": "c0ce0a0cbd5cadaa91cb11735ca781d8a31152b2", "parents": [ "354aaf964ed1ae45c175aa496526bae4662c4452" ], "author": { "name": "Breno Leitão", "email": "leitao@linux.vnet.ibm.com", "time": "Tue Sep 29 15:16:55 2009 -0300" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 11 15:18:02 2009 -0800" }, "message": "jsm: remove the ch_custom_speed field\n\nCurrently the ch_custom_speed field exists but is never used,\nso, this patch removes it.\n\nSigned-off-by: Breno Leitão \u003cleitao@linux.vnet.ibm.com\u003e\nCc: Scott Kilau \u003cscottk@digi.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "354aaf964ed1ae45c175aa496526bae4662c4452", "tree": "45fe9028cfbdbf74b3f707d3b690d420e11ce543", "parents": [ "a88a477f1df703f0e2a7592e19618799cb598623" ], "author": { "name": "Breno Leitão", "email": "leitao@linux.vnet.ibm.com", "time": "Thu Sep 24 16:58:23 2009 -0300" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 11 15:18:02 2009 -0800" }, "message": "jsm: Rewriting a bad log message\n\nActually jsm displays \"Device Added\" 8 times (for a 8 port device).\nThis silly patch just makes things more informative, showing\nthe port (instead of the device) that was added.\n\nSigned-off-by: Breno Leitão \u003cleitao@linux.vnet.ibm.com\u003e\nCc: Scott Kilau \u003cscottk@digi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "a88a477f1df703f0e2a7592e19618799cb598623", "tree": "225cee4b8c32b9327d513f994e10fac023daf396", "parents": [ "d71cb81af3817193bc605de061da0499934263a6" ], "author": { "name": "Breno Leitão", "email": "leitao@linux.vnet.ibm.com", "time": "Thu Sep 24 16:58:22 2009 -0300" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 11 15:18:02 2009 -0800" }, "message": "jsm: IRQ handlers doesn\u0027t need to have IRQ_DISABLED enabled\n\nCurrently jsm is showing the following message when loaded:\n\nIRQ 432/JSM: IRQF_DISABLED is not guaranteed on shared IRQs\n\nIt\u0027s because the request_irq() is called using IRQF_DISABLED\nand IRQF_SHARED.\nActually there is no need to use IRQF_DISABLED in this driver.\n\nSigned-off-by: Breno Leitão \u003cleitao@linux.vnet.ibm.com\u003e\nCc: Scott Kilau \u003cscottk@digi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "9ebfbd45f9d4ee9cd72529cf99e5f300eb398e67", "tree": "6ad661c4b38d0fad8a88c4a0d28997e9303632f2", "parents": [ "03d673e6af6490371aaf64dfe1f84c658c48b71d" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Thu Oct 29 12:36:02 2009 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 11 11:24:52 2009 -0800" }, "message": "firmware_class: make request_firmware_nowait more useful\n\nUnfortunately, one cannot hold on to the struct firmware\nthat request_firmware_nowait() hands off, which is needed\nin some cases. Allow this by requiring the callback to\nfree it (via release_firmware).\n\nAdditionally, give it a gfp_t parameter -- all the current\nusers call it from a GFP_KERNEL context so the GFP_ATOMIC\nisn\u0027t necessary. This also marks an API break which is\nuseful in a sense, although that is obviously not the\nprimary purpose of this change.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nCc: Ming Lei \u003ctom.leiming@gmail.com\u003e\nCc: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nCc: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\nCc: Pavel Roskin \u003cproski@gnu.org\u003e\nCc: Abhay Salunke \u003cabhay_salunke@dell.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8", "tree": "856ba96302a36014736747e8464f80eeb827bbdd", "parents": [ "f6c4c8195b5e7878823caa1181be404d9e86d369", "d014d043869cdc591f3a33243d3481fa4479c2d0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:43:33 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:43:33 2009 -0800" }, "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: (42 commits)\n tree-wide: fix misspelling of \"definition\" in comments\n reiserfs: fix misspelling of \"journaled\"\n doc: Fix a typo in slub.txt.\n inotify: remove superfluous return code check\n hdlc: spelling fix in find_pvc() comment\n doc: fix regulator docs cut-and-pasteism\n mtd: Fix comment in Kconfig\n doc: Fix IRQ chip docs\n tree-wide: fix assorted typos all over the place\n drivers/ata/libata-sff.c: comment spelling fixes\n fix typos/grammos in Documentation/edac.txt\n sysctl: add missing comments\n fs/debugfs/inode.c: fix comment typos\n sgivwfb: Make use of ARRAY_SIZE.\n sky2: fix sky2_link_down copy/paste comment error\n tree-wide: fix typos \"couter\" -\u003e \"counter\"\n tree-wide: fix typos \"offest\" -\u003e \"offset\"\n fix kerneldoc for set_irq_msi()\n spidev: fix double \"of of\" in comment\n comment typo fix: sybsystem -\u003e subsystem\n ...\n" }, { "commit": "701791cc3c8fc6dd83f6ec8af7e2541b4a316606", "tree": "3a8fce994dc9ca0fb5401f0d3aeb0ff8b9a2a821", "parents": [ "4ba152596de23038e5bca413d23c3fe6fa92ff45", "96c612427edab65dddd88ad61d732501cc5f128d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:09:42 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:09:42 2009 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:\n m68knommu: export clk_* symbols in clk.c\n m68knommu: Split the .init section into INIT_TEXT_SECTION and INIT_DATA_SECTION.\n m68knommu: Move __init_end out of the .init section.\n m68knommu: Move __init_begin out of the .init section.\n m68knommu: Use more macros inside the .init section.\n m68knommu: Use INIT_TASK_DATA and CACHELINE_ALIGNED_DATA.\n m68knommu: Make THREAD_SIZE available to assembly files.\n m68knommu: Don\u0027t hardcode the value of PAGE_SIZE in the linker script.\n m68knommu: rename BSS define in linker script\n m68knommu: add a task_pt_regs() macro\n m68knommu: define arch_has_single_step() and friends\n m68knommu: add uboot commandline argument passing support\n m68knommu: Coldfire GPIO corrections\n m68knommu: move mcf_remove to .devexit.text\n\nFixed up (?) conflict in arch/m68k/include/asm/ptrace.h\n" }, { "commit": "3a43aaa31790c36b69ebf8a6396f37fade86b531", "tree": "7c7f8da6219d546f2b44534cb7be1fb5591d6ac4", "parents": [ "aed886ce777590eac87f7ce2897d9f8357754331", "6a5a0b9139b19dd1a107870269a35bc9cf18d2dc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:03:16 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:03:16 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (137 commits)\n sh: include empty zero page in romImage\n sh: Make associative cache writes fatal on all SH-4A parts.\n sh: Drop associative writes for SH-4 cache flushes.\n sh: Partial revert of copy/clear_user_highpage() optimizations.\n sh: Add default uImage rule for se7724, ap325rxa, and migor.\n sh: allow runtime pm without suspend/resume callbacks\n sh: mach-ecovec24: Remove un-defined settings for VPU\n sh: mach-ecovec24: LCDC drive ability become high\n sh: fix sh7724 VEU3F resource size\n serial: sh-sci: Fix too early port disabling.\n sh: pfc: pr_info() -\u003e pr_debug() cleanups.\n sh: pfc: Convert from ctrl_xxx() to __raw_xxx() I/O routines.\n sh: Improve kfr2r09 serial port setup code\n sh: Break out SuperH PFC code\n sh: Move KEYSC header file\n sh: convert /proc/cpu/aligmnent, /proc/cpu/kernel_alignment to seq_file\n sh: Add CPG save/restore code for sh7724 R-standby\n sh: Add SDHI power control support to Ecovec\n mfd: Add power control platform data to SDHI driver\n sh: mach-ecovec24: modify address map\n ...\n" }, { "commit": "79c9601c2e0dbbe69895d302de4d19f3a31fbd30", "tree": "78d4be2df851b2b4106adcfd736622a90cecf9e9", "parents": [ "41440ffe21f29bdb985cab76b2d0b06d83e63b19", "3d14b5beba35250c548d3851a2b84fce742d8311" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 08:12:43 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 08:12:43 2009 -0800" }, "message": "Merge branch \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (272 commits)\n Fix soc_common PCMCIA configuration\n ARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_request\n ARM: 5826/1: SA1100: h3100/h3600: always build htc-egpio driver\n ARM: 5825/1: SA1100: h3600: update defconfig\n ARM: 5824/1: SA1100: reuse h3600 PCMCIA driver on h3100\n ARM: 5823/1: SA1100: h3100/h3600: add support for gpio-keys\n ARM: 5822/1: SA1100: h3100/h3600: clean up #includes\n ARM: 5821/1: SA1100: h3100/h3600: revise copyright boilerplates\n ARM: 5820/1: SA1100: h3100/h3600: split h3600.c\n ARM: 5819/1: SA1100: h3100/h3600: merge h3600.h and h3600_gpio.h into h3xxx.h\n ARM: 5818/1: SA1100: h3100/h3600: drop old GPIO definitions\n ARM: 5817/1: SA1100: h3100/h3600: configure all unused gpios as inputs\n ARM: 5816/1: SA1100: h3600: remove IRQ_GPIO_* definitions\n ARM: 5815/1: SA1100: h3100/h3600: remove now unused assign_h3600_egpio handlers\n ARM: 5814/1: SA1100: h3100/h3600: convert all users of assign_h3600_egpio to gpiolib\n ARM: 5813/1: SA1100: h3100/h3600: add htc-egpio driver\n ARM: 5812/1: SA1100: h3100/h3600: separate machine-specific LCD helpers\n ARM: 5811/2: pcmcia: convert sa1100_h3600 driver to gpiolib\n ARM: 5799/1: SA1100: h3600: stop setting direction for LCD pins\n ARM: 5798/1: SA1100: h3600: remove unused cruft from h3600.h\n ...\n" }, { "commit": "ee1262dbc65ce0b6234a915d8432171e8d77f518", "tree": "3a4003800d170de691b2e6a9c93c0ca6795678bf", "parents": [ "a421018e8c10e5593a1fee076af72a66c3fe8ca3", "7f5620a5fcd658f219e85831d3691908f1eccbde" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 07:48:23 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 07:48:23 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6:\n sparc: Set UTS_MACHINE correctly.\n sparc,leon: init_leon srmmu cleanup\n sparc32: Remove early interrupt enable.\n sparc, leon: Added Aeroflex Gaisler entry in manufacturer_info structure\n sparc64: Faster early-boot framebuffer console.\n Revert \"sparc: Make atomic locks raw\"\n sparc: remove unused nfsd #includes\n sparc: Fixup last users of irq_chip-\u003etypename\n Added sparc_leon3_snooping_enabled() and converted extern inline to static inline\n No auxio on LEON\n apbuart: Use of_find_node_by_path to find root node.\n sparc: Replace old style lock initializer\n sparc: Make atomic locks raw\n apbuart: Fix build and missing driver unregister.\n apbuart: Kill dependency on deprecated Sparc-only PROM interfaces.\n apbuart: Fix build warning.\n sparc: Support for GRLIB APBUART serial port\n watchdog: Remove BKL from rio watchdog driver\n sparc: Remove BKL from apc\n sparc,leon: Sparc-Leon SMP support\n" }, { "commit": "d014d043869cdc591f3a33243d3481fa4479c2d0", "tree": "63626829498e647ba058a1ce06419fe7e4d5f97d", "parents": [ "6ec22f9b037fc0c2e00ddb7023fad279c365324d", "6070d81eb5f2d4943223c96e7609a53cdc984364" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Dec 07 18:36:35 2009 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Dec 07 18:36:35 2009 +0100" }, "message": "Merge branch \u0027for-next\u0027 into for-linus\n\nConflicts:\n\n\tkernel/irq/chip.c\n" }, { "commit": "3d14b5beba35250c548d3851a2b84fce742d8311", "tree": "065e3d93c3fcbc5ee4c44fa78662393cddbdf6de", "parents": [ "0719dc341389882cc834ed18fc9b7fc6006b2b85", "1bf8e6219552d5dd27012d567ec8c4bb9c2d86b4" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Dec 06 17:00:33 2009 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Dec 06 17:00:33 2009 +0000" }, "message": "Merge branch \u0027sa1100\u0027 into devel\n" }, { "commit": "d9b2c4d0b03c721808c0d259e43a27f1e80205bc", "tree": "f17a4166f62ee14faa1401a6cbd353a4ab8c77cb", "parents": [ "27d16d08717faeaa8afd1b736a096dbaab90f08e", "5fa9167a1bf5f5a4b7282f5e7ac56a4a5a1fa044" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 05 09:42:59 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 05 09:42:59 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (50 commits)\n pcmcia: rework the irq_req_t typedef\n pcmcia: remove deprecated handle_to_dev() macro\n pcmcia: pcmcia_request_window() doesn\u0027t need a pointer to a pointer\n pcmcia: remove unused \"window_t\" typedef\n pcmcia: move some window-related code to pcmcia_ioctl.c\n pcmcia: Change window_handle_t logic to unsigned long\n pcmcia: Pass struct pcmcia_socket to pcmcia_get_mem_page()\n pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()\n pcmcia: Pass struct pcmcia_device to pcmcia_release_window()\n drivers/pcmcia: remove unnecessary kzalloc\n pcmcia: correct handling for Zoomed Video registers in topic.h\n pcmcia: fix printk formats\n pcmcia: autoload module pcmcia\n pcmcia/staging: update comedi drivers\n PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket\n PCMCIA: ss: allow PCI IRQs \u003e 255\n PCMCIA: soc_common: remove \u0027dev\u0027 member from soc_pcmcia_socket\n PCMCIA: soc_common: constify soc_pcmcia_socket ops member\n PCMCIA: sa1111: remove duplicated initializers\n PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data\n ...\n" }, { "commit": "0719dc341389882cc834ed18fc9b7fc6006b2b85", "tree": "794480ac62c07ea8cc4e69c2cb3d2b83bb7f36b7", "parents": [ "e28edb723e64200554194da17617ee6e82de6690", "677f4f64e4b2336682f0e15c69b206ade6f6b131" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Dec 05 10:35:33 2009 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Dec 05 10:35:33 2009 +0000" }, "message": "Merge branch \u0027devel-stable\u0027 into devel\n" }, { "commit": "af901ca181d92aac3a7dc265144a9081a86d8f39", "tree": "380054af22521144fbe1364c3bcd55ad24c9bde4", "parents": [ "972b94ffb90ea6d20c589d9a47215df103388ddd" ], "author": { "name": "André Goddard Rosa", "email": "andre.goddard@gmail.com", "time": "Sat Nov 14 13:09:05 2009 -0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Dec 04 15:39:55 2009 +0100" }, "message": "tree-wide: fix assorted typos all over the place\n\nThat is \"success\", \"unknown\", \"through\", \"performance\", \"[re|un]mapping\"\n, \"access\", \"default\", \"reasonable\", \"[con]currently\", \"temperature\"\n, \"channel\", \"[un]used\", \"application\", \"example\",\"hierarchy\", \"therefore\"\n, \"[over|under]flow\", \"contiguous\", \"threshold\", \"enough\" and others.\n\nSigned-off-by: André Goddard Rosa \u003candre.goddard@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "b1516803d5274386256bef4972dfbf8c9eed5165", "tree": "1626874e3dbf9e4715097ca23f2a650c8a789254", "parents": [ "fd2cb0ce74e07babaf8c7bf96ef03c25d194e463" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Tue Dec 01 09:54:46 2009 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Dec 04 13:42:23 2009 +0900" }, "message": "serial: sh-sci: Fix too early port disabling.\n\nCurrently serial ports on SH CPUs get disabled too early, because the\nsci_tx_empty() routine claims to not be able to detect whether the\ntransmission has been completed and just always returns TIOCSER_TEMT. This\nresults in corrupt output of last characters if the port is not open for\nreading at the same time. It is however possible to detect whether\ntransmission has been completed. Use the TEND bit of the status register\nfor this.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "d6f80e3a2a8c49f3e9c350b15f510c6eb8c1770d", "tree": "683b8bb620133ca7a4e97328381338de07f4c2e2", "parents": [ "22763c5cf3690a681551162c15d34d935308c8d7" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Thu Oct 01 10:28:15 2009 +0200" }, "committer": { "name": "Greg Ungerer", "email": "gerg@goober.(none)", "time": "Fri Dec 04 11:45:30 2009 +1000" }, "message": "m68knommu: move mcf_remove to .devexit.text\n\nThe function mcf_remove is used only wrapped by __devexit_p so define it\nusing __devexit.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCc: Len Sorensen \u003clsorense@csclub.uwaterloo.ca\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: linux-kernel@vger.kernel.org\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "ccae941ee2de58b9391f4e166b1bad33fcbfc119", "tree": "6465706dfb4a0411605a1a4fd52c9b553dfb639d", "parents": [ "e02f866456ec31d20649670e3af048ddc2a3892b" ], "author": { "name": "Ben Dooks", "email": "ben@simtec.co.uk", "time": "Fri Nov 13 22:54:14 2009 +0000" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Tue Dec 01 01:33:51 2009 +0000" }, "message": "ARM: S3C: Update Simtec copyright statements from , to - [2]\n\nThere are a number of statements of the form A, B or A, B, C where\nthe numbers A,B,C are not consecutive. However, referencing [1] it\nis the correct thing to replace these with A-B or A-C as apropriate.\n\n[1] http://www.copyrightservice.co.uk/copyright/p03_copyright_notices\n section 4iii \u0027Year of publication\u0027\n\nSigned-off-by: Ben Dooks \u003cben@simtec.co.uk\u003e\nSigned-off-by: Simtec Linux Team \u003clinux@simtec.co.uk\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "16173c7c2d79da7eb89b41acfdebd74b130f4339", "tree": "59e4d3fe30f6218d26e14359036f311a5dc117d1", "parents": [ "b037179f7a4fff7bd8279b0568a7dc663ebc9d15" ], "author": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Tue Nov 24 10:22:41 2009 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Nov 30 16:38:44 2009 -0800" }, "message": "tty/of_serial: add missing ns16550a id\n\nMany boards have a bug-free ns16550 compatible serial port, which we should\nregister as PORT_16550A. This introduces a new value \"ns16550a\" for the\ncompatible property of of_serial to let a firmware choose that model instead\nof using the crippled PORT_16550 mode.\n\nReported-by: Alon Ziv \u003calonz@nolaviz.org\u003e\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "b037179f7a4fff7bd8279b0568a7dc663ebc9d15", "tree": "1a0ad159ddea86a1d6e934cc4e64e95e70df3345", "parents": [ "8627b96dd80dca440d91fbb1ec733be25912d0dd" ], "author": { "name": "Maxime Bizon", "email": "mbizon@freebox.fr", "time": "Sun Nov 15 05:42:18 2009 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Nov 30 16:38:32 2009 -0800" }, "message": "bcm63xx_uart: Fix serial driver compile breakage.\n\nThe driver missed a small API change while sitting in Ralf\u0027s tree, this\npatch makes it compile again.\n\nSigned-off-by: Maxime Bizon \u003cmbizon@freebox.fr\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "ffece4808d253131e910a0e0afada82f60b1980a", "tree": "9b662b6809de1a6d9df54e7455af1960849b097c", "parents": [ "cd79bf7b1c061752dbee723bccf60c85d6c2d45d", "be24656a5e2d68bfd0744f0742c4aceef2cf44b5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 30 14:02:23 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 30 14:02:23 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n sunsu: Use sunserial_console_termios() in sunsu_console_setup().\n sunsu: Pass true \u0027ignore_line\u0027 to console match when RSC or LOM console.\n serial: suncore: Fix RSC/LOM handling in sunserial_console_termios().\n serial: suncore: Add \u0027ignore_line\u0027 argument to sunserial_console_match().\n sunsu: Fix detection of SU ports which are RSC console or control.\n sunsab: Do not set sunsab_reg.cons right before registering minors.\n sparc64: Fix definition of VMEMMAP_SIZE.\n" }, { "commit": "5fa9167a1bf5f5a4b7282f5e7ac56a4a5a1fa044", "tree": "2bf23e13308ef683302ff5a92af0ae8bc37c1b60", "parents": [ "dd2e5a156525f11754d9b1e0583f6bb49c253d62" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Nov 08 17:24:46 2009 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Nov 28 18:03:14 2009 +0100" }, "message": "pcmcia: rework the irq_req_t typedef\n\nMost of the irq_req_t typedef\u0027d struct can be re-worked quite\neasily:\n\n(1) IRQInfo2 was unused in any case, so drop it.\n\n(2) IRQInfo1 was used write-only, so drop it.\n\n(3) Instance (private data to be passed to the IRQ handler):\n\tMost PCMCIA drivers using pcmcia_request_irq() to actually\n\tregister an IRQ handler set the \"dev_id\" to the same pointer\n\tas the \"priv\" pointer in struct pcmcia_device. Modify the two\n\texceptions (ipwireless, ibmtr_cs) to also work this waym and\n\tset the IRQ handler\u0027s \"dev_id\" to p_dev-\u003epriv unconditionally.\n\n(4) Handler is to be of type irq_handler_t.\n\n(5) Handler !\u003d NULL already tells whether an IRQ handler is present.\n\tTherefore, we do not need the IRQ_HANDLER_PRESENT flag in\n\tirq_req_t.Attributes.\n\nCC: netdev@vger.kernel.org\nCC: linux-bluetooth@vger.kernel.org\nCC: linux-ide@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-scsi@vger.kernel.org\nCC: alsa-devel@alsa-project.org\nCC: Jaroslav Kysela \u003cperex@perex.cz\u003e\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCC: Karsten Keil \u003cisdn@linux-pingi.de\u003e\nfor the Bluetooth parts: Acked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "dd2e5a156525f11754d9b1e0583f6bb49c253d62", "tree": "f64b680eec9c4ca7da4fe635031a94a3bbf5ebee", "parents": [ "6838b03fc6564ea07d0cd87ea6e198d90ab1fc3e" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Tue Nov 03 10:27:34 2009 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Nov 28 18:03:10 2009 +0100" }, "message": "pcmcia: remove deprecated handle_to_dev() macro\n\nUpdate remaining users and remove deprecated handle_to_dev() macro\n\nCC: Harald Welte \u003claforge@gnumonks.org\u003e\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-serial@vger.kernel.org\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "edad1f208e6edabb917e4f8a33c7e45bf78bb79d", "tree": "beada10e4fdcb4984c8ed3481cf805012cd32861", "parents": [ "6ba653830c85a37d0a054f1e43d9b51e59d1150b" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Wed Nov 25 16:23:35 2009 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Wed Nov 25 16:23:35 2009 +0900" }, "message": "serial: sh-sci: Depend on HAVE_CLK unconditionally.\n\nThe sh-sci code conditionalized the clock framework support in order to\ngive the other platforms a chance to catch up. sh64 supported this some\ntime ago and the forthcoming ARM changes handle this as well, this leaves\nh8300 as the odd one out. H8300 has had since 2.5 to merge it\u0027s sh-sci\nsupport upstream, and has yet to do so. At this point I will no longer be\nholding back the driver to support an unreponsive architecture, 7 years\nis quite enough of a grace period. Support is easily implemented on the\narchitecture if and when it ever decides to merge its changes upstream.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "b9e39c89a9639e5005d8225a23fb7faf118a85eb", "tree": "b0004ef55c442c1920647f2579937aca7a1fef01", "parents": [ "b9e05c64a02a1e699925cb49dd5542087eba0c3a" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Tue Nov 24 22:07:32 2009 +0100" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Wed Nov 25 10:39:43 2009 +0900" }, "message": "serial: sh-sci: don\u0027t use __devexit_p to wrap sci_remove\n\nThe function sci_remove is defined without any section modifier, so\ndon\u0027t use __devexit_p to wrap it.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCc: Magnus Damm \u003cdamm@opensource.se\u003e\nCc: linux-kernel@vger.kernel.org\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "be24656a5e2d68bfd0744f0742c4aceef2cf44b5", "tree": "983ab949658fa0f492356e1da8d17edc9414df75", "parents": [ "1917d17b903955b8b2903626a2e01d071a5d0ec9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 24 14:12:50 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 24 14:12:50 2009 -0800" }, "message": "sunsu: Use sunserial_console_termios() in sunsu_console_setup().\n\nBe like the other Sun serial drivers otherwise the special handling of\nOpenFirmware options and hard-coded overrides for LOM/RSC consoles\nwill not be handled.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1917d17b903955b8b2903626a2e01d071a5d0ec9", "tree": "40693027529857e0f6067d692df1c98b7f750601", "parents": [ "457931de3b0925dc2eb941bc7d611a509be36dff" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 24 14:11:40 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 24 14:11:40 2009 -0800" }, "message": "sunsu: Pass true \u0027ignore_line\u0027 to console match when RSC or LOM console.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "457931de3b0925dc2eb941bc7d611a509be36dff", "tree": "64e30c8b02e02b2004dcc9757545db437b2eff71", "parents": [ "4e3533d05b6e5e66d1cda27f6671251c99c62894" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 24 14:09:56 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 24 14:09:56 2009 -0800" }, "message": "serial: suncore: Fix RSC/LOM handling in sunserial_console_termios().\n\nRSC and LOM devices have fixed speed settings.\n\nWe already had some code to match and handle \"rsc\" named devices on\nE250 systems, but we also have to handle \u0027rsc-console\u0027, \u0027rsc-control\u0027,\nand \u0027lom-console\u0027.\n\nAlso, in order to get this right regardless of what \u0027output-device\u0027\nhappens to be, explicitly pass the UART device node pointer to this\nroutine.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4e3533d05b6e5e66d1cda27f6671251c99c62894", "tree": "0eed98a48ff54e7fbdeb51227ed95f1b4774e056", "parents": [ "8301d386afc55c877bafe2c6c7dc75a96ddd2838" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 24 14:03:34 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 24 14:03:34 2009 -0800" }, "message": "serial: suncore: Add \u0027ignore_line\u0027 argument to sunserial_console_match().\n\nThis tells the logic to ignore the line match when deciding whether the\ndevice is the OpenFirmware specified console device or not.\n\nThis is going to be used in the SU driver for rsc-console detection.\n\nThere is probably a better way to handle this, but this is the least\nintrusive solution for now which we can validate won\u0027t break any other\ncases.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8301d386afc55c877bafe2c6c7dc75a96ddd2838", "tree": "e2dea9d498890df34b09cb5d36d2d169a30a3544", "parents": [ "4e68e188411ea98e40309700cf0c89ad4469ac1d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 24 13:58:52 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 24 13:58:52 2009 -0800" }, "message": "sunsu: Fix detection of SU ports which are RSC console or control.\n\nThese device nodes are named \"rsc-console\" and \"rsc-control\" rather\nthan \u0027serial\u0027, but the device_type property is \u0027serial\u0027 so we\u0027ll\ntip off of that for detection.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4e68e188411ea98e40309700cf0c89ad4469ac1d", "tree": "6f74b9f7de8861693788745edbd7a01248d596ad", "parents": [ "bffbc94a4d2c1769c3826fceddd2dbb75e72c80b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 24 13:56:39 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 24 13:56:39 2009 -0800" }, "message": "sunsab: Do not set sunsab_reg.cons right before registering minors.\n\nOther Sun serial drivers do not do this, and if we keep it this way\nit ends up registering all serial devices as consoles rather than\njust the one which we explicitly register via sunserial_console_match()\nwhich uses add_preferred_console().\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4edd5ad0f5a7a2238e5df311ce36789bae6751c0", "tree": "a3c931de2edfe83d08d2a723d54c00e74d6d0f71", "parents": [ "8a2fe6c76e230a4591373fdf77c09c36bc9c1318" ], "author": { "name": "Kristoffer Glembo", "email": "kristoffer@gaisler.com", "time": "Fri Nov 13 13:25:06 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 13 13:25:06 2009 -0800" }, "message": "apbuart: Use of_find_node_by_path to find root node.\n\nSigned-off-by: Kristoffer Glembo \u003ckristoffer@gaisler.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b87e5e2b8ed9336566100c8c796ab6dd52436881", "tree": "a55dc24691745c5a2029b8596352a62554864d28", "parents": [ "80647b959f97fa20a4714dde3e07b7f69d896556" ], "author": { "name": "Lennert Buytenhek", "email": "buytenh@wantstofly.org", "time": "Wed Nov 11 14:26:42 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 12 07:25:57 2009 -0800" }, "message": "serial: add support for the Lava Quattro PCI quad-port 16550A card\n\nThis seems to be a different model (with a different PCI ID) than the\n\"Quatro\" card that is also in the list.\n\nSigned-off-by: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "80647b959f97fa20a4714dde3e07b7f69d896556", "tree": "e181abfb54d13f23bbb80cb6c61246e74d444682", "parents": [ "05f45d7d746d07c95588871abf933334856c1a3b" ], "author": { "name": "Lennert Buytenhek", "email": "buytenh@wantstofly.org", "time": "Wed Nov 11 14:26:41 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 12 07:25:57 2009 -0800" }, "message": "serial: fix printk format specifiers for struct uart_port::iobase\n\nstruct uart_port::iobase is unsigned long, so use %lx as printk format\nspecifier.\n\nSigned-off-by: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9ec0bf41b5030ccc691049754ed1398cad5e953e", "tree": "069a7aacbde6c31ecbfc5ff12648259ad429d623", "parents": [ "3e7166178a83fef690dcbfcdaeda192f7282a9a4" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Oct 24 15:54:46 2009 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Mon Nov 09 08:30:04 2009 +0100" }, "message": "pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (serial_cs)\n\nConvert PCMCIA drivers to use the dynamic debug infrastructure, instead of\nrequiring manual settings of PCMCIA_DEBUG.\n\nAlso, remove all usages of the CS_CHECK macro and replace them with proper\nLinux style calling and return value checking. The extra error reporting may\nbe dropped, as the PCMCIA core already complains about any (non-driver-author)\nerrors.\n\nCC: linux-serial@vger.kernel.org\nCC: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "ddaf1b27edf72372242d752730d526b79312a44e", "tree": "9eecc305c4a9800d52a8df7df42adac56683f9c6", "parents": [ "d13500981e7df7f0e84d7f37f85d720cefe6043e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 06 00:26:39 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 06 00:26:39 2009 -0800" }, "message": "apbuart: Fix build and missing driver unregister.\n\nlinux/of_platform.h needs to be included\n\nOF driver needs to be unregistered\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "345e5a7672f561b539b3249cbe437b8d6595ab1b", "tree": "28bb5abdaa86d8eed783595ef8cd84e3274d0400", "parents": [ "7c9abfb884b8737f0afdc8a88bcea77526f0da87" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Thu Nov 05 14:34:57 2009 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 06 17:23:04 2009 +0900" }, "message": "serial: sh-sci: disable callback typo fix\n\nAvoid invoking the disable callback in case of NULL.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "d13500981e7df7f0e84d7f37f85d720cefe6043e", "tree": "6ce86046cd8073cc295acd7b746441e17a881612", "parents": [ "384a17b284b9dc92b480cf388310a25e255bac8a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 04 23:59:18 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 04 23:59:18 2009 -0800" }, "message": "apbuart: Kill dependency on deprecated Sparc-only PROM interfaces.\n\nUse the proper modern OF ones instead.\n\nNoticed by Stephen Rothwell.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "384a17b284b9dc92b480cf388310a25e255bac8a", "tree": "c100d0acdd2a658fac552cc2e8b0bed91173c89f", "parents": [ "d4ac42a582e46d7f86f0acb4253a310423c72c4c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 04 08:47:03 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 04 08:47:03 2009 -0800" }, "message": "apbuart: Fix build warning.\n\ndrivers/serial/apbuart.c: In function ‘apbuart_probe’:\ndrivers/serial/apbuart.c:574: warning: format ‘%x’ expects type ‘unsigned int’, but argument 2 has type ‘resource_size_t’\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d4ac42a582e46d7f86f0acb4253a310423c72c4c", "tree": "6b62aacf31e0d4f938b4077941a5a1eacdb55d7f", "parents": [ "462265bf494c4f2a2f6e06480590becadecbfea7" ], "author": { "name": "Kristoffer Glembo", "email": "kristoffer@gaisler.com", "time": "Wed Nov 04 08:39:46 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 04 08:44:54 2009 -0800" }, "message": "sparc: Support for GRLIB APBUART serial port\n\nThis patch adds support for the APBUART serial port from Aeroflex\nGaisler\u0027s IP library GRLIB. It is currently used in all LEON3 designs\n(SPARC V8) but can be used on other platforms as well (which support OF).\n\nSigned-off-by: Kristoffer Glembo \u003ckristoffer@gaisler.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a84216e671c724e0920dfad2fb70828d428ff60a", "tree": "a39f53715c73d267d854653dfe275da5fc60e842", "parents": [ "1836d95928a0f41ada0cbb2a6c4e46b027db9491", "bcfe3c2046fc4f16544f2b127f1b159dd1fcad8b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 03 07:44:01 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 03 07:44:01 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)\n mac80211: check interface is down before type change\n cfg80211: fix NULL ptr deref\n libertas if_usb: Fix crash on 64-bit machines\n mac80211: fix reason code output endianness\n mac80211: fix addba timer\n ath9k: fix misplaced semicolon on rate control\n b43: Fix DMA TX bounce buffer copying\n mac80211: fix BSS leak\n rt73usb.c : more ids\n ipw2200: fix oops on missing firmware\n gre: Fix dev_addr clobbering for gretap\n sky2: set carrier off in probe\n net: fix sk_forward_alloc corruption\n pcnet_cs: add cis of PreMax PE-200 ethernet pcmcia card\n r8169: Fix card drop incoming VLAN tagged MTU byte large jumbo frames\n ibmtr: possible Read buffer overflow?\n net: Fix RPF to work with policy routing\n net: fix kmemcheck annotations\n e1000e: rework disable K1 at 1000Mbps for 82577/82578\n e1000e: config PHY via software after resets\n ...\n" }, { "commit": "63ca2d74ea4f9c7a7ac082c915609a7b224908e7", "tree": "46694f40b10e22eed907a23df5303a754e04d9c7", "parents": [ "207d6e8760c6a3323bf5ab098dbaa5c9d03bda83" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Sat Oct 17 15:39:20 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 29 22:51:25 2009 -0700" }, "message": "pcnet_cs: add cis of PreMax PE-200 ethernet pcmcia card\n\npcnet_cs,serial_cs:\n\nadd cis of PreMax ethernet pcmcia card,\nand some Sierra Wireless serial card(AC555, AC7xx, AC8xx).\n\nuse PROD_ID for AC7xx, because MANF_ID of AC7xx and AC8xx are the same.\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0a53f1693cb956ebd8ba0a9acca6adb2dcb99d5f", "tree": "c5028752d115e4cebd90864ffd99c2564bc7e12b", "parents": [ "7fecf0a1f2f0dc334d41f1044198fb5aa6be1905", "40578fca24e7f777f3da7a693b030ae28ef7e486" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 08:59:06 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 08:59:06 2009 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc/ppc64: Use preempt_schedule_irq instead of preempt_schedule\n powerpc: Minor cleanup to lib/Kconfig.debug\n powerpc: Minor cleanup to sound/ppc/Kconfig\n powerpc: Minor cleanup to init/Kconfig\n powerpc: Limit memory hotplug support to PPC64 Book-3S machines\n powerpc: Limit hugetlbfs support to PPC64 Book-3S machines\n powerpc: Fix compile errors found by new ppc64e_defconfig\n powerpc: Add a Book-3E 64-bit defconfig\n powerpc/booke: Fix xmon single step on PowerPC Book-E\n powerpc: Align vDSO base address\n powerpc: Fix segment mapping in vdso32\n powerpc/iseries: Remove compiler version dependent hack\n powerpc/perf_events: Fix priority of MSR HV vs PR bits\n powerpc/5200: Update defconfigs\n drivers/serial/mpc52xx_uart.c: Use UPIO_MEM rather than SERIAL_IO_MEM\n powerpc/boot/dts: drop obsolete \u0027fsl5200-clocking\u0027\n of: Remove nested function\n mpc5200: support for the MAN mpc5200 based board mucmc52\n mpc5200: support for the MAN mpc5200 based board uc101\n" }, { "commit": "c68d2b1594548cda7f6dbac6a4d9d30a9b01558c", "tree": "6b2011fcd806906a64b0a98eeb798effb879d168", "parents": [ "1b62cbf2140df510a56d38b9d49df2aae95cd0d2" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Oct 26 16:50:05 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 07:39:30 2009 -0700" }, "message": "8250_pci: add IBM Saturn serial card\n\nThe IBM Saturn serial card has only one port. Without that fixup,\nthe kernel thinks it has two, which confuses userland setup and\nadmin tools as well.\n\n[akpm@linux-foundation.org: fix pci-ids.h layout]\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Michael Reed \u003cmreed10@us.ibm.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1b62cbf2140df510a56d38b9d49df2aae95cd0d2", "tree": "c9e589807ba5eccb16dd0f2f4b1cb9a01fa0a4d8", "parents": [ "9d09daf8e891e6ed60f96fbaf765ba7bced8bad1" ], "author": { "name": "Krauth.Julien", "email": "Krauth.Julien@addi-data.com", "time": "Mon Oct 26 16:50:04 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 07:39:30 2009 -0700" }, "message": "serial: add ADDI-DATA GmbH PCI-Express communication cards in 8250_pci.c and pci_ids.h\n\nAdd support for ADDI-DATA GmbH PCI-Express communication cards:\n\nAPCIe-7300\nAPCIe-7420\nAPCIe-7500\nAPCIe-7800\n\nWarning: 8250_pci.c depends on pci_ids.h. 8250_pci.c\n\nSigned-off-by: Krauth Julien \u003cKrauth.Julien@addi-data.com\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9d09daf8e891e6ed60f96fbaf765ba7bced8bad1", "tree": "1518c6f1fdfc9af99b81994cd7dc654bb97de6aa", "parents": [ "6a7b95481d49f73991d3dbf8c1e696a24684ac05" ], "author": { "name": "Haavard Skinnemoen", "email": "haavard.skinnemoen@atmel.com", "time": "Mon Oct 26 16:50:02 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 07:39:30 2009 -0700" }, "message": "atmel_serial: fix bad BUILD_BUG_ON() usage\n\nis_power_of_2() appears not to be constant enough for BUILD_BUG_ON()\nafter the latest rework, so replace it with an open-coded test.\n\nSigned-off-by: Haavard Skinnemoen \u003chaavard.skinnemoen@atmel.com\u003e\nCc: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCc: Jan Beulich \u003cjbeulich@novell.com\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@atmel.com\u003e\nCc: Alan Cox \u003calan@linux.intel.com\u003e\nCc: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: Claudio Scordino \u003cclaudio@evidence.eu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "40578fca24e7f777f3da7a693b030ae28ef7e486", "tree": "ed0541f857882f647bfc97e03d83371b8f4698a6", "parents": [ "4f917ba3d5ee9c98d60fa357e799942df8412de3", "4bdf0bb7d64cf672199519b3d808e2a82f5b59e9" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Oct 28 09:56:18 2009 +1100" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Oct 28 09:56:18 2009 +1100" }, "message": "Merge commit \u0027gcl/merge\u0027 into merge\n" }, { "commit": "6ae3b84d979308671bf6f6a2123c258a8603d61c", "tree": "63fdd28c8b92cd34fbaf7d4cac3644cc7b06822c", "parents": [ "bb015f0c85362aa767f8f00f50a40d85e489414f" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Oct 18 18:14:32 2009 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Oct 24 17:13:01 2009 +0200" }, "message": "serial_cs: use pcmcia_loop_config() and pre-determined values\n\nAs the PCMCIA core already determines the multifunction count, the\nConfigBase address and the Present value, we can use them directly\ninstead of parsing the CIS again. By making use of pcmcia_loop_config(),\nwe can further remove the remaining call to pcmcia_get_first_tuple()\nand friends.\n\nCC: linux-serial@vger.kernel.org\nCC: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "b7a8212cae06f3bfa810f941f455bd8bb9aa8528", "tree": "1501b0a54824f11b9ed4d990013d54e3f2cd6a5e", "parents": [ "db467ebd1fb0ff17df30a78d87c6cda4ea7b21c2" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Thu Oct 15 09:58:28 2009 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Oct 15 09:58:28 2009 -0600" }, "message": "drivers/serial/mpc52xx_uart.c: Use UPIO_MEM rather than SERIAL_IO_MEM\n\nAs in the commit 9b4a1617772d6d5ab5eeda0cd95302fae119e359, use UPIO_MEM\nrather than SERIAL_IO_MEM. Both have the same value.\n\nThe semantic patch that makes this change is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@has_sc@\n@@\n\n#include \u003clinux/serial_core.h\u003e\n\n@depends on has_sc@\n@@\n\n- SERIAL_IO_MEM\n+ UPIO_MEM\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "eea7e17e0eb23729d58368420659f8e7c357d82e", "tree": "728565e8a1f01d89dda17dff00a401915378a508", "parents": [ "d93a8f829fe1d2f3002f2c6ddb553d12db420412" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 12 19:13:54 2009 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 12 10:21:33 2009 -0700" }, "message": "tty, serial: Fix race and NULL check in uart_close()\n\nCommit 46d57a449aa1 (\"serial: use tty_port pointers in the core code\")\ncontained two bugs that causes (rare) crashes:\n\n - the rename typoed one site\n\n - a NULL check was missed\n\nReported-and-tested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5587481e92105734e8e45a24fd8603228ec02449", "tree": "2de22ddd94e21f681825de002887f3cc89118edd", "parents": [ "df87f344efac96cb9f9367e82509208216f1e0fa", "a4d63a943735efa30270ce70716d43323fd40f02" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 08 11:59:30 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 08 11:59:30 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (40 commits)\n ethoc: limit the number of buffers to 128\n ethoc: use system memory as buffer\n ethoc: align received packet to make IP header at word boundary\n ethoc: fix buffer address mapping\n ethoc: fix typo to compute number of tx descriptors\n au1000_eth: Duplicate test of RX_OVERLEN bit in update_rx_stats()\n netxen: Fix Unlikely(x) \u003e y\n pasemi_mac: ethtool get settings fix\n add maintainer for network drop monitor kernel service\n tg3: Fix phylib locking strategy\n rndis_host: support ETHTOOL_GPERMADDR\n ipv4: arp_notify address list bug\n gigaset: add kerneldoc comments\n gigaset: correct debugging output selection\n gigaset: improve error recovery\n gigaset: fix device ERROR response handling\n gigaset: announce if built with debugging\n gigaset: handle isoc frame errors more gracefully\n gigaset: linearize skb\n gigaset: fix reject/hangup handling\n ...\n" }, { "commit": "bf6fda63c452205f0e240ed8c511db5693857e93", "tree": "9a7100c35267907ec372d1918ad888328d833fee", "parents": [ "9c501935a3cdcf6b1d35aaee3aa11c7a7051a305" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Mon Oct 05 00:40:03 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 05 00:40:03 2009 -0700" }, "message": "pcnet_cs: add cis of National Semicondoctor\u0027s multifunction pcmcia card\n\npcnet_cs,serial_cs:\n \nadd cis of National Semicondoctor\u0027s lan\u0026modem mulitifunction pcmcia card,\nNE2K, tamarack ethernet card,\nand some serial card(COMpad2, COMpad4).\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a037a79dceaf717409fbf42f4ad209b9c15f435c", "tree": "c30b5b033c74ab9470e875554bded16464bbdf9b", "parents": [ "90d5ffc729e92bffc0f84e2447e2e6dc280240a5", "d25ef8b86e6a58f5476bf6e4a8da730b335f68fa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 02 16:20:43 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 02 16:20:43 2009 -0700" }, "message": "Merge master.kernel.org:/home/rmk/linux-2.6-arm\n\n* master.kernel.org:/home/rmk/linux-2.6-arm: (25 commits)\n ARM: 5728/1: Proper prefetch abort handling on ARMv6 and ARMv7\n ARM: 5727/1: Pass IFSR register to do_PrefetchAbort()\n ARM: 5740/1: fix valid_phys_addr_range() range check\n ARM: 5739/1: ARM: allow empty ATAG_CORE\n ARM: 5735/1: sa1111: CodingStyle cleanups\n ARM: 5738/1: Correct TCM documentation\n ARM: 5734/1: arm: fix compilation of entry-common.S for older CPUs\n ARM: 5733/1: fix bcmring compile error\n ARM: 5732/1: remove redundant include file\n ARM: 5731/2: Fix U300 generic GPIO, remove ifdefs from MMCI v3\n ARM: Ensure do_cache_op takes mmap_sem\n ARM: Fix __cpuexit section mismatch warnings\n ARM: Don\u0027t allow highmem on SMP platforms without h/w TLB ops broadcast\n ARM: includecheck fix: mach-davinci, board-dm365-evm.c\n ARM: Remove unused CONFIG SA1100_H3XXX\n ARM: Fix warning: unused variable \u0027highmem\u0027\n ARM: Fix warning: #warning syscall migrate_pages not implemented\n ARM: Fix SA11x0 clocksource warning\n ARM: Fix SA1100 Neponset serial section mismatch\n ARM: Fix SA1100 Assabet/Neponset PCMCIA section mismatch warnings\n ...\n" }, { "commit": "d41a4b515e346b3afdb5147d86927fa5835fc13b", "tree": "ee09ce5eee62e8640fd8bf4ef1851ea4f11f0336", "parents": [ "f23fc156fb4294f678f1913a56da633fa57edb2d" ], "author": { "name": "Chuck Ebbert", "email": "cebbert@redhat.com", "time": "Thu Oct 01 15:44:26 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 01 16:11:16 2009 -0700" }, "message": "serial: add parameter to force skipping the test for the TXEN bug\n\nAllow users to force skipping the TXEN test at init time. Applies\nto all serial ports. Intended for debugging only.\n\nThere is a blacklist for devices where we need to skip the test but the\nlist is not complete. This lets users force skipping the test so we can\ndetermine if they need to be added to the list.\n\nSome HP machines with weird serial consoles have this problem and there\nmay be more.\n\nSigned-off-by: Chuck Ebbert \u003ccebbert@redhat.com\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "75e3a6aed99babdfa95f80d07421065ed004d186", "tree": "a39bbfaa7cda12e8624b38363ce0de2706219c4e", "parents": [ "aa76224a38530f9c69d1670c47fdeea30a420a73" ], "author": { "name": "Breno Leitao", "email": "leitao@linux.vnet.ibm.com", "time": "Thu Oct 01 15:44:23 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 01 16:11:15 2009 -0700" }, "message": "icom: convert space to tabs\n\nConvert spaces to tabs and remove wrong spaces\n\nSigned-off-by: Breno Leitao \u003cleitao@linux.vnet.ibm.com\u003e\nCc: Scott Kilau \u003cScott.Kilau@digi.com\u003e\nCc: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "aa76224a38530f9c69d1670c47fdeea30a420a73", "tree": "c2a2b3a236a05d6bcdf31e539fe47100f8c1263d", "parents": [ "00acfaeead211562cc5f88882c47bf1cb16c041a" ], "author": { "name": "Atsushi Nemoto", "email": "anemo@mba.ocn.ne.jp", "time": "Thu Oct 01 15:44:22 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 01 16:11:15 2009 -0700" }, "message": "serial_txx9: use container_of() instead of direct cast\n\nSigned-off-by: Atsushi Nemoto \u003canemo@mba.ocn.ne.jp\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "447e4460a4ef44a275f81d992d227f34673be2a8", "tree": "92dcd6c8d1d65ba998e13c3cf9891d8df5a6d044", "parents": [ "4932be778952d4f3c278cbdef0d717358849aa8c" ], "author": { "name": "Richard Röjfors", "email": "richard.rojfors@mocean-labs.com", "time": "Thu Oct 01 15:44:07 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 01 16:11:12 2009 -0700" }, "message": "uartlite: allow building for timberdale MFD\n\nSome configurations of the Timberdale FPGA has the uartlite\nincluded.\n\nSigned-off-by: Richard Röjfors \u003crichard.rojfors@mocean-labs.com\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9fcd66e572b94974365a9119b073e0a43d496eb7", "tree": "9fa9e3212ecfad9e44a84730a0dfc2c54e1d0fb6", "parents": [ "8813d33ee03eee04eb2a8130658d591767d9f4fe" ], "author": { "name": "Maxime Bizon", "email": "mbizon@freebox.fr", "time": "Fri Sep 18 13:04:58 2009 +0200" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Wed Sep 30 21:46:59 2009 +0200" }, "message": "MIPS: BCM63xx: Add serial driver for bcm63xx integrated UART.\n\nSigned-off-by: Maxime Bizon \u003cmbizon@freebox.fr\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "3f944ab115f64fefa2c8ae985aafe652179fce4f", "tree": "d5b86f5056a23f0b56d50bc661be2a691e9650de", "parents": [ "b29cf62c43409fa2f7fbfba4e2ab230a7ac5aff8" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Sep 27 17:31:27 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Sep 28 18:06:16 2009 +0100" }, "message": "ARM: Fix SA1100 Neponset serial section mismatch\n\nWARNING: vmlinux.o(.devinit.text+0x524): Section mismatch in reference from the function neponset_probe() to the function .init.text:sa1100_register_uart_fns()\nThe function __devinit neponset_probe() references\na function __init sa1100_register_uart_fns().\nIf sa1100_register_uart_fns is only used by neponset_probe then\nannotate sa1100_register_uart_fns with a matching annotation.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "8e44e4347735229b518cc02938c351428bcd7492", "tree": "e2d7b5998fa8ad76948b2e11591f4534f06f7958", "parents": [ "06aab5a3084e1d825384fa353e6df4c7949c8683", "09dd3fc19c09f79115267361ecd7d5c5d2c27a3a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 17:22:31 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 17:22:31 2009 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n Fix build of cpm_uart due to core changes\n powerpc/8xx: Fix regression introduced by cache coherency rewrite\n powerpc/4xx: Fix erroneous xmon warning on PowerPC 4xx\n powerpc/mm: Fix 40x and 8xx vs. _PAGE_SPECIAL\n powerpc: Cleanup linker script using new linker script macros.\n powerpc: Fix ibm,client-architecture-support printout\n powerpc: Increase NODES_SHIFT on 64bit from 4 to 8\n powerpc/perf_counter: Fix vdso detection\n powerpc: Move 64bit heap above 1TB on machines with 1TB segments\n powerpc: Change archdata dma_data to a union\n powerpc: Rename get_dma_direct_offset get_dma_offset\n powerpc/mm: Remove duplicated #include\n powerpc/book3e-64: Remove duplicated #include\n powerpc: Check for unsupported relocs when using CONFIG_RELOCATABLE\n powerpc/pmc: Don\u0027t access lppaca on Book3E\n powerpc: kmalloc failure ignored in vio_build_iommu_table()\n hvc_console: Provide (un)locked version for hvc_resize()\n" }, { "commit": "5f8fe4270e53d38421ba34c428c3b58933b48e50", "tree": "2148a3ba1ec842d0d0ad8f3e3eb209eb6eba673d", "parents": [ "d9fbd9a2cd5ac1b286a7d7cdb1a180ce1edaee2f", "24924ece4482d5466ffcd0affedce63816c88e53" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 17:08:56 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 17:08:56 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://repo.or.cz/cris-mirror\n\n* \u0027for-linus\u0027 of git://repo.or.cz/cris-mirror:\n CRIS: Cleanup linker script using new linker script macros.\n ARRAY_SIZE changes\n CRIS: convert to asm-generic/hardirq.h\n CRISv10: Don\u0027t autonegotiate if autonegotiation is off\n CRIS: fix defconfig build failure\n CRIS: add pgprot_noncached\n" }, { "commit": "baea7b946f00a291b166ccae7fcfed6c01530cc6", "tree": "4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af", "parents": [ "ae19ffbadc1b2100285a5b5b3d0a4e0a11390904", "94e0fb086fc5663c38bbc0fe86d698be8314f82f" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Sep 24 21:22:33 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Sep 24 21:22:33 2009 +0100" }, "message": "Merge branch \u0027origin\u0027 into for-linus\n\nConflicts:\n\tMAINTAINERS\n" }, { "commit": "09dd3fc19c09f79115267361ecd7d5c5d2c27a3a", "tree": "9a1caa21e3fe53ffa343f9187fc69f6d37ba28b8", "parents": [ "e0908085fc2391c85b85fb814ae1df377c8e0dcb" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Sep 24 16:05:52 2009 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Sep 24 17:01:22 2009 +1000" }, "message": "Fix build of cpm_uart due to core changes\n\nCommit ebd2c8f6d2ec4012c267ecb95e72a57b8355a705 \"serial: kill off uart_info\"\n\nbroke the build of this driver, this fixes it.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "1b9894f342a39601bb0420b7b8c7e445670c1b51", "tree": "09b063187a7b09690c08dac73d3bd49a72f5dbe8", "parents": [ "7043078630bbc9eb908a56e08077c5abe7f2d311" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Mon Sep 21 11:12:03 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 11:24:57 2009 -0700" }, "message": "serial core: fix new kernel-doc warnings\n\nFix new kernel-doc warnings in serial_core.[hc] files.\n\n Warning(include/linux/serial_core.h:485): No description found for parameter \u0027uport\u0027\n Warning(include/linux/serial_core.h:485): Excess function parameter \u0027port\u0027 description in \u0027uart_handle_dcd_change\u0027\n Warning(include/linux/serial_core.h:511): No description found for parameter \u0027uport\u0027\n Warning(include/linux/serial_core.h:511): Excess function parameter \u0027port\u0027 description in \u0027uart_handle_cts_change\u0027\n Warning(drivers/serial/serial_core.c:2437): No description found for parameter \u0027uport\u0027\n Warning(drivers/serial/serial_core.c:2437): Excess function parameter \u0027port\u0027 description in \u0027uart_add_one_port\u0027\n Warning(drivers/serial/serial_core.c:2509): No description found for parameter \u0027uport\u0027\n Warning(drivers/serial/serial_core.c:2509): Excess function parameter \u0027port\u0027 description in \u0027uart_remove_one_port\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e0626e3844e8f430fc1a4417f523a00797df7ca6", "tree": "15e62abad725200b3c6ad2462f268c3df09ed711", "parents": [ "8cec03eee4a771f949c70cff07775c9bb21d4642" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@ru.mvista.com", "time": "Tue Sep 22 16:46:08 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 07:39:43 2009 -0700" }, "message": "spi: prefix modalias with \"spi:\"\n\nThis makes it consistent with other buses (platform, i2c, vio, ...). I\u0027m\nnot sure why we use the prefixes, but there must be a reason.\n\nThis was easy enough to do it, and I did it.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@ru.mvista.com\u003e\nCc: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Dmitry Torokhov \u003cdtor@mail.ru\u003e\nCc: Samuel Ortiz \u003csameo@openedhand.com\u003e\nCc: \"John W. Linville\" \u003clinville@tuxdriver.com\u003e\nAcked-by: Mike Frysinger \u003cvapier.adi@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ae19ffbadc1b2100285a5b5b3d0a4e0a11390904", "tree": "3c2086ab67398a019089a47ca3f362a4bc6db74f", "parents": [ "34e84f39a27d059a3e6ec6e8b94aafa702e6f220", "9173a8ef24a6b1b8031507b35b8ffe5f85a87692" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Sep 22 20:54:53 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Sep 22 21:01:40 2009 +0100" }, "message": "Merge branch \u0027master\u0027 into for-linus\n" } ], "next": "28f9f19db9dda54c851d5689539d86f6fc008773" }