)]}' { "log": [ { "commit": "95244306f6fb4f685dd8a672a6e6ea9f7dd1fd89", "tree": "3cab4f3f4d6a6c94909ffe09f07706a3701ae1d8", "parents": [ "0de91b618281251beb9f73eaa436337779ae25f2" ], "author": { "name": "Paul Parsons", "email": "lost.distance@yahoo.com", "time": "Sun May 06 01:09:19 2012 +0100" }, "committer": { "name": "Haojian Zhuang", "email": "haojian.zhuang@gmail.com", "time": "Mon May 07 09:56:39 2012 +0800" }, "message": "pcmcia: add driver for hx4700\n\nThis patch adds support for the HP iPAQ hx4700 to the existing\npxa2xx-pcmcia driver.\n\nSigned-off-by: Paul Parsons \u003clost.distance@yahoo.com\u003e\nCc: Philipp Zabel \u003cphilipp.zabel@gmail.com\u003e\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\n" }, { "commit": "a6f707b601c3f85d4b816ea08a757ea1af4f1cc0", "tree": "86cea1675e515c6baca64cea812ebe2ccc6aa955", "parents": [ "ef08e78268423fc4d7fbc3e54bd9a67fc8da7cc5", "80af9e6d7ae633309cc5bca96aee6a45117e7c98" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 16:00:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 16:00:48 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia\n\nPull a few PCMCIA updates from Dominik Brodowski.\n\nFix up trivial conflict (modified code in question had been removed) in\ndrivers/pcmcia/soc_common.c.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia:\n pcmcia at91_cf: fix raw gpio number usage\n ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe\n pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE\n pcmcia: convert drivers/pcmcia/* to use module_platform_driver()\n pcmcia: irq: Remove IRQF_DISABLED\n" }, { "commit": "0195c00244dc2e9f522475868fa278c473ba7339", "tree": "f97ca98ae64ede2c33ad3de05ed7bbfa4f4495ed", "parents": [ "f21ce8f8447c8be8847dadcfdbcc76b0d7365fa5", "141124c02059eee9dbc5c86ea797b1ca888e77f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 15:58:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 15:58:21 2012 -0700" }, "message": "Merge tag \u0027split-asm_system_h-for-linus-20120328\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system\n\nPull \"Disintegrate and delete asm/system.h\" from David Howells:\n \"Here are a bunch of patches to disintegrate asm/system.h into a set of\n separate bits to relieve the problem of circular inclusion\n dependencies.\n\n I\u0027ve built all the working defconfigs from all the arches that I can\n and made sure that they don\u0027t break.\n\n The reason for these patches is that I recently encountered a circular\n dependency problem that came about when I produced some patches to\n optimise get_order() by rewriting it to use ilog2().\n\n This uses bitops - and on the SH arch asm/bitops.h drags in\n asm-generic/get_order.h by a circuituous route involving asm/system.h.\n\n The main difficulty seems to be asm/system.h. It holds a number of\n low level bits with no/few dependencies that are commonly used (eg.\n memory barriers) and a number of bits with more dependencies that\n aren\u0027t used in many places (eg. switch_to()).\n\n These patches break asm/system.h up into the following core pieces:\n\n (1) asm/barrier.h\n\n Move memory barriers here. This already done for MIPS and Alpha.\n\n (2) asm/switch_to.h\n\n Move switch_to() and related stuff here.\n\n (3) asm/exec.h\n\n Move arch_align_stack() here. Other process execution related bits\n could perhaps go here from asm/processor.h.\n\n (4) asm/cmpxchg.h\n\n Move xchg() and cmpxchg() here as they\u0027re full word atomic ops and\n frequently used by atomic_xchg() and atomic_cmpxchg().\n\n (5) asm/bug.h\n\n Move die() and related bits.\n\n (6) asm/auxvec.h\n\n Move AT_VECTOR_SIZE_ARCH here.\n\n Other arch headers are created as needed on a per-arch basis.\"\n\nFixed up some conflicts from other header file cleanups and moving code\naround that has happened in the meantime, so David\u0027s testing is somewhat\nweakened by that. We\u0027ll find out anything that got broken and fix it..\n\n* tag \u0027split-asm_system_h-for-linus-20120328\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system: (38 commits)\n Delete all instances of asm/system.h\n Remove all #inclusions of asm/system.h\n Add #includes needed to permit the removal of asm/system.h\n Move all declarations of free_initmem() to linux/mm.h\n Disintegrate asm/system.h for OpenRISC\n Split arch_align_stack() out from asm-generic/system.h\n Split the switch_to() wrapper out of asm-generic/system.h\n Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h\n Create asm-generic/barrier.h\n Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h\n Disintegrate asm/system.h for Xtensa\n Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt]\n Disintegrate asm/system.h for Tile\n Disintegrate asm/system.h for Sparc\n Disintegrate asm/system.h for SH\n Disintegrate asm/system.h for Score\n Disintegrate asm/system.h for S390\n Disintegrate asm/system.h for PowerPC\n Disintegrate asm/system.h for PA-RISC\n Disintegrate asm/system.h for MN10300\n ...\n" }, { "commit": "9ffc93f203c18a70623f21950f1dd473c9ec48cd", "tree": "1eb3536ae183b0bfbf7f5152a6fe4f430ae881c2", "parents": [ "96f951edb1f1bdbbc99b0cd458f9808bb83d58ae" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "message": "Remove all #inclusions of asm/system.h\n\nRemove all #inclusions of asm/system.h preparatory to splitting and killing\nit. Performed with the following command:\n\nperl -p -i -e \u0027s!^#\\s*include\\s*\u003casm/system[.]h\u003e.*\\n!!\u0027 `grep -Irl \u0027^#\\s*include\\s*\u003casm/system[.]h\u003e\u0027 *`\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "9e4db1c3eed55c22328d8022c2c80adb3093833f", "tree": "9643545e6bd182f1d3e19942f590a6a1e3198320", "parents": [ "de8856d2c11f562c60ed9340a83db4a4f829a6e6", "aae528d9a8ad79d4b21b1b723abc9447fdb0d200" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 18:17:02 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 18:17:02 2012 -0700" }, "message": "Merge branch \u0027platforms\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull ARM platform updates from Russell King:\n \"This covers platform stuff for platforms I have a direct interest in\n (iow, I have the hardware). Essentially:\n - as we no longer support any other Acorn platforms other than RiscPC\n anymore, we can collect all that code into mach-rpc.\n - convert Acorn expansion card stuff to use IRQ allocation functions,\n and get rid of NO_IRQ from there.\n - cleanups to the ebsa110 platform to move some private stuff out of\n its header files.\n - large amount of SA11x0 updates:\n - conversion of private DMA implementation to DMA engine support\n (this actually gives us greater flexibility in drivers over the old\n API.)\n - re-worked ucb1x00 updates - convert to genirq, remove sa11x0\n dependencies, fix various minor issues\n - move platform specific sa11x0 framebuffer data into platform files\n in arch/arm instead of keeping this in the driver itself\n - update sa11x0 IrDA driver for DMA engine, and allow it to use DMA\n for SIR transmissions as well as FIR\n - rework sa1111 support for genirq, and irq allocation\n - fix sa1111 IRQ support so it works again\n - use sparse IRQ support\n\n After this, I have one more pull request remaining from my current\n set, which I think is going to be the most problematical as it\n generates 8 conflicts.\"\n\nFixed up the trivial conflict in arch/arm/mach-rpc/Makefile as per\nRussell.\n\n* \u0027platforms\u0027 of git://git.linaro.org/people/rmk/linux-arm: (125 commits)\n ARM: 7343/1: sa11x0: convert to sparse IRQ\n ARM: 7342/2: sa1100: prepare for sparse irq conversion\n ARM: 7341/1: input: prepare jornada720 keyboard and ts for sa11x0 sparse irq\n ARM: 7340/1: rtc: sa1100: include mach/irqs.h instead of asm/irq.h\n ARM: sa11x0: remove unused DMA controller definitions\n ARM: sa11x0: remove old SoC private DMA driver\n USB: sa1111: add hcd .reset method\n USB: sa1111: add OHCI shutdown methods\n USB: sa1111: reorganize ohci-sa1111.c\n USB: sa1111: get rid of nasty printk(KERN_DEBUG \"%s: ...\", __FILE__)\n USB: sa1111: sparse and checkpatch cleanups\n ARM: sa11x0: don\u0027t static map sa1111\n ARM: sa1111: use dev_err() rather than printk()\n ARM: sa1111: cleanup sub-device registration and unregistration\n ARM: sa1111: only setup DMA for DMA capable devices\n ARM: sa1111: register sa1111 devices with dmabounce in bus notifier\n ARM: sa1111: move USB interface register definitions to ohci-sa1111.c\n ARM: sa1111: move PCMCIA interface register definitions to sa1111_generic.c\n ARM: sa1111: move PS/2 interface register definitions to sa1111p2.c\n ARM: sa1111: delete unused physical GPIO register definitions\n ...\n" }, { "commit": "66f03c614c0902ccf7d6160459362a9352f33271", "tree": "b9a8864efe5aa7fc5c96cc5ccbeca41f5cd6f6a7", "parents": [ "34800598b2eebe061445216473b1e4c2ff5cba99", "cdc3df6f44f72c5924a16a47e1663c3fb0e57820" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:47:35 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:47:35 2012 -0700" }, "message": "Merge tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: device tree work\" from Arnd Bergmann:\n \"Most of these patches convert code from using static platform data to\n describing the hardware in the device tree. This is only the first\n half of the changes for v3.4 because a lot of patches for this topic\n came in the last week before the merge window.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\nFix up trivial conflicts in arch/arm/mach-vexpress/{Kconfig,core.h}\n\n* tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (86 commits)\n Document: devicetree: add OF documents for arch-mmp\n ARM: dts: append DTS file of pxa168\n ARM: mmp: append OF support on pxa168\n ARM: mmp: enable rtc clk in pxa168\n i2c: pxa: add OF support\n serial: pxa: add OF support\n arm/dts: mt_ventoux: very basic support for TeeJet Mt.Ventoux board\n ARM: OMAP2+: Remove extra ifdefs for board-generic\n ARM: OMAP2+: Fix build error when only ARCH_OMAP2/3 or 4 is selected\n ASoC: DT: Add digital microphone binding to PAZ00 board.\n ARM: dt: Add ARM PMU to tegra*.dtsi\n ARM: at91: at91sam9x5cm/dt: add leds support\n ARM: at91: usb_a9g20/dt: add gpio-keys support\n ARM: at91: at91sam9m10g45ek/dt: add gpio-keys support\n ARM: at91: at91sam9m10g45ek/dt: add leds support\n ARM: at91: usb_a9g20/dt: add leds support\n ARM: at91/pio: add new PIO3 features\n ARM: at91: add sam9_smc.o to at91sam9x5 build\n ARM: at91/tc/clocksource: Add 32 bit variant to Timer Counter\n ARM: at91/tc: add device tree support to atmel_tclib\n ...\n" }, { "commit": "374da9da22ebaad0524c77905b5e89ae4619bef3", "tree": "78f8ebbbc2e730b8e510e3a68b5b73755196fb68", "parents": [ "fbae0f8912dc12b284433c05417ea76311205bbf", "81e6ca3eb74d6bdbab181dd2db378f49f76f0d97" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:54:16 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:54:16 2012 +0100" }, "message": "Merge branch \u0027sa1111\u0027 into sa11x0\n\nConflicts:\n\tarch/arm/common/sa1111.c\n\tarch/arm/mach-sa1100/neponset.c\n\nFixed:\n\tarch/arm/mach-sa1100/assabet.c\nfor the neponset changes\n" }, { "commit": "ea8c00ac18198763bceb7ca53d26df4aa8d3c414", "tree": "0313ef4b1f2cb52adc1d01b8dfbff657297f83f7", "parents": [ "4f8d9cae15b5b5c89ec17c8168215aa06a5c9b2c" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 16 11:32:09 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 11:30:11 2012 +0000" }, "message": "ARM: sa1111: move PCMCIA interface register definitions to sa1111_generic.c\n\nMove the PCMCIA interface register definitions into the driver, rather\nthan keeping them in a common place.\n\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "24613ff927500513eae7e84bb6fc6c3ef268e452", "tree": "ef26480a8f123a12690c0f226870cf69dc6ffb55", "parents": [ "0d19eac12031680dc5f5402921fb0c388e42f619", "ff80aa57cc9946d3dafe65119d576b3d11304303" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 17:37:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 17:37:40 2012 -0700" }, "message": "Merge branch \u0027pcmcia\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull #3 ARM updates from Russell King:\n \"This adds gpio support to soc_common, allowing an amount of code to be\n deleted from each PCMCIA socket driver for the PXA/SA11x0 SoCs.\"\n\n* \u0027pcmcia\u0027 of git://git.linaro.org/people/rmk/linux-arm:\n PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix.\n PCMCIA: make lubbock socket driver part of sa1111_cs\n PCMCIA: add Kconfig control for building sa11xx_base.c\n PCMCIA: sa1111: jornada720: no need to disable IRQs around sa1111_set_io\n PCMCIA: sa1111: pass along sa1111_pcmcia_configure_socket() failure code\n PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers\n PCMCIA: soc_common: remove soc_pcmcia_*_irqs functions\n PCMCIA: sa11x0: h3600: convert to use new irq/gpio management\n PCMCIA: sa11x0: simpad: convert to use new irq/gpio management\n PCMCIA: sa11x0: shannon: convert to use new irq/gpio management\n PCMCIA: sa11x0: nanoengine: convert reset handling to use GPIO subsystem\n PCMCIA: sa11x0: nanoengine: convert to use new irq/gpio management\n PCMCIA: sa11x0: cerf: convert reset handling to use GPIO subsystem\n PCMCIA: sa11x0: cerf: convert to use new irq/gpio management\n PCMCIA: sa11x0: assabet: convert to use new irq/gpio management\n PCMCIA: sa1111: use new per-socket irq/gpio infrastructure\n PCMCIA: pxa: convert PXA socket drivers to use new irq/gpio management\n PCMCIA: soc_common: add GPIO support for card status signals\n PCMCIA: soc_common: move common initialization into soc_common\n" }, { "commit": "475c77edf826333aa61625f49d6a2bec26ecb5a6", "tree": "8e1c6c319e347cd3c649fdb0b3ab45971c6b19e7", "parents": [ "934e18b5cb4531cc6e81865bf54115cfd21d1ac6", "1488d5158dcd612fcdaf6b642451b026ee8bbcbb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 14:02:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 14:02:12 2012 -0700" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci\n\nPull PCI changes (including maintainer change) from Jesse Barnes:\n \"This pull has some good cleanups from Bjorn and Yinghai, as well as\n some more code from Yinghai to better handle resource re-allocation\n when enabled.\n\n There\u0027s also a new initcall_debug feature from Arjan which will print\n out quirk timing information to help identify slow quirks for fixing\n or refinement (Yinghai sent in a few patches to do just that once the\n new debug code landed).\n\n Beyond that, I\u0027m handing off PCI maintainership to Bjorn Helgaas.\n He\u0027s been a core PCI and Linux contributor for some time now, and has\n kindly volunteered to take over. I just don\u0027t feel I have the time\n for PCI review and work that it deserves lately (I\u0027ve taken on some\n other projects), and haven\u0027t been as responsive lately as I\u0027d like, so\n I approached Bjorn asking if he\u0027d like to manage things. He\u0027s going\n to give it a try, and I\u0027m confident he\u0027ll do at least as well as I\n have in keeping the tree managed, patches flowing, and keeping things\n stable.\"\n\nFix up some fairly trivial conflicts due to other cleanups (mips device\nresource fixup cleanups clashing with list handling cleanup, ppc iseries\nremoval clashing with pci_probe_only cleanup etc)\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (112 commits)\n PCI: Bjorn gets PCI hotplug too\n PCI: hand PCI maintenance over to Bjorn Helgaas\n unicore32/PCI: move \u003casm-generic/pci-bridge.h\u003e include to asm/pci.h\n sparc/PCI: convert devtree and arch-probed bus addresses to resource\n powerpc/PCI: allow reallocation on PA Semi\n powerpc/PCI: convert devtree bus addresses to resource\n powerpc/PCI: compute I/O space bus-to-resource offset consistently\n arm/PCI: don\u0027t export pci_flags\n PCI: fix bridge I/O window bus-to-resource conversion\n x86/PCI: add spinlock held check to \u0027pcibios_fwaddrmap_lookup()\u0027\n PCI / PCIe: Introduce command line option to disable ARI\n PCI: make acpihp use __pci_remove_bus_device instead\n PCI: export __pci_remove_bus_device\n PCI: Rename pci_remove_behind_bridge to pci_stop_and_remove_behind_bridge\n PCI: Rename pci_remove_bus_device to pci_stop_and_remove_bus_device\n PCI: print out PCI device info along with duration\n PCI: Move \"pci reassigndev resource alignment\" out of quirks.c\n PCI: Use class for quirk for usb host controller fixup\n PCI: Use class for quirk for ti816x class fixup\n PCI: Use class for quirk for intel e100 interrupt fixup\n ...\n" }, { "commit": "263a5c8e16c34199ddf6de3f102e789ffa3ee26e", "tree": "4f049e339d522b2ab0ba3bed3ec217e4bbc83d35", "parents": [ "54d20f006ceff1f2f1e69d0e54049b6c0765c039", "192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Mar 09 12:35:53 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Mar 09 12:35:53 2012 -0800" }, "message": "Merge 3.3-rc6 into driver-core-next\n\nThis was done to resolve a conflict in the drivers/base/cpu.c file.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "a58f67e70a6cad021ceebd1c8919b898dd5d5de3", "tree": "78cb630cb31a8cbec17463f9acc0f766707c232f", "parents": [ "4c6c826b22da9f6408b6bc6939a92aa0be838488", "46e446db4fb2cdb2f1bc69d3981fa23738a42835" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Mar 08 09:27:07 2012 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Mar 08 09:27:07 2012 -0800" }, "message": "Merge branch \u0027dt\u0027 of git://github.com/hzhuang1/linux into next/dt\n\n* \u0027dt\u0027 of git://github.com/hzhuang1/linux: (6 commits)\n Document: devicetree: add OF documents for arch-mmp\n ARM: dts: append DTS file of pxa168\n ARM: mmp: append OF support on pxa168\n ARM: mmp: enable rtc clk in pxa168\n i2c: pxa: add OF support\n serial: pxa: add OF support\n\n (plus update to v3.3-rc6)\n" }, { "commit": "80af9e6d7ae633309cc5bca96aee6a45117e7c98", "tree": "e46b41733e940d76ecea89384beff60988b95ac9", "parents": [ "f24fa8affe020c57a25bbb73ed31a6e4eb5c00c2" ], "author": { "name": "Joachim Eastwood", "email": "joachim.eastwood@jotron.com", "time": "Tue Jan 10 02:37:25 2012 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Mar 03 14:43:37 2012 +0100" }, "message": "pcmcia at91_cf: fix raw gpio number usage\n\nThis patches fixes two things:\n* Use gpio_valid function to check gpio before usage\n This must be done after 63b4c29678500 which uses -EINVAL for unused pin\u0027s\n* Use gpio_to_irq to convert gpio\u0027s to irq\n The driver assumed a 1:1 mapping between gpio and irq numbers. This is no\n longer true after d0fbda9add3281.\n\nTested on custom RM9200 board with 8gb CF card.\n\nSigned-off-by: Joachim Eastwood \u003cjoachim.eastwood@jotron.com\u003e\nAcked-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "f24fa8affe020c57a25bbb73ed31a6e4eb5c00c2", "tree": "7aa11d6e04ba42a1e988d46bcb346bed2732caba", "parents": [ "2b2c5d8c1dff8ed42d6d841f56428c0ce2bd71b5" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Tue Dec 27 16:25:44 2011 +0800" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Mar 03 14:43:37 2012 +0100" }, "message": "ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe\n\nIf pxa2xx_drv_pcmcia_add_one fails, it will go to err1 error path.\nAdd a missing clk_put in the error path.\n\nChecking the ret value after the for loop is redundant, it is always false.\nThus remove the redundant checking.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nAcked-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nAcked-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "2b2c5d8c1dff8ed42d6d841f56428c0ce2bd71b5", "tree": "b3ba3e4f40402ad9c3f43eb9a22b2b1b59e31365", "parents": [ "5d95f8e2dd263f3e05ae4bf9a3309552363e13af" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Tue Dec 27 16:17:46 2011 +0800" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Mar 03 14:43:37 2012 +0100" }, "message": "pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE\n\nConvert static struct pci_device_id *[] to static DEFINE_PCI_DEVICE_TABLE\ntables. Also convert to use PCI_DEVICE macro for better readablity.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "5d95f8e2dd263f3e05ae4bf9a3309552363e13af", "tree": "547831149fd437068b919256d4a6f7e36ddc2926", "parents": [ "d571c79e86fa7704265b9127403a78ccd3c01729" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Sun Nov 27 12:53:06 2011 +0800" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Mar 03 14:43:37 2012 +0100" }, "message": "pcmcia: convert drivers/pcmcia/* to use module_platform_driver()\n\nThis patch converts the drivers in drivers/pcmcia/* to use the\nmodule_platform_driver() macro which makes the code smaller and a bit\nsimpler.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nAcked-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\nAcked-by: Michael Hennerich \u003cmichael.hennerich@analog.com\u003e\nAcked-by: Marc Zyngier \u003cmaz@misterjones.org\u003e [for the viper part]\nAcked-by: Manuel Lauss \u003cmanuel.lauss@googlemail.com\u003e [for the db1xxx_ss.c part]\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "d571c79e86fa7704265b9127403a78ccd3c01729", "tree": "f60767922ab009ff94fa295e98d1c25502a8ece8", "parents": [ "6b21d18ed50c7d145220b0724ea7f2613abf0f95" ], "author": { "name": "Yong Zhang", "email": "yong.zhang0@gmail.com", "time": "Sat Oct 22 17:56:49 2011 +0800" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Mar 03 14:43:36 2012 +0100" }, "message": "pcmcia: irq: Remove IRQF_DISABLED\n\nSince commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled],\nWe run all interrupt handlers with interrupts disabled\nand we even check and yell when an interrupt handler\nreturns with interrupts enabled (see commit [b738a50a:\ngenirq: Warn when handler enables interrupts]).\n\nSo now this flag is a NOOP and can be removed.\n\nSigned-off-by: Yong Zhang \u003cyong.zhang0@gmail.com\u003e\nAcked-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "7eca30aef7961e68ad74c0ef920546c2be7f6579", "tree": "d7161459a86134bee58b8a0980a15b66839467aa", "parents": [ "d65b4e98d7ea3038b767b70fe8be959b2913f16d", "d5e5a7f987458f42f24a557a0f4e35f94c43fc09" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Feb 27 17:22:36 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Feb 29 12:03:08 2012 +0000" }, "message": "Merge branch \u0027at91-3.4-base2+cleanup\u0027 of git://github.com/at91linux/linux-at91 into at91/staging/base2+cleanup\n\n* \u0027at91-3.4-base2+cleanup\u0027 of git://github.com/at91linux/linux-at91: (20 commits)\n ARM: at91: properly sort dtb files in Makefile.boot\n ARM: at91: add at91sam9g25ek.dts in Makefile.boot\n ARM: at91/board-dt: drop default console\n Atmel: move console default platform_device to serial driver\n ARM: at91: merge SRAM Memory banks thanks to mirroring\n ARM: at91: finally drop at91_sys_read/write\n ARM: at91/rtc-at91sam9: pass the GPBR to use via resources\n ARM: at91:rtc/rtc-at91sam9: ioremap register bank\n ARM: at91/rtc-at91sam9: each SoC can select the RTT device to use\n ARM: at91/PMC: make register base soc independent\n ARM: at91/PMC: move assignment out of printf\n ARM: at91/pm_slowclock: add runtime detection of memory contoller\n ARM: at91: make sdram/ddr register base soc independent\n ARM: at91: move at91rm9200 sdramc defines to at91rm9200_sdramc.h\n ARM: at91/pm_slowclock: function slow_clock() accepts parameters\n ARM: at91/pm_slowclock: rename register to named define\n ARM: at91/ST: remove not needed casts\n ARM: at91: make ST (System Timer) soc independent\n ARM: at91: make matrix register base soc independent\n ARM: at91/at91x40: remove use of at91_sys_read/write\n\nBased on top of the at91/9x5, rmk/for-armsoc, at91/device-board,\nat91/pm_cleanup and at91/base.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "6754b9e9c33502223db066de50dda8a876f70c2c", "tree": "ee7b1a9328bd01675f907c9d247ee9b2f4bad21f", "parents": [ "210647af897af8ef2d00828aa2a6b1b42206aae6" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Sat Feb 25 13:54:22 2012 -0800" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Feb 27 12:14:55 2012 -0800" }, "message": "PCI: Rename pci_remove_behind_bridge to pci_stop_and_remove_behind_bridge\n\nThe old pci_remove_behind_bridge actually do stop and remove.\n\nMake the name reflect that to reduce confusion.\n\nSuggested-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "f363c407b42c467d06675c852e55f26adb959915", "tree": "695ffaf47ee7db5adfa9dd23976b5df77bd738c5", "parents": [ "1a269ade22bb65d0afc0d20e0a19602453fae04a" ], "author": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Mon Feb 13 12:58:53 2012 +0800" }, "committer": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Thu Feb 23 14:57:56 2012 +0100" }, "message": "ARM: at91: make sdram/ddr register base soc independent\n\nSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\n" }, { "commit": "ff80aa57cc9946d3dafe65119d576b3d11304303", "tree": "63c51d7e3515ecd1b92411d49be1104b107a7dc9", "parents": [ "11990b2b28dc6785c53c95b2a8f1d8605602a233" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 17 22:46:41 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Feb 21 14:27:18 2012 +0000" }, "message": "PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "11990b2b28dc6785c53c95b2a8f1d8605602a233", "tree": "94a6987d3a07a288ab527f7c151c9e9c95226c16", "parents": [ "136b758bbb12348db08aca7d7dd96a12db4b23f0" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 17 22:43:20 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Feb 21 14:27:18 2012 +0000" }, "message": "PCMCIA: make lubbock socket driver part of sa1111_cs\n\nLubbock is just another SA1111 socket driver, so now that Kconfig has\nbetter control of which files get built, we can sanitize the build\nfor this.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "136b758bbb12348db08aca7d7dd96a12db4b23f0", "tree": "57185d3af20cd892bebee4dd9e69ea3a819bc4ec", "parents": [ "e2adbecfcb08ae68e05d9a076b5d398cee939664" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 17 22:36:45 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Feb 21 14:27:14 2012 +0000" }, "message": "PCMCIA: add Kconfig control for building sa11xx_base.c\n\nsa11xx_base.c is currently built when either PCMCIA_SA1100 or\nPCMCIA_SA1111 are selected. Let\u0027s move the logic into Kconfig.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "e2adbecfcb08ae68e05d9a076b5d398cee939664", "tree": "cb88a10669cd78716acb4c21b9e66187bc7e20a4", "parents": [ "65c77dcaa4d175194588cc829ccf0f1709f257c5" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 16 09:28:49 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Feb 21 14:27:05 2012 +0000" }, "message": "PCMCIA: sa1111: jornada720: no need to disable IRQs around sa1111_set_io\n\nsa1111_set_io() already contains the necessary locking within itself\nto safely change the state of a set of GPIOs. There\u0027s no need for\ncallers to protect this by disabling IRQs themselves.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "65c77dcaa4d175194588cc829ccf0f1709f257c5", "tree": "14445c7bb2dcc69282074a36b358cd371232d86c", "parents": [ "1c3d038bd5fb9dc868bb7474caaddc7aea4d562e" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 16 09:27:33 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Feb 21 14:27:04 2012 +0000" }, "message": "PCMCIA: sa1111: pass along sa1111_pcmcia_configure_socket() failure code\n\nPass along the sa1111_pcmcia_configure_socket() failure code to\nhigher levels, rather than just returning zero.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "1c3d038bd5fb9dc868bb7474caaddc7aea4d562e", "tree": "ec853560944959c1ac0ff9a7bd4ed89a3fd4e4af", "parents": [ "a7670151a48cc54fafd8f1b4f04a1495c2f8b6f0" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jan 14 16:21:50 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Feb 21 14:27:04 2012 +0000" }, "message": "PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers\n\nsoc_common already initializes state.wrprot to zero, so explicitly\nsetting wrprot to zero in the socket drivers has no additional effect.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "a7670151a48cc54fafd8f1b4f04a1495c2f8b6f0", "tree": "9fb32c200209958f2306091f9e3a8e4f0987558b", "parents": [ "65474b457c323fa54aaff146e7caca9c0b37050f" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jan 13 23:09:23 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Feb 21 14:27:03 2012 +0000" }, "message": "PCMCIA: soc_common: remove soc_pcmcia_*_irqs functions\n\nNow that we use gpios and gpio_to_irq() etc to manage the various card\nstatus signals within soc_common, and all socket drivers are converted,\nthese functions are no longer used. We can now get rid of these helper\nfunctions.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "65474b457c323fa54aaff146e7caca9c0b37050f", "tree": "6521ae0243c835d3305cf68df97415f488bab9c3", "parents": [ "b1d8a5f91796179f33de9cd7fb26052fcc47b4fa" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jan 13 23:07:26 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Feb 21 14:27:03 2012 +0000" }, "message": "PCMCIA: sa11x0: h3600: convert to use new irq/gpio management\n\nConvert iPAQ socket driver to use the new irq/gpio management. As\nthis already uses the GPIO subsystem, these changes are localized\nto just the PCMCIA directory.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "b1d8a5f91796179f33de9cd7fb26052fcc47b4fa", "tree": "0829a261bc6c30993f81fd9df9a78c10ff729cd7", "parents": [ "3b61436a792517848ee386bd2ccf4fc3a75f1a0f" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jan 13 23:06:48 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Feb 21 14:27:03 2012 +0000" }, "message": "PCMCIA: sa11x0: simpad: convert to use new irq/gpio management\n\nConvert Simpad socket driver to use the new irq/gpio management.\nThis is slightly more involved because we have to touch the private\nplatform header file to modify the GPIO bitmasks to be GPIO numbers.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "3b61436a792517848ee386bd2ccf4fc3a75f1a0f", "tree": "86c0b6149e5bbdf488aee3f2eb479cc37905e358", "parents": [ "76346a4eabf85a44dc425c0197ba46a8884e6090" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jan 13 23:06:09 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Feb 21 14:27:02 2012 +0000" }, "message": "PCMCIA: sa11x0: shannon: convert to use new irq/gpio management\n\nConvert Shannon socket driver to use the new irq/gpio management.\nThis is slightly more involved because we have to touch the private\nplatform header file to modify the GPIO bitmasks to be GPIO numbers.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "8fb28231a907f02d879a075cee7ec610b6439be0", "tree": "cd294a321513058dd600e88a97f41df273fe2fbd", "parents": [ "be9bac9d33c0864ac7684c683df5da3b0c38e3b7" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Tue Dec 27 16:25:44 2011 +0800" }, "committer": { "name": "Haojian Zhuang", "email": "haojian.zhuang@marvell.com", "time": "Thu Feb 16 10:41:23 2012 +0800" }, "message": "ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe\n\nIf pxa2xx_drv_pcmcia_add_one fails, it will go to err1 error path.\nAdd a missing clk_put in the error path.\n\nChecking the ret value after the for loop is redundant, it is always false.\nThus remove the redundant checking.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nAcked-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nAcked-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\n" }, { "commit": "ae99ddbc976572194e8a68cb9ca1e27805ce30c7", "tree": "1c9beadf736c4038625a77cefd6f030cfba130ce", "parents": [ "6bd72f0562142ddae26a052cfc4e578ad6953d06" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 26 13:25:47 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 09 15:34:50 2012 +0000" }, "message": "ARM: sa1111: add platform enable/disable functions\n\nAdd platform hooks to be called when individual sa1111 devices are\nenabled and disabled. This will allow us to move some platform\nspecifics out of the individual drivers.\n\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "6ad1b614007c556129989b9f6b020d0d2e058121", "tree": "d146b694cad7d3134b3166f56f401b203e073811", "parents": [ "710455201f6690841e9a40bedba09ddd0a7e0620" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 16 09:31:47 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 09 15:34:14 2012 +0000" }, "message": "ARM: sa11x0: neponset: provide function to manipulate NCR_0\n\nRather than having direct register accesses to NCR_0 scattered amongst\nthe code, provide a function instead. This contains the necessary\nrace protection for this platform, ensuring that updates to this\nregister are safe.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "025e4ab3db07fcbf62c01e4f30d1012234beb980", "tree": "c23464148c67894ad23cd8c3b0c45fb8ad4e3660", "parents": [ "b9980cdcf2524c5fe15d8cbae9c97b3ed6385563" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 08 17:13:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 08 19:03:51 2012 -0800" }, "message": "pcmcia: fix socket refcount decrementing on each resume\n\nThis fixes a memory-corrupting bug: not only does it cause the warning,\nbut as a result of dropping the refcount to zero, it causes the\npcmcia_socket0 device structure to be freed while it still has\nreferences, causing slab caches corruption. A fatal oops quickly\nfollows this warning - often even just a \u0027dmesg\u0027 following the warning\ncauses the kernel to oops.\n\nWhile testing suspend/resume on an ARM device with PCMCIA support, and a\nCF card inserted, I found that after five suspend and resumes, the\nkernel would complain, and shortly die after with slab corruption.\n\n WARNING: at include/linux/kref.h:41 kobject_get+0x28/0x50()\n\nAs the message doesn\u0027t give a clue about which kobject, and the built-in\ndebugging in drivers/base/power/main.c happens too late, this was added\nright before each get_device():\n\n printk(\"%s: %p [%s] %u\\n\", __func__, dev, kobject_name(\u0026dev-\u003ekobj), atomic_read(\u0026dev-\u003ekobj.kref.refcount));\n\nand on the 3rd s2ram cycle, the following behaviour observed:\n\nOn the 3rd suspend/resume cycle:\n\n dpm_prepare: c1a0d998 [pcmcia_socket0] 3\n dpm_suspend: c1a0d998 [pcmcia_socket0] 3\n dpm_suspend_noirq: c1a0d998 [pcmcia_socket0] 3\n dpm_resume_noirq: c1a0d998 [pcmcia_socket0] 3\n dpm_resume: c1a0d998 [pcmcia_socket0] 3\n dpm_complete: c1a0d998 [pcmcia_socket0] 2\n\n4th:\n\n dpm_prepare: c1a0d998 [pcmcia_socket0] 2\n dpm_suspend: c1a0d998 [pcmcia_socket0] 2\n dpm_suspend_noirq: c1a0d998 [pcmcia_socket0] 2\n dpm_resume_noirq: c1a0d998 [pcmcia_socket0] 2\n dpm_resume: c1a0d998 [pcmcia_socket0] 2\n dpm_complete: c1a0d998 [pcmcia_socket0] 1\n\n5th:\n\n dpm_prepare: c1a0d998 [pcmcia_socket0] 1\n dpm_suspend: c1a0d998 [pcmcia_socket0] 1\n dpm_suspend_noirq: c1a0d998 [pcmcia_socket0] 1\n dpm_resume_noirq: c1a0d998 [pcmcia_socket0] 1\n dpm_resume: c1a0d998 [pcmcia_socket0] 1\n dpm_complete: c1a0d998 [pcmcia_socket0] 0\n ------------[ cut here ]------------\n WARNING: at include/linux/kref.h:41 kobject_get+0x28/0x50()\n Modules linked in: ucb1x00_core\n Backtrace:\n [\u003cc0212090\u003e] (dump_backtrace+0x0/0x110) from [\u003cc04799dc\u003e] (dump_stack+0x18/0x1c)\n [\u003cc04799c4\u003e] (dump_stack+0x0/0x1c) from [\u003cc021cba0\u003e] (warn_slowpath_common+0x50/0x68)\n [\u003cc021cb50\u003e] (warn_slowpath_common+0x0/0x68) from [\u003cc021cbdc\u003e] (warn_slowpath_null+0x24/0x28)\n [\u003cc021cbb8\u003e] (warn_slowpath_null+0x0/0x28) from [\u003cc0335374\u003e] (kobject_get+0x28/0x50)\n [\u003cc033534c\u003e] (kobject_get+0x0/0x50) from [\u003cc03804f4\u003e] (get_device+0x1c/0x24)\n [\u003cc0388c90\u003e] (dpm_complete+0x0/0x1a0) from [\u003cc0389cc0\u003e] (dpm_resume_end+0x1c/0x20)\n ...\n\nLooking at commit 7b24e7988263 (\"pcmcia: split up central event handler\"),\nthe following change was made to cs.c:\n\n return 0;\n }\n #endif\n-\n- send_event(skt, CS_EVENT_PM_RESUME, CS_EVENT_PRI_LOW);\n+ if (!(skt-\u003estate \u0026 SOCKET_CARDBUS) \u0026\u0026 (skt-\u003ecallback))\n+ skt-\u003ecallback-\u003eearly_resume(skt);\n return 0;\n }\n\nAnd the corresponding change in ds.c is from:\n\n-static int ds_event(struct pcmcia_socket *skt, event_t event, int priority)\n-{\n- struct pcmcia_socket *s \u003d pcmcia_get_socket(skt);\n...\n- switch (event) {\n...\n- case CS_EVENT_PM_RESUME:\n- if (verify_cis_cache(skt) !\u003d 0) {\n- dev_dbg(\u0026skt-\u003edev, \"cis mismatch - different card\\n\");\n- /* first, remove the card */\n- ds_event(skt, CS_EVENT_CARD_REMOVAL, CS_EVENT_PRI_HIGH);\n- mutex_lock(\u0026s-\u003eops_mutex);\n- destroy_cis_cache(skt);\n- kfree(skt-\u003efake_cis);\n- skt-\u003efake_cis \u003d NULL;\n- s-\u003efunctions \u003d 0;\n- mutex_unlock(\u0026s-\u003eops_mutex);\n- /* now, add the new card */\n- ds_event(skt, CS_EVENT_CARD_INSERTION,\n- CS_EVENT_PRI_LOW);\n- }\n- break;\n...\n- }\n\n- pcmcia_put_socket(s);\n\n- return 0;\n-} /* ds_event */\n\nto:\n\n+static int pcmcia_bus_early_resume(struct pcmcia_socket *skt)\n+{\n+ if (!verify_cis_cache(skt)) {\n+ pcmcia_put_socket(skt);\n+ return 0;\n+ }\n\n+ dev_dbg(\u0026skt-\u003edev, \"cis mismatch - different card\\n\");\n\n+ /* first, remove the card */\n+ pcmcia_bus_remove(skt);\n+ mutex_lock(\u0026skt-\u003eops_mutex);\n+ destroy_cis_cache(skt);\n+ kfree(skt-\u003efake_cis);\n+ skt-\u003efake_cis \u003d NULL;\n+ skt-\u003efunctions \u003d 0;\n+ mutex_unlock(\u0026skt-\u003eops_mutex);\n\n+ /* now, add the new card */\n+ pcmcia_bus_add(skt);\n+ return 0;\n+}\n\nAs can be seen, the original function called pcmcia_get_socket() and\npcmcia_put_socket() around the guts, whereas the replacement code\ncalls pcmcia_put_socket() only in one path. This creates an imbalance\nin the refcounting.\n\nTesting with pcmcia_put_socket() put removed shows that the bug is gone:\n\n dpm_suspend: c1a10998 [pcmcia_socket0] 5\n dpm_suspend_noirq: c1a10998 [pcmcia_socket0] 5\n dpm_resume_noirq: c1a10998 [pcmcia_socket0] 5\n dpm_resume: c1a10998 [pcmcia_socket0] 5\n dpm_complete: c1a10998 [pcmcia_socket0] 5\n\nTested-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nCc: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nCc: \u003cstable@vger.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": "76346a4eabf85a44dc425c0197ba46a8884e6090", "tree": "adc6224fe2626cdee005cd7b6589539d2150b2c8", "parents": [ "7cf779cb8ddeef797a3a265889c7f088d42a12f7" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Jan 18 12:37:20 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Feb 04 14:32:24 2012 +0000" }, "message": "PCMCIA: sa11x0: nanoengine: convert reset handling to use GPIO subsystem\n\nRather than accessing GPSR and GPCR directly, use the GPIO subsystem\ninstead.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "7cf779cb8ddeef797a3a265889c7f088d42a12f7", "tree": "6533ca24db08d6bdfb42a257787ffb54c1ca41aa", "parents": [ "bbb58a1210c6fdc68b09f7b9e12096c2a1886aa1" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jan 13 23:05:12 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Feb 04 14:32:24 2012 +0000" }, "message": "PCMCIA: sa11x0: nanoengine: convert to use new irq/gpio management\n\nConvert Nanoengine socket driver to use the new irq/gpio management.\nThis is slightly more involved because we have to touch the private\nplatform header file to modify the GPIO bitmasks to be GPIO numbers.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "bbb58a1210c6fdc68b09f7b9e12096c2a1886aa1", "tree": "311514f4b7b7e757e135eeedb9cf7f5bab6efafc", "parents": [ "f793e3ab9f4cfbdba6269c8a6c522c5d665289b1" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Jan 18 12:32:37 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Feb 04 14:32:23 2012 +0000" }, "message": "PCMCIA: sa11x0: cerf: convert reset handling to use GPIO subsystem\n\nRather than accessing GPSR and GPCR directly, use the GPIO subsystem\ninstead.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "f793e3ab9f4cfbdba6269c8a6c522c5d665289b1", "tree": "6744793c063a6c80269c36c49badc8d6e1674ff0", "parents": [ "03e0092c85e34b6f84bb3b852579b78a17496be2" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jan 13 23:03:57 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Feb 04 14:32:23 2012 +0000" }, "message": "PCMCIA: sa11x0: cerf: convert to use new irq/gpio management\n\nConvert Cerf socket driver to use the new irq/gpio management.\nThis is slightly more involved because we have to touch the private\nplatform header file to modify the GPIO bitmasks to be GPIO numbers.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "03e0092c85e34b6f84bb3b852579b78a17496be2", "tree": "caf8b1fc6e1f1a21ea2009437c8f4657d90ef6a0", "parents": [ "81f33c65e6c09597e748288010476861ac5bd166" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jan 13 23:02:15 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Feb 04 14:32:23 2012 +0000" }, "message": "PCMCIA: sa11x0: assabet: convert to use new irq/gpio management\n\nConvert Assabet socket driver to use the new irq/gpio management.\nThis is slightly more involved because we have to touch the private\nplatform header file to modify the GPIO bitmasks to be GPIO numbers.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "81f33c65e6c09597e748288010476861ac5bd166", "tree": "fdc080d5d7ca25dfe4a033f31f419d8bb1124e7d", "parents": [ "a9bb5a4bf9f84256499c802fd397d56d55227e4f" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Dec 19 23:04:22 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Feb 04 14:32:23 2012 +0000" }, "message": "PCMCIA: sa1111: use new per-socket irq/gpio infrastructure\n\nConvert sa1111 PCMCIA drivers to use the new per-socket irq/gpio\ninfrastructure. As the core takes care of handling the IRQs, we\ncan get rid of sa1111_pcmcia_socket_init(), sa1111_pcmcia_socket_suspend(),\nsa1111_pcmcia_hw_init() and sa1111_pcmcia_hw_shutdown(), as well\nas the private IRQ table.\n\nWe remove the NCR_0 setting in Neponset, as this is duplicating\nwhat\u0027s already done via configure_socket in suspend.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "a9bb5a4bf9f84256499c802fd397d56d55227e4f", "tree": "793a74bebd0ed3f254035cb14caa093f58bb8bf6", "parents": [ "d9dc878769f521f494d1617d7cd0c92073df75d8" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jan 13 22:56:32 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Feb 04 14:32:22 2012 +0000" }, "message": "PCMCIA: pxa: convert PXA socket drivers to use new irq/gpio management\n\nConvert all the PXA platform socket drivers to use the new irq/gpio\nmanagement provided by soc_common. This relieves these drivers from\nhaving to do anything with these GPIOs other than provide the numbers\nto soc_common.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "bd1d462e13b278fc57752d0b9b15040e60e561a0", "tree": "e2fdf1c18a93aab02830bcb8a5db8cdddfbb63a8", "parents": [ "d5c38b137ac8a6e3dbed13bc494d60df5b69dfc4", "62aa2b537c6f5957afd98e29f96897419ed5ebab" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Feb 02 11:24:44 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Feb 02 11:24:44 2012 -0800" }, "message": "Merge 3.3-rc2 into the driver-core-next branch.\n\nThis was done to resolve a merge and build problem with the\ndrivers/acpi/processor_driver.c file.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "ed283e9f0a2cc0541870828c76c6c6997c51a318", "tree": "60950f46dae4af2cd8648e1c187a198e481904c7", "parents": [ "fad12ac8c8c2591c7f4e61d19b6a9d76cd49fafa" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Tue Jan 24 14:35:13 2012 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Jan 26 17:04:39 2012 -0800" }, "message": "USB/PCI/PCMCIA: Clean up new_id and remove_id sysfs attribute routines\n\nThis patch (as1514) cleans up some places where new_id and remove_id\nsysfs attributes are created and deleted. Handling both attributes in\na single routine rather than a pair of routines makes the code\nsmaller. It also prevents certain kinds of errors, like one we\ncurrently have in the USB subsystem: The removeid attribute is often\ncreated even when newid isn\u0027t (because the driver\u0027s no_dynamid_id flag\nis set).\n\nIn the case of the PCMCIA subsystem, the newid attribute is created\nbut never explicitly deleted. The patch adds a deletion routine.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "d9dc878769f521f494d1617d7cd0c92073df75d8", "tree": "79e79c50c211af91e48f38a7beed61e7425495bc", "parents": [ "e0d21178ceb06f5bfa81a5697f68384f74af054a" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Dec 19 22:00:22 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 26 19:57:24 2012 +0000" }, "message": "PCMCIA: soc_common: add GPIO support for card status signals\n\nAdd GPIO support for reading the card status (card detect, ready,\nbattery voltage detect) signals into soc_common code. As we want\ninterrupts from these GPIOs, this takes over the old irq handling\ninfrastructure for card status signals, which will now be managed\nentirely by the soc_common code.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "e0d21178ceb06f5bfa81a5697f68384f74af054a", "tree": "3ff7a16187d91c0e703f14ab9ea9d336719549d9", "parents": [ "dcd6c92267155e70a94b3927bce681ce74b80d1f" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Dec 19 14:07:31 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 26 19:57:17 2012 +0000" }, "message": "PCMCIA: soc_common: move common initialization into soc_common\n\nMove common socket initialization into soc_common.c.\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "cef9bc56e1e944afd11f96de569657117a138c6d", "tree": "45923c4dec748e82a05313c9c7d443aa11e02a5f", "parents": [ "fde25a9b63b9a3dc91365c394a426ebe64cfc2da" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Tue Jan 24 13:34:41 2012 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Jan 24 16:00:35 2012 -0800" }, "message": "Dynamic ID addition doesn\u0027t need get_driver()\n\nAs part of the removal of get_driver()/put_driver(), this patch\n(as1511) changes all the places that add dynamic IDs for drivers.\nSince these additions are done by writing to the drivers\u0027 sysfs\nattribute files, and the attributes are removed when the drivers are\nunregistered, there is no reason to take an extra reference to the\ndrivers.\n\nThe one exception is the pci-stub driver, which calls pci_add_dynid()\nas part of its registration. But again, there\u0027s no reason to take an\nextra reference here, because the driver can\u0027t be unloaded while it is\nbeing registered.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCC: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCC: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCC: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "171cf94ccb4b476d1d7d694a31d0820558375132", "tree": "a7874cd87511ee26ea3ee07d15706ac51746777e", "parents": [ "b3945bcbc3f9856f4b5452079bfc2b9738040a37" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 24 21:33:26 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 24 21:33:26 2012 +0000" }, "message": "PCMCIA: fix sa1111 oops on remove\n\nThe sa1111 socket driver oopses when removed:\n\nUnable to handle kernel NULL pointer dereference at virtual address 000003b0\npgd \u003d c1b40000\n[000003b0] *pgd\u003d00000000\nInternal error: Oops: 41b43005 [#1]\nModules linked in:\nCPU: 0 Not tainted (3.3.0-rc1+ #744)\nPC is at pcmcia_remove+0x3c/0x60\nLR is at pcmcia_remove+0x34/0x60\n\nThis is because we try to dereference a NULL \u0027s\u0027 to obtain the next\npointer. Fix this.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "4964e0664c80680fa6b28ef91381c076a5b25c2c", "tree": "62099c5aaeee7274bcc66bcfba35d479affa97cf", "parents": [ "0a80939b3e6af4b0dc93bf88ec02fd7e90a16f1b", "7bf6612e8a9d6a0b3b82e8e2611942be1258b307" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 13:05:21 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 13:05:21 2012 -0800" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)\n MIPS: Delete unused function add_temporary_entry.\n MIPS: Set default pci cache line size.\n MIPS: Flush huge TLB\n MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.\n MIPS: Octeon: Add support for OCTEON II PCIe\n MIPS: Octeon: Update PCI Latency timer and enable more error reporting.\n MIPS: Alchemy: Update cpu-feature-overrides\n MIPS: Alchemy: db1200: Improve PB1200 detection.\n MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.\n MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller\n MIPS: Alchemy: irq: register pm at irq init time\n MIPS: Alchemy: Touchscreen support on DB1100\n MIPS: Alchemy: Hook up IrDA on DB1000/DB1100\n net/irda: convert au1k_ir to platform driver.\n MIPS: Alchemy: remove unused board headers\n MTD: nand: make au1550nd.c a platform_driver\n MIPS: Netlogic: Mark Netlogic chips as SMT capable\n MIPS: Netlogic: Add support for XLP 3XX cores\n MIPS: Netlogic: Merge some of XLR/XLP wakup code\n MIPS: Netlogic: Add default XLP config.\n ...\n\nFix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,\ntraps.c} and drivers/tty/serial/Makefile\n" }, { "commit": "90ab5ee94171b3e28de6bb42ee30b527014e0be7", "tree": "fcf89889f6e881f2b231d3d20287c08174ce4b54", "parents": [ "476bc0015bf09dad39d36a8b19f76f0c181d1ec9" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:20 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:20 2012 +1030" }, "message": "module_param: make bool parameters really bool (drivers \u0026 misc)\n\nmodule_param(bool) used to counter-intuitively take an int. In\nfddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy\ntrick.\n\nIt\u0027s time to remove the int/unsigned int option. For this version\nit\u0027ll simply give a warning, but it\u0027ll break next kernel version.\n\nAcked-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "34641de2ef118b9c78a842fb75e6d3cc49c1de31", "tree": "9bb914f399203e1fba53f314f5cfe67d01aefcee", "parents": [ "e0bf102e1df73182e98c5ff96711b04534bc7bd9" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Mon Dec 05 19:06:06 2011 +0800" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Dec 28 10:14:04 2011 +0000" }, "message": "pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()\n\nSince commit 6384fd \"ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ\",\nI got buid errors due to implicit declaration of function \u0027IRQ_GPIO\u0027.\n\nUse common gpio_to_irq() to replace machine dependant macro IRQ_GPIO().\n\nCc: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nCc: Ian Molton \u003cspyro@f2s.com\u003e\nCc: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nCc: Zhuang \u003chaojian.zhuang@marvell.com\u003e\nCc: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nAcked-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\nAcked-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nAcked-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "64cd04d0cffa3b3af0e81aa3112b71f135739e1a", "tree": "7c66ce3a94ae3cc638a88fd2e55a86bcaf760880", "parents": [ "809f36c6f4a0568178c909ff1096ca83eae33f7d" ], "author": { "name": "Manuel Lauss", "email": "manuel.lauss@googlemail.com", "time": "Thu Nov 10 12:03:26 2011 +0000" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Wed Dec 07 22:02:06 2011 +0000" }, "message": "MIPS: Alchemy: Basic support for the DB1300 board.\n\nSigned-off-by: Manuel Lauss \u003cmanuel.lauss@googlemail.com\u003e\nTo: linux-mips@linux-mips.org\nPatchwork: https://patchwork.linux-mips.org/patch/2867/\nPatchwork: https://patchwork.linux-mips.org/patch/2919/\nPatchwork: https://patchwork.linux-mips.org/patch/2928/\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "3f724080a3e91d76ba6d5cacd3cf0a0cf16d121a", "tree": "5e5b5606bd4822b6b8a4a0f1ef87332b7874af47", "parents": [ "5611cc4572e889b62a7b4c72a413536bf6a9c416" ], "author": { "name": "Manuel Lauss", "email": "manuel.lauss@googlemail.com", "time": "Wed Nov 02 12:53:44 2011 +0100" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Wed Dec 07 22:02:05 2011 +0000" }, "message": "MIPS: Alchemy: remove PB1000 support\n\nNoone seems to have test hardware or care anymore. Drop PB1000 support\nand along with it the old Alchemy PCMCIA socket driver.\n\nSigned-off-by: Manuel Lauss \u003cmanuel.lauss@googlemail.com\u003e\nTo: linux-mips@linux-mips.org\nCc: netdev@vger.kernel.org\nCc: linux-pcmcia@lists.infradead.org\nPatchwork: https://patchwork.linux-mips.org/patch/2881/\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "951c486f62490e032da0ad17e93270b0cfb6687f", "tree": "f86c974dc0771add622a0aff1c09dc4fe653d380", "parents": [ "389eda15e0f41112d7c44213b3c4f8bd1c9398bc" ], "author": { "name": "Haojian Zhuang", "email": "haojian.zhuang@marvell.com", "time": "Mon Nov 14 20:52:26 2011 +0800" }, "committer": { "name": "Haojian Zhuang", "email": "hzhuang1@hexinfolabs.org", "time": "Tue Nov 15 19:09:56 2011 +0800" }, "message": "driver: pcmcia: replace IRQ_GPIO() with gpio_to_irq()\n\nUse common gpio_to_irq() to replace machine dependant macro IRQ_GPIO().\n\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@marvell.com\u003e\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "7a3f8de5a3c36e5fde130cae74a06663b59837ae", "tree": "71cbf9c7ac4b1f7ad53bd033a188b16d82543feb", "parents": [ "7124cb96cadc5f9990ade39780b672b01bfc6484" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Nov 05 22:06:17 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Nov 05 22:26:46 2011 +0000" }, "message": "ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver\n\nThe includes in the pxa2xx_cm_x2xx PCMCIA driver are rather random;\nthe driver doesn\u0027t require anything from these headers except the\ncpu_is_xxx() macros which come from another include.\n\nThe concern is that it\u0027s getting these definitions via mach/system.h,\nwhich is supposed to only be included by arch/arm/kernel/process.c.\nAs this header is scheduled for cleanup (and elimination) keeping\nthe status quo will cause build errors. So lets fix properly and\nindependent of the future work.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "d5240dfd3c80ad2fd17b25ca38d199ab1262ab6e", "tree": "3576b5649564fcce4e425533e72d9ac48e255732", "parents": [ "5c8a0fbba543d9428a486f0d1282bbcf3cf1d95a" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Oct 27 11:33:15 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Nov 05 19:09:40 2011 +0000" }, "message": "ARM: PXA: fix lubbock PCMCIA driver build error\n\nFix:\n\nERROR: \"pxa2xx_configure_sockets\" [drivers/pcmcia/pxa2xx_lubbock_cs.ko] undefined!\n\nby exporting the required function.\n\nAcked-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "68e24ba70465b82ad24e0774ceab5360180d4627", "tree": "5d2b8e22e556360f353b2d1c73a19aaf6c5becd9", "parents": [ "b4beb4bf9934d151bf4581a54ae028927374cb2a", "5725aeae5ff2e39f3815bbef788ee326c9afea2c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 19:55:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 19:55:06 2011 -0700" }, "message": "Merge branch \u0027next/fixes\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/fixes\u0027 of git://git.linaro.org/people/arnd/arm-soc: (28 commits)\n ARM: pxa/cm-x300: properly set bt_reset pin\n ARM: mmp: rename SHEEVAD to GPLUGD\n ARM: imx: Fix typo \u0027MACH_MX31_3DS_MXC_NAND_USE_BBT\u0027\n ARM: i.MX28: shift frac value in _CLK_SET_RATE\n plat-mxc: iomux-v3.h: implicitly enable pull-up/down when that\u0027s desired\n ARM: mx5: fix clock usage for suspend\n ARM: pxa: use correct __iomem annotations\n ARM: pxa: sharpsl pm needs SPI\n ARM: pxa: centro and treo680 need palm27x\n ARM: pxa: make pxafb_smart_*() empty when not enabled\n ARM: pxa: select POWER_SUPPLY on raumfeld\n ARM: pxa: pxa95x is incompatible with earlier pxa\n ARM: pxa: CPU_FREQ_TABLE is needed for CPU_FREQ\n ARM: pxa: pxa95x/saarb depends on pxa3xx code\n ARM: pxa: allow selecting just one of TREO680/CENTRO\n ARM: pxa: export symbols from pxa3xx-ulpi\n ARM: pxa: make zylonite_pxa*_init declaration match code\n ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available\n ARM: at91: add defconfig for at91sam9g45 family\n ARM: at91: remove dependency for Atmel PWM driver selector in Kconfig\n ...\n" }, { "commit": "402b20de62f4183d70fae335ca33b0327bdf0afd", "tree": "3dce1b787737d35dbdf857dc406970e9296e16de", "parents": [ "3bf8d64d394dc26b17abde97a541229a2a146ad2" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Jul 31 16:21:42 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:32:20 2011 -0400" }, "message": "pcmcia: Add export.h to drivers/pcmcia as required.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "3bf8d64d394dc26b17abde97a541229a2a146ad2", "tree": "8c6ab049afed346d0f535f0f22b908639229ba7b", "parents": [ "475c0a6b2cff037ca522d3aff839024ab30ed7eb" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Jul 28 18:44:02 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:32:20 2011 -0400" }, "message": "pcmcia: add module.h to db1xxx_ss.c since it is modular.\n\nAs we will get this after the module.h usage cleanup.\n\ndrivers/pcmcia/db1xxx_ss.c:577: warning: type defaults to \u0027int\u0027 in declaration of \u0027MODULE_LICENSE\u0027\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "43872fa788060eef91ae437957e0a5e39f1c56fd", "tree": "dba464da61167d84b4f7470edebd5a769a78f9ee", "parents": [ "91fed558d0f33c74477569f50ed883fe6d430f1f", "f55be1bf52aad524dc1bf556ae26c90262c87825" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 22:44:18 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 22:44:18 2011 +0100" }, "message": "Merge branch \u0027depends/rmk/gpio\u0027 into next/fixes\n\nThis sorts out merge conflicts with the arm/gpio branch that\nalready got merged into mainline Linux.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "ca90666287401b475d9e0becf85bd02f069f1de8", "tree": "ad4dd789f8d5ab639c78997d3655b94fcbf660ef", "parents": [ "60325f0c6ee7c6b68f95aaa643260fb33d4bdd88", "374e759db148d1e874e3afb76707082af67e0984" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 27 08:39:10 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 27 08:39:10 2011 +0200" }, "message": "Merge branch \u0027gpio\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027gpio\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)\n ARM: 7135/1: ep93xx: bring back missing \u003cmach/gpio.h\u003e\n ARM: 7104/1: plat-pxa: break out GPIO driver specifics\n ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem\n ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics\n ARM: 7101/1: arm/tegra: Replace \u003cmach/gpio.h\u003e with \u003cmach/gpio-tegra.h\u003e\n ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h\n ARM: 7083/1: rewrite U300 GPIO to use gpiolib\n ARM: 7074/1: gpio: davinci: eliminate unused variable warnings\n ARM: 7063/1: Orion: gpio: add missing include of linux/types.h\n ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build\n ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio\n ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq\n ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio\n ARM: 7057/1: mach-pnx4008: rename GPIO header\n ARM: 7056/1: plat-nomadik: kill off \u003cplat/gpio.h\u003e\n ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function\n ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem\n ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics\n ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem\n ARM: 7043/1: mach-ixp2000: rename GPIO header\n ...\n\nFix up trivial conflicts in arch/arm/mach-u300/Kconfig manually\n" }, { "commit": "de0bc0d1b008d1240c03a0bac4f5534f995ab802", "tree": "3f3b230d3ff6d3d1f27ceb5525867228668f44c2", "parents": [ "f24dec9fdafadca53bf9db460da2cbbbfccdb584" ], "author": { "name": "Jochen Friedrich", "email": "jochen@scram.de", "time": "Thu Aug 18 21:50:31 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Oct 17 09:12:42 2011 +0100" }, "message": "ARM: 7024/1: simpad: Cleanup CS3 accessors.\n\n- prepend CS3 accessors by simpad_ to indicate they\n are specific to simpad devices.\n- use spinlock to protect shadow register.\n- implement 8 read-only pins.\n- use readl/writel macros so barriers are used where\n necessary.\n- register CS3 as GPIO controller with 24 pins\n (16 output only and 8 input only).\n- fix PCMCIA driver to access the read-only pins\n rather than the shadow register for status bits.\n\nSigned-off-by: Jochen Friedrich \u003cjochen@scram.de\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "97b09da4ee36ec4bd0f6e16b84b4bb6fa05db110", "tree": "34c80d050a0cc8538d0fc22213772560dc3db2f3", "parents": [ "7272889d3f40ed6aa2ade32bed5834789b3299cc" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Oct 01 22:03:45 2011 +0200" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Sat Oct 08 21:03:07 2011 +0800" }, "message": "ARM: pxa: use correct __iomem annotations\n\nThis tries to clear up the confusion between integers and iomem pointers\nin the marvell pxa platform. MMIO addresses are supposed to be __iomem*\nvalues, in order to let the Linux type checking work correctly. This\npatch moves the cast to __iomem as far back as possible, to the place\nwhere the MMIO virtual address windows are defined.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "50ac01fbd29ba208d0cd4cb9467d3ffc07ae834a", "tree": "851f17edc4545a3bcdf94052baa87e5c9d4e6ad4", "parents": [ "e6b750d4ba2fda038ba8e37eda59ec49d31ae88b" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jul 26 11:01:15 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Aug 08 14:28:08 2011 +0100" }, "message": "ARM: gpio: pxa: convert drivers to use asm/gpio.h rather than mach/gpio.h\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "f33c596a2f921696391801b637ed50d514634079", "tree": "abc353fe3ef128e60e20a6b73f52858ce6d39eff", "parents": [ "250f8e3db646028353a2a737ddb7a894c97a1098", "74411c04540404a1ff29d254584ef393e150aeda" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 31 06:23:08 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 31 06:23:08 2011 -1000" }, "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:\n smc91c92_cs.c: fix bogus compiler warning\n orinoco_cs: be more careful when matching cards with ID 0x0156:0x0002\n hostap_cs: support cards with \"Version 01.02\" as third product ID\n pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3\n pxa2xx pcmcia - stargate 2 use gpio array.\n pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.\n drivers:pcmcia:soc_common: make socket_init and socket_suspend optional\n" }, { "commit": "5be56a62a2868f4b7733c7c51106a8b0a88b9380", "tree": "5ce03b15ea5c5741b8cc620098792b69221ffb3c", "parents": [ "7594549e8acec8123c45e26750b7820d9e938760" ], "author": { "name": "Jonathan Cameron", "email": "jic23@cam.ac.uk", "time": "Wed Jul 13 15:54:58 2011 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Jul 29 17:55:15 2011 +0200" }, "message": "pxa2xx pcmcia - stargate 2 use gpio array.\n\nKill off the buff gpio as not used anywhere.\n\nSigned-off-by: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "7594549e8acec8123c45e26750b7820d9e938760", "tree": "f6c374eb939831b2db5db283e36374c6f3e0c7b3", "parents": [ "a747ce835e69069f9bccfb7791008127012cbf32" ], "author": { "name": "Jonathan Cameron", "email": "jic23@cam.ac.uk", "time": "Wed Jul 13 15:54:57 2011 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Jul 29 17:55:13 2011 +0200" }, "message": "pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.\n\nNow the are optional, let us get rid of the ones that don\u0027t have\nany content.\n\nSigned-off-by: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "a747ce835e69069f9bccfb7791008127012cbf32", "tree": "62af73dbb14057a33fbddc303c27ed3e6ad32c7e", "parents": [ "02f8c6aee8df3cdc935e9bdd4f2d020306035dbe" ], "author": { "name": "Jonathan Cameron", "email": "jic23@cam.ac.uk", "time": "Wed Jul 13 15:54:56 2011 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Jul 29 17:55:10 2011 +0200" }, "message": "drivers:pcmcia:soc_common: make socket_init and socket_suspend optional\n\n10 boards define these empty, probably indicating not everyone has a use for them.\n\nSigned-off-by: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "d3ec4844d449cf7af9e749f73ba2052fb7b72fc2", "tree": "c515913e85f7e50878c83da2a88bc5a7269d087c", "parents": [ "0003230e8200699860f0b10af524dc47bf8aecad", "df2e301fee3c2c2a87592151397ad7699bb14c37" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 13:56:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 13:56:39 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n fs: Merge split strings\n treewide: fix potentially dangerous trailing \u0027;\u0027 in #defined values/expressions\n uwb: Fix misspelling of neighbourhood in comment\n net, netfilter: Remove redundant goto in ebt_ulog_packet\n trivial: don\u0027t touch files that are removed in the staging tree\n lib/vsprintf: replace link to Draft by final RFC number\n doc: Kconfig: `to be\u0027 -\u003e `be\u0027\n doc: Kconfig: Typo: square -\u003e squared\n doc: Konfig: Documentation/power/{pm \u003d\u003e apm-acpi}.txt\n drivers/net: static should be at beginning of declaration\n drivers/media: static should be at beginning of declaration\n drivers/i2c: static should be at beginning of declaration\n XTENSA: static should be at beginning of declaration\n SH: static should be at beginning of declaration\n MIPS: static should be at beginning of declaration\n ARM: static should be at beginning of declaration\n rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check\n Update my e-mail address\n PCIe ASPM: forcedly -\u003e forcibly\n gma500: push through device driver tree\n ...\n\nFix up trivial conflicts:\n - arch/arm/mach-ep93xx/dma-m2p.c (deleted)\n - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)\n - drivers/net/r8169.c (just context changes)\n" }, { "commit": "ae4c42e4e4d76d003f8ca551fe1aef93ff9a4b21", "tree": "2bff2e4f4456077e7d7c589c8c28824f12dfa21c", "parents": [ "dd58ecba48edf14be1a5f70120fcd3002277a74a", "ab2a0e0d135490729e384c1826d118f92e88cae8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 12:38:42 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 12:38:42 2011 -0700" }, "message": "Merge branch \u0027next/cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc\n\n* \u0027next/cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (133 commits)\n ARM: EXYNOS4: Change devname for FIMD clkdev\n ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx\n ARM: S5PV210: Cleanup mach/regs-fb.h from mach-s5pv210\n ARM: S5PC100: Cleanup mach/regs-fb.h from mach-s5pc100\n ARM: S3C24XX: Use generic s3c_set_platdata for devices\n ARM: S3C64XX: Use generic s3c_set_platdata for OneNAND\n ARM: SAMSUNG: Use generic s3c_set_platdata for NAND\n ARM: SAMSUNG: Use generic s3c_set_platdata for USB OHCI\n ARM: SAMSUNG: Use generic s3c_set_platdata for HWMON\n ARM: SAMSUNG: Use generic s3c_set_platdata for FB\n ARM: SAMSUNG: Use generic s3c_set_platdata for TS\n ARM: S3C64XX: Add PWM backlight support on SMDK6410\n ARM: S5P64X0: Add PWM backlight support on SMDK6450\n ARM: S5P64X0: Add PWM backlight support on SMDK6440\n ARM: S5PC100: Add PWM backlight support on SMDKC100\n ARM: S5PV210: Add PWM backlight support on SMDKV210\n ARM: EXYNOS4: Add PWM backlight support on SMDKC210\n ARM: EXYNOS4: Add PWM backlight support on SMDKV310\n ARM: SAMSUNG: Create a common infrastructure for PWM backlight support\n clocksource: convert 32-bit down counting clocksource on S5PV210/S5P64X0\n ...\n\nFix up trivial conflict in arch/arm/mach-imx/mach-scb9328.c\n" }, { "commit": "b7e9c223be8ce335e30f2cf6ba588e6a4092275c", "tree": "2d1e3b75606abc18df7ad65e51ac3f90cd68b38d", "parents": [ "c172d82500a6cf3c32d1e650722a1055d72ce858", "e3bbfa78bab125f58b831b5f7f45b5a305091d72" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jul 11 14:15:48 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jul 11 14:15:55 2011 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nSync with Linus\u0027 tree to be able to apply pending patches that\nare based on newer code already present upstream.\n" }, { "commit": "226d3a151108970cb0c0c74c3a0ec2c073fdc186", "tree": "1c4a2592218130b6c0a41f49bfd7f5ce778f98ad", "parents": [ "b34e7b4f05730e6f26e9d8d3736271b0e4cdeac2" ], "author": { "name": "Jonathan Cameron", "email": "jic23@cam.ac.uk", "time": "Mon Jun 06 14:52:25 2011 +0100" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Mon Jul 11 14:43:33 2011 +0800" }, "message": "pcmcia: pxa2xx/trizeps4: remove unnecessary ifdefs\n\nSigned-off-by: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nAcked-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "b34e7b4f05730e6f26e9d8d3736271b0e4cdeac2", "tree": "5581cab74f275b12e465c086ce0c196f05d1e970", "parents": [ "4c738b2568340f5a99618d75293d7ee6a9267b1b" ], "author": { "name": "Dmitry Eremin-Solenikov", "email": "dbaryshkov@gmail.com", "time": "Tue Jun 14 09:21:05 2011 +0400" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Mon Jul 11 14:43:32 2011 +0800" }, "message": "ARM: scoop: drop pcmcia_init callback\n\nA pcmcia_init callback isn\u0027t used on any of the platforms. Drop it.\n\nSigned-off-by: Dmitry Eremin-Solenikov \u003cdbaryshkov@gmail.com\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "512b7938fefd03d512463aa597a1216cf088dfe3", "tree": "67c26fd702467cf97d8005552089e26c80728f24", "parents": [ "9c0de4947a44166b16f189aa56f34791e9d7f552" ], "author": { "name": "Jonathan Cameron", "email": "jic23@cam.ac.uk", "time": "Mon Jun 06 15:24:13 2011 +0100" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Mon Jul 11 14:26:34 2011 +0800" }, "message": "pcmcia: pxa2xx/vpac270: free gpios on exist rather than requesting\n\nSigned-off-by: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nAcked-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "158f1e95180d01ebfd7cd5c8de23050528303f26", "tree": "0adced141c5a927fdc0a29b6fcc5b25f5954c114", "parents": [ "55b220cafadd71b9f83759f7b396998b2547dc5f" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Tue Jun 14 17:06:02 2011 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Jun 16 08:40:44 2011 -0600" }, "message": "gpio: include linux/gpio.h where needed\n\nSome files use GPIOF_ macros but don\u0027t include the header file\nfor them. These macros are being moved to \u003clinux/gpio.h\u003e, so add\nincludes for \u003clinux/gpio.h\u003e where needed.\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "28f65c11f2ffb3957259dece647a24f8ad2e241b", "tree": "6b7621d09d10df89eedd908d4506fb9f457a909f", "parents": [ "140a1ef2f91a00e1d25f0878c193abdc25bf6ebe" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Jun 09 09:13:32 2011 -0700" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Jun 10 14:55:36 2011 +0200" }, "message": "treewide: Convert uses of struct resource to resource_size(ptr)\n\nSeveral fixes as well where the +1 was missing.\n\nDone via coccinelle scripts like:\n\n@@\nstruct resource *ptr;\n@@\n\n- ptr-\u003eend - ptr-\u003estart + 1\n+ resource_size(ptr)\n\nand some grep and typing.\n\nMostly uncompiled, no cross-compilers.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "e9fb13bfec7e017130ddc5c1b5466340470f4900", "tree": "58a742ab339fb1a2f47be774c1137e220b6b7dd8", "parents": [ "37fac4b6e6fde4ea4f5fd76948ba6f3e5dc63c01" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue May 03 19:29:00 2011 -0700" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri May 06 07:46:15 2011 +0200" }, "message": "pcmcia: Make declaration and uses of struct pcmcia_device_id const\n\nConst allows tables to be moved into text sections.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "37fac4b6e6fde4ea4f5fd76948ba6f3e5dc63c01", "tree": "ed7cb0882ff8487597fdc1977c80eebb837d8869", "parents": [ "5895198c56d131cc696556a45f7ff0ea99ac297b" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Wed Apr 06 16:31:02 2011 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri May 06 07:46:11 2011 +0200" }, "message": "pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data\n\nsa11x0_pcmcia_hw_init is only used by sa11x0_drv_pcmcia_probe which\nlives in .devinit.text so it can go to .devinit.data.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "e9c549998dc24209847007e1f209f3b6c88d21ba", "tree": "0f52fcbe1dfa158349afc6ad2edaa6738615dc3b", "parents": [ "8e10cd74342c7f5ce259cceca36f6eba084f5d58" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Tue Apr 26 23:28:26 2011 -0700" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Tue Apr 26 23:31:11 2011 -0700" }, "message": "Revert wrong fixes for common misspellings\n\nThese changes were incorrectly fixed by codespell. They were now\nmanually corrected.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8", "tree": "fba3439bafcfaa4640a9f943be6746580203134e", "parents": [ "83fd6c685bd8e83be1e29e2841bab94dd831e186" ], "author": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Tue Apr 12 18:39:39 2011 +0800" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Wed Apr 13 09:30:40 2011 +0800" }, "message": "ARM: pxa: convert incorrect IRQ_TO_IRQ() to irq_to_gpio()\n\nThis fixes the failure to register the IRQ_RTCAlrm alarm as a wakeup\nevent. It is misinterpreted as a gpio irq not a PWER bitmask. Fixed\nthis by converting the incorrect IRQ_TO_IRQ() to a correct version of\nirq_to_gpio().\n\nReported-by: Nick Bane \u003cnickbane1@gmail.com\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "735443fede138fbbad062ec258e4d49648a0a56d", "tree": "ae3c787dab7affffcf57fc4a6d24869b0b2a538b", "parents": [ "af21cbb1ef6aa366fcb629ea4d4330300ba22de7" ], "author": { "name": "Dmitry Eremin-Solenikov", "email": "dbaryshkov@gmail.com", "time": "Fri Apr 01 13:28:46 2011 +0400" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Tue Apr 12 23:07:42 2011 +0800" }, "message": "pcmcia: limit pxa2xx_trizeps4 subdriver to trizeps4 platform\n\npxa2xx_trizeps4 tries to register pxa2xx-pcmcia device not checking whether\nmachine is really trizeps4, thus messing multi-machine kernels. Fix it up.\n\nSigned-off-by: Dmitry Eremin-Solenikov \u003cdbaryshkov@gmail.com\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "af21cbb1ef6aa366fcb629ea4d4330300ba22de7", "tree": "b7af8edd2585d49dbb5e7916fc50c60dc9a3160b", "parents": [ "a6d710fefd1b2c209353a452d0f4c831b3af0da0" ], "author": { "name": "Dmitry Eremin-Solenikov", "email": "dbaryshkov@gmail.com", "time": "Fri Apr 01 13:28:45 2011 +0400" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Tue Apr 12 23:07:42 2011 +0800" }, "message": "pcmcia: limit pxa2xx_balloon3 subdriver to balloon3 platform\n\npxa2xx_balloon3 tries to register pxa2xx-pcmcia device not checking whether\nmachine is really balloon3, thus messing multi-machine kernels. Fix it up.\n\nSigned-off-by: Dmitry Eremin-Solenikov \u003cdbaryshkov@gmail.com\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "85eb1513c15652cdaa9fd656345825bf55514a96", "tree": "b445b8d6d9184a897a2656a9f16a6ec592137644", "parents": [ "e122996ae1edf2caf19643cb79366fc2117a6188", "b43d151e9679a06df896ac3db65a9dca80040fed" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 30 07:50:45 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 30 07:50:45 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (65 commits)\n ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support\n ARM: 6838/1: etm: fix section mismatch warning\n ARM: 6837/1: remove unused pci_fixup_prpmc1100\n ARM: 6836/1: kprobes/fix emulation of LDR/STR instruction when Rn \u003d\u003d PC\n Fix the broken build for Marvell Dove platform.\n ARM: 6835/1: perf: ensure overflows aren\u0027t missed due to IRQ latency\n ARM: 6834/1: perf: reset counters on all CPUs during initialisation\n ARM: 6833/1: perf: add required isbs() to ARMv7 backend\n ARM: 6825/1: kernel/sleep.S: fix Thumb2 compilation issues\n ARM: 6807/1: realview: Fix secondary GIC initialisation for EB with MPCore tile\n arm: mach-mx3: pcm043: add write-protect and card-detect for SD1\n eukrea_mbimxsd51: add SD Card detect\n eukrea_mbimxsd25-baseboard: add SD card detect\n mx3/eukrea_mbimxsd-baseboard: add SD card detect support\n mx3/eukrea_mbimxsd-baseboard: fix gpio request\n ARM: mxs/mx28evk: add mmc device\n ARM: mxs/mx23evk: add mmc device\n ARM: mxs: dynamically allocate mmc device\n ARM: mx51_efika: update platform data for new mfd changes\n mx2/iomux: Set direction for CSPI2 pins\n ...\n" }, { "commit": "dced35aeb0367dda2636ee9ee914bda14510dcc9", "tree": "71fd68d024a91c5c87f02f488962fcd852add0a8", "parents": [ "2a8f55b1f577c205e71ddcb696564cbd05c50eb5" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Mar 28 17:49:12 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Mar 29 14:48:19 2011 +0200" }, "message": "drivers: Final irq namespace conversion\n\nScripted with coccinelle.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e", "tree": "9257bdba52ce88ca0a0c2f6fce1f59a1eb278452", "parents": [ "16c29dafcc86024048f1dbb8349d31cb22c7c55a", "5898eb79fb45d4fd4ce22139c168de937bfaab38" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 26 10:03:03 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 26 10:03:03 2011 +0000" }, "message": "Merge branch \u0027devel\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable\n\nConflicts:\n\tarch/arm/mach-pxa/tosa.c\n" }, { "commit": "4c5811bf463b0ef82fabbd1708f8bb2d753aeb18", "tree": "ff37d31217c3804ca05de21a55a9b5ca1ca818b2", "parents": [ "f74b9444192c60603020c61d7915b72893137edc", "9f15444fefdb33509132ff5c9be60cb315c44cb2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 17:28:10 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 17:28:10 2011 -0700" }, "message": "Merge branch \u0027devicetree/next\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027devicetree/next\u0027 of git://git.secretlab.ca/git/linux-2.6: (21 commits)\n tty: serial: altera_jtaguart: Add device tree support\n tty: serial: altera_uart: Add devicetree support\n dt: eliminate of_platform_driver shim code\n dt: Eliminate of_platform_{,un}register_driver\n dt/serial: Eliminate users of of_platform_{,un}register_driver\n dt/usb: Eliminate users of of_platform_{,un}register_driver\n dt/video: Eliminate users of of_platform_{,un}register_driver\n dt/net: Eliminate users of of_platform_{,un}register_driver\n dt/sound: Eliminate users of of_platform_{,un}register_driver\n dt/spi: Eliminate users of of_platform_{,un}register_driver\n dt: uartlite: merge platform and of_platform driver bindings\n dt: xilinx_hwicap: merge platform and of_platform driver bindings\n ipmi: convert OF driver to platform driver\n leds/leds-gpio: merge platform_driver with of_platform_driver\n dt/sparc: Eliminate users of of_platform_{,un}register_driver\n dt/powerpc: Eliminate users of of_platform_{,un}register_driver\n dt/powerpc: move of_bus_type infrastructure to ibmebus\n drivercore/dt: add a match table pointer to struct device\n dt: Typo fix.\n altera_ps2: Add devicetree support\n ...\n" }, { "commit": "9ed3fbf1cbc2b747b3532985059f4738c15f4c07", "tree": "3acd9f0d53918ed00e546dde6207c98513201982", "parents": [ "6b1e3fca6ffb981db05688b1660a5d03d242edd4" ], "author": { "name": "Marek Vasut", "email": "marek.vasut@gmail.com", "time": "Sat Jan 15 19:22:19 2011 +0100" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Wed Mar 16 16:32:46 2011 +0800" }, "message": "ARM: pxa: Update copyright notices for Palm devices\n\nSigned-off-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\n" }, { "commit": "e27af7edda008d225ad542c3b6645483683a7e91", "tree": "75564362a6b20a98930c9e01594ffda33153e3d6", "parents": [ "235a175c401ab2d79d63f08257acebe1558a0621" ], "author": { "name": "Marek Vasut", "email": "marek.vasut@gmail.com", "time": "Sat Jan 15 19:11:16 2011 +0100" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Wed Mar 16 16:32:46 2011 +0800" }, "message": "ARM: pxa: Use gpio arrays in vpac270_pcmcia driver\n\nUse gpio_request_array() / gpio_free_array(), this makes the code\ncleaner and less error prone.\n\nSigned-off-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\n" }, { "commit": "235a175c401ab2d79d63f08257acebe1558a0621", "tree": "dc6fec8305532c768ee3de4b31ae5bb3e1994901", "parents": [ "ba388307946cf86050d63cd398b4b341e2fb5043" ], "author": { "name": "Marek Vasut", "email": "marek.vasut@gmail.com", "time": "Sat Jan 15 18:59:55 2011 +0100" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Wed Mar 16 16:32:46 2011 +0800" }, "message": "ARM: pxa: Use gpio arrays in palmtx_pcmcia driver\n\nUse gpio_request_array() / gpio_free_array(), this makes the code\ncleaner and less error prone.\n\nSigned-off-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\n" }, { "commit": "ba388307946cf86050d63cd398b4b341e2fb5043", "tree": "89584a07af30620904315dd862973dd1dd0ff1d0", "parents": [ "2070417dffa9e75b370a5c0dee8c5dc3605e1c4d" ], "author": { "name": "Marek Vasut", "email": "marek.vasut@gmail.com", "time": "Sat Jan 15 18:59:43 2011 +0100" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Wed Mar 16 16:32:46 2011 +0800" }, "message": "ARM: pxa: Use gpio arrays in palmtc_pcmcia driver\n\nUse gpio_request_array() / gpio_free_array(), this makes the code\ncleaner and less error prone.\n\nSigned-off-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\n" }, { "commit": "2070417dffa9e75b370a5c0dee8c5dc3605e1c4d", "tree": "071b80a35bcb34b8c5eeb4a5234297f4cc1f8415", "parents": [ "e593106ca409e5e37d18121d922fc4f449c60d41" ], "author": { "name": "Marek Vasut", "email": "marek.vasut@gmail.com", "time": "Sat Jan 15 18:49:07 2011 +0100" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Wed Mar 16 16:32:46 2011 +0800" }, "message": "ARM: pxa: Use gpio arrays in palmld_pcmcia driver\n\nUse gpio_request_array() / gpio_free_array(), this makes the code\ncleaner and less error prone.\n\nSigned-off-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\n" }, { "commit": "e593106ca409e5e37d18121d922fc4f449c60d41", "tree": "ef8bc5bf7c59050ea39c6cc35f7be2ee905675be", "parents": [ "7428fff20494935b4ce767d7c80de077e8d1d745" ], "author": { "name": "Marek Vasut", "email": "marek.vasut@gmail.com", "time": "Sat Jan 15 18:40:49 2011 +0100" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Wed Mar 16 16:32:45 2011 +0800" }, "message": "ARM: pxa: Use gpio arrays in colibri_pcmcia driver\n\nUse gpio_request_array() / gpio_free_array(), this makes the code cleaner and\nless error prone.\n\nSigned-off-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\n" }, { "commit": "34d4ade77ba755afa6a2a04f043659781e4b6fc2", "tree": "654a94f1de17b0c63d5450718c79c351437a5ff1", "parents": [ "1a3453035f3e55aa419aa66b7eee62ddf590c70f", "c0d61a7996d5511385953f9c03fa997da1d0eb4d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 07 20:45:42 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 07 20:45:42 2011 -0800" }, "message": "Merge branch \u0027fixes\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027fixes\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm:\n davinci: cpufreq: fix section mismatch warning\n DaVinci: fix compilation warnings in \u003cmach/clkdev.h\u003e\n davinci: tnetv107x: fix register indexing for GPIOs numbers \u003e 31\n davinci: da8xx/omap-l1x: add platform device for davinci-pcm-audio\n ARM: pxa/tosa: register wm9712 codec device\n ARM: pxa: enable pxa-pcm-audio on pxa210/pxa25x platform\n ARM: pxa/colibri: don\u0027t register pxa2xx-pcmcia nodes on non-colibri platforms\n ARM: pxa/tosa: drop setting LED trigger name, as it\u0027s unsupported now\n ARM: 6762/1: Update number of VIC for S5P6442 and S5PC100\n ARM: 6761/1: Update number of VIC for S5PV210\n ARM: 6768/1: hw_breakpoint: ensure debug logic is powered up on v7 cores\n ARM: 6767/1: ptrace: fix register indexing in GETHBPREGS request\n ARM: 6765/1: remove obsolete comment from asm/mach/arch.h\n ARM: 6757/1: fix tlb.h induced linux/swap.h build failure\n" }, { "commit": "1c48a5c93da63132b92c4bbcd18e690c51539df6", "tree": "746e990ce0f49e48e2cc9d55766485f468ca35f6", "parents": [ "793218dfea146946a076f4fe51e574db61034a3e" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Feb 17 02:43:24 2011 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Feb 28 13:22:46 2011 -0700" }, "message": "dt: Eliminate of_platform_{,un}register_driver\n\nFinal step to eliminate of_platform_bus_type. They\u0027re all just\nplatform drivers now.\n\nv2: fix type in pasemi_nand.c (thanks to Stephen Rothwell)\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "8d9bd9002dc8c3a05e11c5f40d95d06e15e83f71", "tree": "ddd70eee6d27d2d5b32ff31548a29069cd110476", "parents": [ "6767c5203459ebee1410e87450b32bf9f4488406" ], "author": { "name": "Dmitry Eremin-Solenikov", "email": "dbaryshkov@gmail.com", "time": "Wed Feb 23 02:30:28 2011 +0300" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Sun Feb 27 21:38:23 2011 +0800" }, "message": "ARM: pxa/colibri: don\u0027t register pxa2xx-pcmcia nodes on non-colibri platforms\n\nPXA supports multi-machine kernels since long ago. However a kernel\ncompiled with support for colibri and any other PXA machine and with\nPCMCIA enabled will barf at runtime about duplicate registration of\npxa2xx-pcmcia device. Fix that.\n\nSigned-off-by: Dmitry Eremin-Solenikov \u003cdbaryshkov@gmail.com\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "33619f0d3ff715a2a5499520967d526ad931d70d", "tree": "6956d30f906eac49454bc7b241e2ba202b9bfa9f", "parents": [ "644e6e4a7fa6b11d59f24032997d90ea0d858d03" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Feb 19 12:35:15 2011 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Feb 20 12:47:34 2011 +0100" }, "message": "pcmcia: re-enable Zoomed Video support\n\nAllow drivers to enable Zoomed Video support. Currently, this is only\nused by out-of-tree drivers (L64020 DVB driver in particular).\n\nCC: \u003cstable@kernel.org\u003e [for 2.6.37]\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "5b703683b6cc3cb97bbe6b1b14898b273eb59279", "tree": "54959d42d6a6005ebe5e2655e6bdb2d480fb4131", "parents": [ "d5bb2923cfa0a29c5854f9618703ff60849b949e" ], "author": { "name": "Pavel Machek", "email": "pma@sysgo.com", "time": "Fri Feb 04 09:03:43 2011 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Feb 19 12:22:35 2011 +0100" }, "message": "pcmcia vs. MECR on pxa25x/sa1111\n\nAfter 2.6.34 changes, __pxa2xx_drv_pcmcia_probe() was replaced by\nsa1111_pcmcia_add(). That unfortunately means that configure_sockets()\nis not called, leading to MECR not being set properly, leading to\nstrange crashes.\n\nTested on pxa255+sa1111, I do not have lubbock board nearby. Perhaps\ncleaner solution exists?\n\nSigned-off-by: Pavel Machek \u003cpma@sysgo.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "6a108a14fa356ef607be308b68337939e56ea94e", "tree": "1bf260572bd8f95ed867307a2bcf5d881c8ae4a6", "parents": [ "12fcdba1b7ae8b25696433f420b775aeb556d89b" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Thu Jan 20 14:44:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 17:02:05 2011 -0800" }, "message": "kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT\n\nThe meaning of CONFIG_EMBEDDED has long since been obsoleted; the option\nis used to configure any non-standard kernel with a much larger scope than\nonly small devices.\n\nThis patch renames the option to CONFIG_EXPERT in init/Kconfig and fixes\nreferences to the option throughout the kernel. A new CONFIG_EMBEDDED\noption is added that automatically selects CONFIG_EXPERT when enabled and\ncan be used in the future to isolate options that should only be\nconsidered for embedded systems (RISC architectures, SLOB, etc).\n\nCalling the option \"EXPERT\" more accurately represents its intention: only\nexpert users who understand the impact of the configuration changes they\nare making should enable it.\n\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: David Woodhouse \u003cdavid.woodhouse@intel.com\u003e\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Robin Holt \u003cholt@sgi.com\u003e\nCc: \u003clinux-arch@vger.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": "008d23e4852d78bb2618f2035f8b2110b6a6b968", "tree": "81c88f744f6f3fc84132527c1ddc0b4da410c5e2", "parents": [ "8f685fbda43deccd130d192c9fcef1444649eaca", "bfc672dcf323877228682aff79dff8ecd9f30ff8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n Documentation/trace/events.txt: Remove obsolete sched_signal_send.\n writeback: fix global_dirty_limits comment runtime -\u003e real-time\n ppc: fix comment typo singal -\u003e signal\n drivers: fix comment typo diable -\u003e disable.\n m68k: fix comment typo diable -\u003e disable.\n wireless: comment typo fix diable -\u003e disable.\n media: comment typo fix diable -\u003e disable.\n remove doc for obsolete dynamic-printk kernel-parameter\n remove extraneous \u0027is\u0027 from Documentation/iostats.txt\n Fix spelling milisec -\u003e ms in snd_ps3 module parameter description\n Fix spelling mistakes in comments\n Revert conflicting V4L changes\n i7core_edac: fix typos in comments\n mm/rmap.c: fix comment\n sound, ca0106: Fix assignment to \u0027channel\u0027.\n hrtimer: fix a typo in comment\n init/Kconfig: fix typo\n anon_inodes: fix wrong function name in comment\n fix comment typos concerning \"consistent\"\n poll: fix a typo in comment\n ...\n\nFix up trivial conflicts in:\n - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)\n - fs/ext4/ext4.h\n\nAlso fix missed \u0027diabled\u0027 typo in drivers/net/bnx2x/bnx2x.h while at it.\n" } ], "next": "404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34" }