)]}' { "log": [ { "commit": "54291263519ac2c9bdda68b23b02fef3808deed4", "tree": "d71de8172a6ab2bbe3068aece7d8911eeeb276fd", "parents": [ "46ee9645094ad1eb5b4888882ecaa1fb87dcd2a3", "acd200bf45487271d54f05938ad9e30f32a530ee" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 09:09:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 09:09:46 2010 -0700" }, "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: (29 commits)\n pcmcia: disable PCMCIA ioctl also for ARM\n drivers/staging/comedi: dev_node removal (quatech_daqp_cs)\n drivers/staging/comedi: dev_node removal (ni_mio_cs)\n drivers/staging/comedi: dev_node removal (ni_labpc_cs)\n drivers/staging/comedi: dev_node removal (ni_daq_dio24)\n drivers/staging/comedi: dev_node removal (ni_daq_700)\n drivers/staging/comedi: dev_node removal (das08_cs)\n drivers/staging/comedi: dev_node removal (cb_das16_cs)\n pata_pcmcia: get rid of extra indirection\n pcmcia: remove suspend-related comment from yenta_socket.c\n pcmcia: call pcmcia_{read,write}_cis_mem with ops_mutex held\n pcmcia: remove pcmcia_add_device_lock\n pcmcia: update gfp/slab.h includes\n pcmcia: remove unused mem_op.h\n pcmcia: do not autoadd root PCI bus resources\n pcmcia: clarify alloc_io_space, move it to resource handlers\n pcmcia: move all pcmcia_resource_ops providers into one module\n pcmcia: move high level CIS access code to separate file\n pcmcia: dev_node removal (core)\n pcmcia: dev_node removal (remaining drivers)\n ...\n" }, { "commit": "addff0faecfc5e73e8a742687255cef847e260db", "tree": "fbf59b85d60de1354c6edafc38b6874814c1b0da", "parents": [ "543cd84255f499a53d409014bc5ba71543474b05" ], "author": { "name": "Marek Vasut", "email": "marek.vasut@gmail.com", "time": "Wed Mar 10 04:16:28 2010 +0100" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Tue May 11 17:25:02 2010 +0200" }, "message": "[ARM] pxa: add support for Voipac PXA270 PCMCIA\n\nPCMCIA support for Voipac PXA270\n\nSigned-off-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "49b1153adfe18a3cce7e70aa26c690f275917cd0", "tree": "d165a9bfaacd5be3da0bce12e6fe1126ce21118d", "parents": [ "5c128e84324ca9389bc5f7d39f6b18f6de4a58ec" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Mar 07 16:41:57 2010 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Mon May 10 10:23:18 2010 +0200" }, "message": "pcmcia: move all pcmcia_resource_ops providers into one module\n\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "5c128e84324ca9389bc5f7d39f6b18f6de4a58ec", "tree": "603f269717cd5c9183071629553b273b79d161ba", "parents": [ "b9300aa7449f6636b188743d09199dcf27b1a4b4" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Mar 20 20:03:57 2010 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Mon May 10 10:23:18 2010 +0200" }, "message": "pcmcia: move high level CIS access code to separate file\n\nNo code changes.\n\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "f1dd6ad599732fc89f36fdd65a2c2cf3c63a8711", "tree": "5092207128e47cba99dc0fe373fff6a36f4cb4b8", "parents": [ "8d37a371b6869920e6c40c495c68eabba1ef3909", "e10b234b3c4e255d3300a486c4ac15b43253ac6d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 27 16:19:22 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 27 16:19:22 2010 -0800" }, "message": "Merge branch \u0027upstream\u0027 of git://ftp.linux-mips.org/pub/scm/upstream-linus\n\n* \u0027upstream\u0027 of git://ftp.linux-mips.org/pub/scm/upstream-linus: (141 commits)\n MIPS: Alchemy: defconfig updates\n MIPS: Alchemy: Fix Au1100 ethernet build failure\n MIPS: Alchemy: Repair db1500/bosporus builds\n MIPS: ARC: Cleanup unused definitions from sgialib.h\n MIPS: Cobalt: convert legacy port addresses to GT-64111 bus addresses\n MIPS: Alchemy: use 36bit addresses for PCMCIA resources.\n MIPS: Cobalt: Fix theoretical port aliasing issue\n MIPS: Use ALIGN(x, bytes) instead of __ALIGN_MASK(x, bytes - 1)\n MIPS: Crazy spinlock speed test.\n MIPS: Optimize spinlocks.\n MIPS: Alchemy: devboard PM needs to save CPLD registers.\n MIPS: PowerTV: Eliminate duplicate opcode definition macros\n MIPS: Lemote 2F: Move printks out of port_access_lock.\n MIPS: PNX833x: Convert IRQ controller locks to raw spinlocks.\n MIPS: Octeon: Replace spinlock with raw_spinlocks in dma-octeon.c.\n MIPS: Octeon: Replace rwlocks in irq_chip handlers with raw_spinlocks.\n MIPS: Octeon: Convert octeon_irq_msi_lock to raw spinlock.\n MIPS: Loongson: Remove pointless sample_lock from oprofile code.\n MIPS: SNI: Convert sni_rm200_i8259A_lock to raw spinlock.\n MIPS: i8259: Convert IRQ controller lock to raw spinlock.\n ...\n" }, { "commit": "0273b4efccd3bc2b2ef5ea9778e71d8efbbb7ac7", "tree": "c67c6fb5ff0aa4a0201676374b252ea60475235c", "parents": [ "27dd65ac9afabc8e67ab73f7c2f575eddbb47167" ], "author": { "name": "Manuel Lauss", "email": "manuel.lauss@googlemail.com", "time": "Sun Oct 04 14:55:29 2009 +0200" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Sat Feb 27 12:52:51 2010 +0100" }, "message": "MIPS: Alchemy: XXS1500 PCMCIA driver rewrite\n\nRewritten XXS1500 PCMCIA socket driver, standalone (doesn\u0027t depend on\nau1000_generic.c) and added carddetect IRQ support.\n\nSigned-off-by: Manuel Lauss \u003cmanuel.lauss@gmail.com\u003e\nCc: Florian Fainelli \u003cflorian@openwrt.org\u003e\nCc: Linux-PCMCIA \u003clinux-pcmcia@lists.infradead.org\u003e\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "66213b3ccfc770704025ce9465fa3aaedde21b55", "tree": "2f74c1819b371926952c9c5b8f98ae808588e728", "parents": [ "7e50b2b741bb4f9dbddc9f56972ef82a7d4b33ed" ], "author": { "name": "Manuel Lauss", "email": "manuel.lauss@googlemail.com", "time": "Sun Oct 04 14:55:27 2009 +0200" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Sat Feb 27 12:52:51 2010 +0100" }, "message": "MIPS: PCMCIA: new socket driver for Au1000 demoboards.\n\nNew PCMCIA socket driver for all Db/Pb1xxx boards (except Pb1000),\nwhich replaces au1000_db1x00.c and (most of) au1000_pb1x00.c.\nNotable improvements:\n - supports Db1000, DB/PB1100/1500/1550/1200.\n - support for carddetect and statuschange IRQs.\n - pcmcia socket mem/io/attr areas and irqs passed through\n platform resource information.\n - doesn\u0027t freeze system during card insertion/ejection like\n the one it replaces.\n - boardtype is automatically detected using BCSR ID register.\n\nRun-tested on the DB1200.\n\nCc: Linux-PCMCIA \u003clinux-pcmcia@lists.infradead.org\u003e\nSigned-off-by: Manuel Lauss \u003cmanuel.lauss@gmail.com\u003e\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "6e7b51a733fde86d3be748543215a69da04d5bb7", "tree": "4c608cf607ef1bb69231f4c67d45a9ac9429e650", "parents": [ "4e8804ff6dd1a842d9531c819a0acc9eb3bcfa3b" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Jan 06 13:57:43 2010 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Feb 17 17:37:30 2010 +0100" }, "message": "pcmcia: move cistpl.c into pcmcia module\n\nAs PCMCIA is the only real user of CIS access functions, include\ncistpl.c in the PCMCIA module, not in the PCMCIA \u0026 CardBus core\nmodule.\n\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "c2de1c382933fd9ef0a3db13b6747115e1e32c56", "tree": "d9e0fa251d376fb7d5f9906952bf02f2f31570e0", "parents": [ "e491a11c77a4ed93ec14cc052b1f048bddc9e99a" ], "author": { "name": "Marc Zyngier", "email": "maz@misterjones.org", "time": "Sat Nov 14 13:39:13 2009 +0100" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Sun Dec 13 21:42:58 2009 +0800" }, "message": "[ARM] pxa/zeus: make Viper pcmcia support more generic to support Zeus\n\nThe Arcom Zeus CF slot requires the same kind of support as the Viper.\nTo avoid code duplication, introduce a platform device that abstracts\nthe differences.\n\nThis also allows for the removal of the ugly export of viper_cf_rst().\n\nSigned-off-by: Marc Zyngier \u003cmaz@misterjones.org\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "0f767de6a26a07f7d58394512b6f6c96322f047f", "tree": "564a8c8c1b2ba960b03bf3235e16239f0ece9937", "parents": [ "a7149f9a26eb44a5658d56335c23104ba529e9f6" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Thu Mar 26 21:14:19 2009 +0000" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Mon Nov 09 08:30:08 2009 +0100" }, "message": "PCMCIA: soc_common: convert to a stand alone module\n\nConvert soc_common.c to be a stand alone module, rather than wrapping\nit up into the individual SoC specific base modules. In doing this,\nwe need to add init/exit functions for soc_common to register/remove\nthe cpufreq notifier.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "553d6d5f5b84f11fad8043688137dac96df1a06d", "tree": "39613a02feb6617d619c84045d3c41e479a566b5", "parents": [ "971842677c5a6c1dd15d9a80b67bf0085686e574" ], "author": { "name": "Maxime Bizon", "email": "mbizon@freebox.fr", "time": "Mon Sep 28 14:49:43 2009 +0200" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Wed Sep 30 21:47:01 2009 +0200" }, "message": "MIPS: BCM63xx: Add PCMCIA \u0026 Cardbus support.\n\nSigned-off-by: Maxime Bizon \u003cmbizon@freebox.fr\u003e\nReviewed-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "36d618be131547adc51c464a3a0a9f72f2449a2d", "tree": "d402dea8f4dbab8df96309e96030042d1bb3dee0", "parents": [ "5d783a2d592ce5fdc01292470059ed15998e404e" ], "author": { "name": "Marek Vasut", "email": "marek.vasut@gmail.com", "time": "Thu Jul 16 13:30:47 2009 +0200" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Thu Sep 10 18:49:36 2009 +0800" }, "message": "[ARM] pxa: Palm Tungsten|C PCMCIA support\n\nThis patch adds support for PCMCIA socket found in Palm Tungsten|C.\nThere is Prism3 based WiFi card hardwired to that socket.\n\nSigned-off-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "5aeb1a5e9f2eced482805eeb154baf77ea53c8ce", "tree": "c60e41c6d58f8f5a1fe54f7dd67d7b69bcc5b64a", "parents": [ "80153d1bcc6a20361d5974f37d3729583ba99154" ], "author": { "name": "Jonathan Cameron", "email": "jic23@cam.ac.uk", "time": "Tue May 12 19:37:21 2009 +0000" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Fri Jun 05 10:46:32 2009 +0800" }, "message": "[ARM] pxa/stargate2: add support for Compact Flash/PCMCIA\n\nSigned-off-by: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nSigned-off-by: Eric Miao \u003ceric.miao@marvell.com\u003e\n" }, { "commit": "e38a9707d8d94de86fe84109fa6823ddc969721a", "tree": "38504d4c4954c119f2849a9889d1290222d95950", "parents": [ "b1ae1b7b274f67c149bee4731e38a7516c723de4" ], "author": { "name": "Ian Molton", "email": "spyro@f2s.com", "time": "Tue Oct 07 22:01:59 2008 +0100" }, "committer": { "name": "Ian Molton", "email": "spyro@f2s.com", "time": "Mon Dec 15 03:52:53 2008 +0000" }, "message": "[PCMCIA] e740 PCMCIA socket driver.\n\nThis patch adds the platform specific support needed to control the\nPCMCIA hardware on the Toshiba e740.\n\nSigned-off-by: Ian Molton \u003cspyro@f2s.com\u003e\n" }, { "commit": "3eeebf17f31c583f83e081b17b3076477cb96886", "tree": "b1e70bb1b0d9959179d9d8967543fc060a59aff5", "parents": [ "5ff0594e2f6fb3242a1a2a4794286244e95afab1" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Oct 28 20:07:44 2008 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Oct 28 20:07:44 2008 +0900" }, "message": "sh: Kill off long-dead HD64465 cchip support.\n\nThis code has been dead for many years. The last update it received\nwas in 2003 in order to update it for the driver model changes, though\nit had already been in disarray and unused before that point. The only\nboards that ever used this chip have not had users in many years either,\nso it is finally safe to just kill it off and move on with life.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "c97ce774b75b3e9ea32429ba57377b304227ae2c", "tree": "56312842bec260bd08d777ec81e265883afb8c17", "parents": [ "3be8c477d7f03c75dbd7911aa93cc6afa57fd168" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Fri Oct 17 15:23:52 2008 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Oct 17 15:23:52 2008 +0100" }, "message": "[ARM] pxa: fix trizeps PCMCIA build\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "af2010daf7538b1483280f7aefffe4bff67696c0", "tree": "dddd23382027c4d343faa7e191b54a1c189f62a6", "parents": [ "598dca1f4c6ef83d1d9f77c2b0c027adb94c570a" ], "author": { "name": "Mike Rapoport", "email": "mike@compulab.co.il", "time": "Wed Oct 15 11:37:35 2008 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Oct 15 12:34:50 2008 +0100" }, "message": "[ARM] 5307/1: pxa: fix CM-X2XX PCMCIA build error\n\nFix build error introduced by commit 27c4cae28148ad97baa2bf8275f7ebc9e2c37c34\n[ARM] pxa: allow multi-machine PCMCIA builds\n\nMODPOST 76 modules\nERROR: \"cmx270_pcmcia_exit\" [drivers/pcmcia/pxa2xx_cm_x2xx.ko] undefined!\nERROR: \"cmx255_pcmcia_exit\" [drivers/pcmcia/pxa2xx_cm_x2xx.ko] undefined!\nERROR: \"cmx270_pcmcia_init\" [drivers/pcmcia/pxa2xx_cm_x2xx.ko] undefined!\nERROR: \"cmx255_pcmcia_init\" [drivers/pcmcia/pxa2xx_cm_x2xx.ko] undefined!\nmake[2]: *** [__modpost] Error 1\nmake[1]: *** [modules] Error 2\nmake: *** [sub-make] Error 2\n\nSigned-off-by: Mike Rapoport \u003cmike@compulab.co.il\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "2be4ff2f084842839b041b793ed6237e8d1d315a", "tree": "1d776ac1717edeff4ee7d59ab0aea2782cb86dba", "parents": [ "cf2fa66055d718ae13e62451bb546505f63906a2", "a45b3fb19ba1e4dfc3fc53563a072612092930a9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 13 14:12:40 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 13 14:12:40 2008 -0700" }, "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: (49 commits)\n pcmcia: ioctl-internal definitions\n pcmcia: cistpl header cleanup\n pcmcia: remove unused argument to pcmcia_parse_tuple()\n pcmcia: card services header cleanup\n pcmcia: device_id header cleanup\n pcmcia: encapsulate ioaddr_t\n pcmcia: cleanup device driver header file\n pcmcia: cleanup socket services header file\n pcmcia: merge ds_internal.h into cs_internal.h\n pcmcia: cleanup cs_internal.h\n pcmcia: cs_internal.h is internal\n pcmcia: use dev_printk for cs_error()\n pcmcia: remove CS_ error codes alltogether\n pcmcia: deprecate CS_BAD_TUPLE\n pcmcia: deprecate CS_BAD_ARGS\n pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE\n pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE\n pcmcia: deprecate CS_NO_MORE_ITEMS\n pcmcia: deprecate CS_IN_USE\n pcmcia: deprecate CS_CONFIGURATION_LOCKED\n ...\n\nFix trivial conflict in drivers/pcmcia/ds.c manually\n" }, { "commit": "27c4cae28148ad97baa2bf8275f7ebc9e2c37c34", "tree": "e0e622891a9559ca488e08054e5b097d4ce5a480", "parents": [ "4f788bb20047d7f530ad8dfccda74f7ce7a8a0f5" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Tue Oct 07 19:16:33 2008 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Oct 07 19:16:33 2008 +0100" }, "message": "[ARM] pxa: allow multi-machine PCMCIA builds\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "cc513ac0f29473de365664c4fba9cf033c1f2324", "tree": "27ee53310699caa0e5cac80d519c0ec04120f8ca", "parents": [ "1543966a079fc7065849ae43ca4dd767c188ad55", "19ec95df2c4ec2d28919f267c4d17178f8fe9d9c" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Tue Oct 07 19:08:32 2008 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Oct 07 19:08:32 2008 +0100" }, "message": "Merge branch \u0027viper-for-rmk\u0027 of git://www.misterjones.org/linux-2.6-arm\n\nMerge branch \u0027pxa-viper\u0027 into pxa-machines\n\nConflicts:\n\n\tarch/arm/mach-pxa/Makefile\n\tdrivers/pcmcia/Kconfig\n\tdrivers/pcmcia/Makefile\n" }, { "commit": "1543966a079fc7065849ae43ca4dd767c188ad55", "tree": "760ddb82836a4e3edf314227c731d5dc181d11a7", "parents": [ "5ff7f78a3db462ea4edf1a781a2002d4e8a8a473", "4e9687d9c843dc34d368358a36f5f1610e4fbab3" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Tue Oct 07 19:07:22 2008 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Oct 07 19:07:22 2008 +0100" }, "message": "Merge branch \u0027pxa-palm\u0027 into pxa-machines\n\nConflicts:\n\n\tdrivers/mfd/Kconfig\n\tdrivers/pcmcia/Makefile\n" }, { "commit": "5ff7f78a3db462ea4edf1a781a2002d4e8a8a473", "tree": "fc0516369f4146595c5dce9bddda23d8691c3f42", "parents": [ "35437b6192d9a4eb92f095dfd72396b6d2970f0b", "92b797f6a1347623a41caf02516b70e5fa706a90" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Tue Oct 07 19:06:52 2008 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Oct 07 19:06:52 2008 +0100" }, "message": "Merge branch \u0027pxa-trizeps\u0027 into pxa-machines\n\nConflicts:\n\n\tdrivers/pcmcia/Makefile\n" }, { "commit": "8616e2fb6930103a8408998777ec8a2332f5e89d", "tree": "4701da5b57b8aad1f9e3d0b42ff261a0bcfd3f60", "parents": [ "a7f3f0309b68d8d07a97a54c492802c294bccacd" ], "author": { "name": "Mike Rapoport", "email": "mike@compulab.co.il", "time": "Sun Oct 05 10:27:22 2008 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Oct 07 12:08:02 2008 +0100" }, "message": "[ARM] 5283/1: pxa: add CM-X255 pcmcia support\n\nSigned-off-by: Russ Dill \u003cruss.dill@gmail.com\u003e\nSigned-off-by: Mike Rapoport \u003cmike@compulab.co.il\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "2efa42f2fadc06f7ceee14834624d2911a9f11f1", "tree": "d6cccdd549328756a3c765300e025a3b87daefc3", "parents": [ "2532967147f750fa661bdc3d1f890314c37dda28" ], "author": { "name": "Jürgen Schindele", "email": "linux@schindele.name", "time": "Tue Oct 07 10:40:18 2008 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Oct 07 10:53:56 2008 +0100" }, "message": "[ARM] 5294/1: Trizeps4 PCMCIA support\n\nSupport for Trizeps4 SOM PCMCIA\nwith ConXS or other baseboards.\nwith double GPIO-free fixed (sorry!)\n\nreplaces 5279/1\n\nSigned-off-by: Jurgen Schindele \u003clinux@schindele.name\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "20f18ff32fe311f60770ac70395b01c06758923b", "tree": "4b1c11b306ce8b24d1b735aa4729405bd9818c2d", "parents": [ "175ff20f6a681effa82d67e3656c4cc3e7117600" ], "author": { "name": "Marc Zyngier", "email": "marc.zyngier@altran.com", "time": "Tue Aug 19 12:15:53 2008 +0200" }, "committer": { "name": "Marc Zyngier", "email": "maz@young-lust.wild-wind.fr.eu.org", "time": "Tue Sep 09 17:41:53 2008 +0200" }, "message": "Add support for the Arcom/Eurotech Viper SBC CompactFlash card slot\n\nThe Arcom/Eurotech Viper needs some extra care to run. On this board,\nthe PC104 connector is actually wired to the second PCMCIA slot.\nTherefore, this second socket needs to be enabled, despite not being\nmanaged by the PCMCIA code.\n\nI\u0027d rather have the MECR setup in the platform support code so I could,\nfor example, use the PC104 bus without having the PCMCIA module loaded.\n\nSigned-off-by: Marc Zyngier \u003cmarc.zyngier@altran.com\u003e\n" }, { "commit": "7d16b658bd093e75a9f72a69e2dafd2b154c4395", "tree": "a22437b255797e45befccb595caedd438b35865a", "parents": [ "2bccc2a89012173f48a690caea7d9e4b3e950db9" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Aug 02 21:02:01 2008 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Aug 23 01:55:06 2008 +0200" }, "message": "pcmcia: don\u0027t add extra DEBUG cflag\n\nUse CONFIG_PCMCIA_DEBUG instead of DEBUG so that dev_dbg() and other tricks\nwork properly.\n\n(includes bugfixes from and\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\n)\n\nSigned-off-by: Dominik Broodwski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "6d341675f8e715464849e5d5563a72c1d39e800d", "tree": "698fd6ad7f0de2806696f97efce90e7393e85693", "parents": [ "574047f96a302cbca2f9bfafd78b1869b6a900bf" ], "author": { "name": "Marek Vašut", "email": "marek.vasut@gmail.com", "time": "Sat Aug 16 15:35:57 2008 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Aug 16 16:37:06 2008 +0100" }, "message": "[ARM] 5199/1: PalmLD: PCMCIA driver\n\nPCMCIA driver for Palm LifeDrive\n\nSigned-off-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "30d38542ec777468bb6a31829076a2dbc5690e35", "tree": "698b7a4fdd730befa34c4c9642cdbe72ce7d336a", "parents": [ "20b7997e8abdf338dcc27fb4f1333c4973a7f113", "044e5f45e4ad890d03bd1e8bb44c634397cac24d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 23 18:24:08 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 23 18:24:08 2008 -0700" }, "message": "Merge branch \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (85 commits)\n [ARM] pxa: add base support for PXA930 Handheld Platform (aka SAAR)\n [ARM] pxa: add base support for PXA930 Evaluation Board (aka TavorEVB)\n [ARM] pxa: add base support for PXA930 (aka Tavor-P)\n [ARM] Update mach-types\n [ARM] pxa: make littleton to use the new smc91x platform data\n [ARM] pxa: make zylonite to use the new smc91x platform data\n [ARM] pxa: make mainstone to use the new smc91x platform data\n [ARM] pxa: make lubbock to use new smc91x platform data\n [NET] smc91x: prepare SMC_USE_PXA_DMA to be specified in platform data\n [NET] smc91x: prepare for SMC_IO_SHIFT to be a platform configurable variable\n [NET] smc91x: add SMC91X_NOWAIT flag to platform data\n [NET] smc91x: favor the use of SMC91X_USE_* instead of SMC_CAN_USE_*\n [NET] smc91x: remove \"irq_flags\" from \"struct smc91x_platdata\"\n [ARM] 5146/1: pxa2xx: convert all boards to call pxa2xx_transceiver_mode helper\n Support for LCD on e740 e750 e400 and e800 e-series PDAs\n E-series UDC support\n PXA UDC - allow use of inverted GPIO for pullup\n Add e350 support\n Fix broken e-series build\n E-series GPIO / IRQ definitions.\n ...\n" }, { "commit": "359784084f3da86e2c7621fd9266e04b50287834", "tree": "371c9f83d2a2765043580aa83002036eaf09da5d", "parents": [ "b5e4ad57eeffef0ac274413f83be4ef903719ea4" ], "author": { "name": "Marek Vašut", "email": "marek.vasut@gmail.com", "time": "Mon Jul 07 17:28:59 2008 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 10 12:15:32 2008 +0100" }, "message": "[ARM] 5154/1: PalmTX PCMCIA\n\nThis patch adds PCMCIA support for PalmTX handheld computer.\nThere is one chip hard-soldered to slot0, another slot is\nnot in use and not accessible.\n\nSigned-off-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "785e821eb679c171f453722f15c6791de0c1abe1", "tree": "2531d52bef3b07c07c62cd7f079ed3625f50cff0", "parents": [ "0478cf269974e0c7d98f5c5eed815ffb958ddee6" ], "author": { "name": "Michael Hennerich", "email": "michael.hennerich@analog.com", "time": "Wed Jun 11 09:06:16 2008 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Tue Jun 24 15:33:39 2008 +0200" }, "message": "pcmcia: add support CompactFlash PCMCIA support for Blackfin.\n\nA new host driver to add CompactFlash PCMCIA support for Blackfin.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Michael Hennerich \u003cmichael.hennerich@analog.com\u003e\nSigned-off-by: Bryan Wu \u003ccooloney@kernel.org\u003e\nCc: Mike Frysinger \u003cvapier.adi@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "2b571a066a2fee14189a297ce8adc5212c58074c", "tree": "742ac4893aa8beef1a6975fed5c9bb7530423547", "parents": [ "4975e45ff66845c9acc6c8619e80ef15eadf785e" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Oct 16 23:26:20 2007 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Wed Oct 17 08:42:48 2007 -0700" }, "message": "pcmcia: CompactFlash driver for PA Semi Electra boards\n\nDriver for the CompactFlash slot on the PA Semi Electra eval board. It\u0027s\na simple device sitting on localbus, with interrupts and detect/voltage\ncontrol over GPIO.\n\nThe driver is implemented as an of_platform driver, and adds localbus\nas a bus being probed by the of_platform framework.\n\n[akpm@linux-foundation.org: cleanups]\n[olof@lixom.net: fix build]\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Milton Miller \u003cmiltonm@bga.com\u003e\nCc: Kumar Gala \u003cgalak@gate.crashing.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "87944f3361fc033b73617aa663135c6e468957a7", "tree": "9ea40a0e8cc03922d16723df8a905dddb7e71b1b", "parents": [ "a8fc0789558d81d2898b87473404b71b7f7cd0fc" ], "author": { "name": "Mike Rapoport", "email": "mike@compulab.co.il", "time": "Sun Sep 23 16:00:20 2007 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Oct 15 18:54:02 2007 +0100" }, "message": "[ARM] 4578/1: CM-x270: PCMCIA support\n\nThis patch provides support for PCMCIA on CM-X270\n\nSigned-off-by: Mike Rapoport \u003cmike@compulab.co.il\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "2c1f3b7a30286c16ba151fadb0abf0b20e2a1e45", "tree": "8d917b469b8b18828da7b733fdf43f173bd6b5cf", "parents": [ "552dc85dfed6b6a74a3a01c4ba277ee09797dd0a" ], "author": { "name": "Andrew Victor", "email": "andrew@sanpeople.com", "time": "Tue Feb 21 12:56:52 2006 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Mar 31 17:05:41 2006 +0200" }, "message": "[PATCH] pcmcia: AT91RM9200 Compact Flash driver\n\nThis patch adds support for the Compact Flash controller integrated in\nthe Atmel AT91RM9200 processor.\n\nSigned-off-by: Andrew Victor \u003candrew@sanpeople.com\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n\n" }, { "commit": "1540eec5e5549b2e41704ce77f3f4ba880d2434c", "tree": "47a68638c377f61e1035294f4018570c8a1245e0", "parents": [ "e904663b4d511884145df54bead401840389853a" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Jan 15 00:51:53 2006 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Mar 31 17:02:33 2006 +0200" }, "message": "[PATCH] pcmcia: remove pcmcia_compat.c\n\nRemove the compatibility wrappers, as they can (now) also be implemented\nusing macros. Please continue using these wrappers instead of new functions\nuntil a new API has stabilized.\n\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n\n" }, { "commit": "e34631508861237e598e7d72703eae4478761f37", "tree": "3b2e7959ade92a501940619e6e0c8eae85f5ae83", "parents": [ "5ab0b374943b3e42a391a3929e91616ef37dda90" ], "author": { "name": "Marcelo Tosatti", "email": "marcelo.tosatti@cyclades.com", "time": "Sat Nov 05 13:03:32 2005 -0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Thu Nov 10 11:19:58 2005 +0100" }, "message": "[PCMCIA] MPC8xx PCMCIA update\n\nKconfig entry: dependency on 8xx\nMakefile: fix whitespace breakage\nm8xx_pcmcia.c:\n\t- asm/segment.h is gone\n\t- use generic PCMCIA suspend/resume methods\n\nSigned-off-by: Marcelo Tosatti \u003cmarcelo.tosatti@cyclades.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "23fd07750a789a66fe88cf173d52a18f1a387da4", "tree": "06fdd6df35fdb835abdaa9b754d62f6b84b97250", "parents": [ "bd787d438a59266af3c9f6351644c85ef1dd21fe", "ed28f96ac1960f30f818374d65be71d2fdf811b0" ], "author": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Mon Oct 31 13:37:12 2005 +1100" }, "committer": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Mon Oct 31 13:37:12 2005 +1100" }, "message": "Merge ../linux-2.6 by hand\n" }, { "commit": "77bb86a1b9f8b872d8efc33c4f4359f809220252", "tree": "3f0b5980d340cdec48700ab398ea9a4b1e48ee5a", "parents": [ "1753298947afe5eb56da755bc057f1868f345ec1" ], "author": { "name": "Pavel Machek", "email": "pavel@ucw.cz", "time": "Sun Oct 30 23:39:02 2005 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Oct 30 23:39:02 2005 +0000" }, "message": "[ARM] Support pcmcia slot on sharp sl-5500\n\nThis adds support for pcmcia slot on sharp zaurus sl-5500.\npxa2xx_sharpsl.c thus becomes quite miss-named, but I guess that\nis not worth fixing?\n\nSigned-off-by: Pavel Machek \u003cpavel@suse.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "d6460827af0763dc2f4a5cf0455cbf1e3a9ccb77", "tree": "eeac9842013ab85276fff3ee64928c9c4cd1fd2c", "parents": [ "efe29c0f34dc3ee3511e46458f335edb7ee50327" ], "author": { "name": "Pete Popov", "email": "ppopov@embeddedalley.com", "time": "Sat Sep 17 00:38:10 2005 +0000" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Sat Oct 29 19:32:24 2005 +0100" }, "message": "Updated pcmcia driver with pb1200 and db1200 support.\nUpdated db1200_defconfig so pcmcia is enabled by default.\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "de957c89b7dadb3147e885d7b6eb9db73d0eea57", "tree": "8d6be34fb3e636924e702a02d87e5396585e590d", "parents": [ "e37b0c9670fed2264661ade1beb5c228dec29c96" ], "author": { "name": "Marcelo Tosatti", "email": "marcelo.tosatti@cyclades.com", "time": "Fri Oct 28 17:46:13 2005 -0700" }, "committer": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Sat Oct 29 13:55:35 2005 +1000" }, "message": "[PATCH] MPC8xx PCMCIA driver\n\nHere is an uptodated version of the MPC8xx PCMCIA driver for v2.6,\naddressing comments by Jeff and Dominik:\n\n- use IO accessors instead of direct device memory referencing\n- avoid usage of non-standard \"uint/uchar\" data types\n- kill struct typedef\u0027s\n\nWill submit it for inclusion once v2.6.14 is out.\n\nTesting on 8xx platforms is more than welcome! Works like a charm\non our custom hardware (CONFIG_PRxK).\n\nCc: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Paul Mackerras \u003cpaulus@samba.org\u003e\n" }, { "commit": "f74e48a51c38f54fa26eb86a7a42f592156eccc2", "tree": "c1b514520463170a51d2dc243664827425d7bc34", "parents": [ "71ed90d89eff51a1137cbef727f11b8f7d5b20f1" ], "author": { "name": "David Brownell", "email": "dbrownell@users.sourceforge.net", "time": "Fri Sep 09 13:03:28 2005 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Fri Sep 09 13:57:48 2005 -0700" }, "message": "[PATCH] pcmcia: OMAP CF controller\n\nThis adds a socket driver for the OMAP CF controller; it\u0027s currently in use on\nOSK boards.\n\nSigned-off-by: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "1a8d46631e166a3c79fe1466ce8cfc4721fdf780", "tree": "71d2d6327019e1a6cb01b5027f2071aea9c4f04a", "parents": [ "e6ea0b9ec5131ac360581d6924fed536758bd024" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Mon Jun 27 16:28:53 2005 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@ppc970.osdl.org", "time": "Mon Jun 27 18:03:20 2005 -0700" }, "message": "[PATCH] pcmcia: move pcmcia resource handling out of cs.c\n\nMove the 16-bit PCMICA resource handling from pcmcia_core.o to pcmcia.o.\n\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "e7a480d229461e54a0b3b0439b2bf0e652545e3d", "tree": "a1a8226fcd713e5db3e26a99ad877e4fd1a58edd", "parents": [ "9a5555b81fde402119a6b4f2b38d3373d272ff69" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Mon Jun 27 16:28:47 2005 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@ppc970.osdl.org", "time": "Mon Jun 27 18:03:18 2005 -0700" }, "message": "[PATCH] pcmcia: move PCMCIA ioctl to a separate file\n\nMove all PCMCIA_IOCTL-related code to a different file.\n\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n\nFrom: Richard Purdie \u003crpurdie@rpsys.net\u003e\n\nThe pcmcia-move-pcmcia-ioctl-to-a-separate-file patch was corrupted in -mm2\ncausing this problem.\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "1da177e4c3f41524e886b7f1b8a0c1fc7321cac2", "tree": "0bba044c4ce775e45a88a51686b5d9f90697ea9d", "parents": [], "author": { "name": "Linus Torvalds", "email": "torvalds@ppc970.osdl.org", "time": "Sat Apr 16 15:20:36 2005 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@ppc970.osdl.org", "time": "Sat Apr 16 15:20:36 2005 -0700" }, "message": "Linux-2.6.12-rc2\n\nInitial git repository build. I\u0027m not bothering with the full history,\neven though we have it. We can create a separate \"historical\" git\narchive of that later if we want to, and in the meantime it\u0027s about\n3.2GB when imported into git - space that would just make the early\ngit days unnecessarily complicated, when we don\u0027t have a lot of good\ninfrastructure for it.\n\nLet it rip!\n" } ] }