)]}' { "log": [ { "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": "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": "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": "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" }, { "commit": "404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34", "tree": "99119edc53fdca73ed7586829b8ee736e09440b3", "parents": [ "28cdac6690cb113856293bf79b40de33dbd8f974", "1051b9f0f9eab8091fe3bf98320741adf36b4cfa" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 06 22:33:32 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 06 22:33:32 2011 +0000" }, "message": "Merge branch \u0027devel-stable\u0027 into devel\n\nConflicts:\n\tarch/arm/mach-pxa/clock.c\n\tarch/arm/mach-pxa/clock.h\n" }, { "commit": "31edf274f9aff1ccd39934a0b2fce38f4405c656", "tree": "fdc7bc445307ccb9648ca1a71375947c8ed59722", "parents": [ "3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5", "ed60453fa8f8fc3d034dfdf10371a99cc6905626", "ac61d143ffe2a6db4d4bcf47c21a5159d6a1b644", "28257f7fdee0facc3b7f934e82c2485f27120d41", "b23065313297e750edd57ab6edfd36224826724e", "50005a8deb38e5e6456ebd94e57adb321d4589de", "cf562b4a550b3cd9d602a05bc27aaaaa376947b4", "3d09fbcd26851ffb2c40cec411b8e56db02520d1", "8a9618f5dfca35edb0d7ab6374ff586e2e9e989b" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Jan 05 18:08:10 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Jan 05 18:08:10 2011 +0000" }, "message": "Merge branches \u0027ftrace\u0027, \u0027gic\u0027, \u0027io\u0027, \u0027kexec\u0027, \u0027mod\u0027, \u0027sa11x0\u0027, \u0027sh\u0027 and \u0027versatile\u0027 into devel\n" }, { "commit": "4b7bd364700d9ac8372eff48832062b936d0793b", "tree": "0dbf78c95456a0b02d07fcd473281f04a87e266d", "parents": [ "c0d8768af260e2cbb4bf659ae6094a262c86b085", "90a8a73c06cc32b609a880d48449d7083327e11a" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Dec 22 18:57:02 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Dec 22 18:57:02 2010 +0100" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nConflicts:\n\tMAINTAINERS\n\tarch/arm/mach-omap2/pm24xx.c\n\tdrivers/scsi/bfa/bfa_fcpim.c\n\nNeeded to update to apply fixes for which the old branch was too\noutdated.\n" }, { "commit": "fa87672ab30ce6564393778b8cbc67fc32712a30", "tree": "50551c8763a12f37ef483055aa0e53b4f894776a", "parents": [ "17b38ebb6a32250a220d6af77293f7e3f9c62a6e" ], "author": { "name": "Marcelo Roberto Jimenez", "email": "mroberto@cpti.cetuc.puc-rio.br", "time": "Mon Oct 18 22:41:29 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Dec 21 14:53:45 2010 +0000" }, "message": "ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support.\n\nThis patch adds nanoEngine PCMCIA support, with support for two sockets.\n\nIn order to have a fully functional pcmcia subsystem in a BSE\nnanoEngine board you should carefully read this:\n\nhttp://cambuca.ldhs.cetuc.puc-rio.br/nanoengine/\n\nAcked-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Marcelo Roberto Jimenez \u003cmroberto@cpti.cetuc.puc-rio.br\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "17b38ebb6a32250a220d6af77293f7e3f9c62a6e", "tree": "5e04b2fc35f1c3cbd5f39cdbf3fdf24f17ec6fd2", "parents": [ "d2ccb52d88dcb7eb3539d0e0c77a7028b8d46037" ], "author": { "name": "Marcelo Roberto Jimenez", "email": "mroberto@cpti.cetuc.puc-rio.br", "time": "Mon Oct 18 22:39:05 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Dec 21 14:53:44 2010 +0000" }, "message": "ARM: 6457/1: pcmcia: Fix checkpatch.pl issues in drivers/pcmcia/soc_common.c.\n\nThis patch fixes checkpatch.pl issues in drivers/pcmcia/soc_common.c.\n\nSigned-off-by: Marcelo Roberto Jimenez \u003cmroberto@cpti.cetuc.puc-rio.br\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "1b9169d8a0fe2b41fbbb8d152c8108190865f3cf", "tree": "b7aa4266dab7ac291823acdd9ef7f2a1638f10cd", "parents": [ "e60f137b715b0a19b84502c23a09c5af9107399d" ], "author": { "name": "Marek Vasut", "email": "marek.vasut@gmail.com", "time": "Tue Oct 19 16:19:32 2010 +0200" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Mon Dec 20 23:14:02 2010 +0800" }, "message": "ARM: pxa: Update Balloon3 for new FPGA firmware\n\nThe new FPGA firmware in Balloon3 uses different methods to control it\u0027s bus\ncontrol lines. In the new version, there are separate registers to set/clear\nbus control lines. This patch updates affected places.\n\nSigned-off-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "fd62999bad9fc3b176ef6bc9d2a71be940efd908", "tree": "62f1986003c9e74cb17190c989dec61dc88b9533", "parents": [ "c085052bc52d7caaca1172aabbedc06777253961" ], "author": { "name": "Marek Vasut", "email": "marek.vasut@gmail.com", "time": "Wed Aug 11 05:04:53 2010 +0200" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Mon Dec 20 23:07:44 2010 +0800" }, "message": "ARM: pxa: Colibri PXA320 PCMCIA driver\n\nSigned-off-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nAcked-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "960c0acaabf603e39b121ae5c0580aaca6f8aa7b", "tree": "3a8ce21b10abae0939aa427a021d3408583d1a6a", "parents": [ "a4257af5b0c5479bb81597579841e9daaeccd7f6" ], "author": { "name": "Marek Vasut", "email": "marek.vasut@gmail.com", "time": "Wed Aug 11 03:32:53 2010 +0200" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Mon Dec 20 23:07:39 2010 +0800" }, "message": "ARM: pxa: Toradex Colibri PXA270 CF support\n\nThis driver also contains structures to eventually support PXA320. This is\nplanned to be added in a later patch.\n\nSigned-off-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nAcked-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "a4257af5b0c5479bb81597579841e9daaeccd7f6", "tree": "9a46d53b4538a25233991ce8ca317264ad6f133d", "parents": [ "ef6c84454f8567d4968c210d7d194fb711ed3739" ], "author": { "name": "Marek Vasut", "email": "marek.vasut@gmail.com", "time": "Wed Nov 03 16:26:42 2010 +0100" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Mon Dec 20 23:07:37 2010 +0800" }, "message": "ARM: pxa: Add pxa320 PCMCIA check\n\nOn PXA320, there\u0027s only one PCMCIA slot available. Check for cases where the\nuser would want to register multiple. Also, rework failpath.\n\nSigned-off-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "2a125dd56b3a853701063fe8a678ad7603e385fd", "tree": "279a16da435e810fa8490fe4a1557486a54e9cf3", "parents": [ "4029813c89926ae5d78cc2dff49d845d934424f6" ], "author": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Mon Nov 22 22:48:49 2010 +0800" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Thu Dec 16 14:31:19 2010 +0800" }, "message": "ARM: pxa: remove get_memclk_frequency_10khz()\n\nIntroduce \u0027struct clk\u0027 for memory and remove\nget_memclk_frequency_10khz().\n\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "ad68bb9f7a3cd47396635a5e3895215af57579da", "tree": "6d9890bc0112b637e95afa0129a08fc20e325234", "parents": [ "851982c1b6ca18cedf6d01e4529a0c1ddb30771e" ], "author": { "name": "Marek Vasut", "email": "marek.vasut@gmail.com", "time": "Wed Nov 03 16:29:35 2010 +0100" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Thu Dec 16 14:31:16 2010 +0800" }, "message": "ARM: pxa: Access SMEMC via virtual addresses\n\nThis is important because on PXA3xx, the physical mapping of SMEMC registers\ndiffers from the one on PXA2xx. In order to get PCMCIA working on both PXA2xx\nand PXA320, the PCMCIA driver was adjusted accordingly as well.\n\nAlso, various places in the kernel had to be patched to use\n__raw_read/__raw_write.\n\nSigned-off-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nAcked-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "b9f515e3e3861abbaa093359f7c6f31283695228", "tree": "ae3f6620155632412f3521521e5f3b511a39da65", "parents": [ "55afd264cdd5d5848753e90884ed596e11bce0ff" ], "author": { "name": "Marcelo Roberto Jimenez", "email": "mroberto@cpti.cetuc.puc-rio.br", "time": "Mon Oct 18 22:38:08 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Dec 04 12:47:48 2010 +0000" }, "message": "ARM: 6456/1: Fix for building DEBUG with sa11xx_base.c as a module.\n\nThis patch fixes a compilation issue when compiling PCMCIA SA1100\nsupport as a module with PCMCIA_DEBUG enabled. The symbol\nsoc_pcmcia_debug was not beeing exported.\nARM: pcmcia: Fix for building DEBUG with sa11xx_base.c as a module.\n\nThis patch fixes a compilation issue when compiling PCMCIA SA1100\nsupport as a module with PCMCIA_DEBUG enabled. The symbol\nsoc_pcmcia_debug was not beeing exported.\n\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Marcelo Roberto Jimenez \u003cmroberto@cpti.cetuc.puc-rio.br\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "106665d937df6eff33c71997a52f7bc3aefa6c12", "tree": "321c18545a08982d4e2869fb4ad2cbe096ad1469", "parents": [ "86f94e3a1583765476ec06131c755af8318e6470" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Nov 09 17:14:01 2010 -0800" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Nov 10 14:31:28 2010 +0100" }, "message": "drivers/pcmcia/soc_common.c: Use printf extension %pV\n\nUsing %pV reduces the number of printk calls and\neliminates any possible message interleaving from\nother printk calls.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCC: Russell King \u003clinux@arm.linux.org.uk\u003e\nCC: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nCC: linux-arm-kernel@lists.infradead.org\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "5b85e04e93f9a2963e88156cae8629ee72efd890", "tree": "f905998d2090812375a1a93b660bcf272903f8d4", "parents": [ "20fffee818ec43b64f58ab25c42705b7dcae16e5" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Thu Nov 04 10:46:14 2010 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Nov 10 14:30:01 2010 +0100" }, "message": "pcmcia/sa1100: don\u0027t put machine specific init functions in .init.text\n\nThese are called by sa11x0_drv_pcmcia_probe (which is marked now with\n__devinit) so they can go to .devinit.text now, too.\n\nThis fixes:\n\n\tWARNING: drivers/pcmcia/sa1100_cs.o(.text+0x10): Section mismatch in reference from the function sa11x0_drv_pcmcia_probe() to the function .init.text:pcmcia_simpad_init()\n\tThe function sa11x0_drv_pcmcia_probe() references\n\tthe function __init pcmcia_simpad_init().\n\tThis is often because sa11x0_drv_pcmcia_probe lacks a __init\n\tannotation or the annotation of pcmcia_simpad_init is wrong.\n\nand a similar warning for pcmcia_collie_init, pcmcia_cerf_init,\npcmcia_h3600_init and pcmcia_shannon_init.\n\nWhile at it mark pcmcia_assabet_init with __devinit, too.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCC: Russell King \u003clinux@arm.linux.org.uk\u003e\nCC: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nCC: linux-arm-kernel@lists.infradead.org\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "006839f12e9dc484a6227b263843f987abb709a4", "tree": "f5a8f4aad0572b128a3466ae38b10ff9ef158e46", "parents": [ "f6614b7bb405a9b35dd28baea989a749492c46b2" ], "author": { "name": "Komuro", "email": "komurojun-mbn@nifty.com", "time": "Sat Oct 23 07:02:05 2010 +0900" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Nov 10 14:29:09 2010 +0100" }, "message": "pd6729: Coding Style fixes\n\npd6729: remove unnecessary space.\n\nSigned-off-by: Komuro \u003ckomurojun-mbn@nifty.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "b595076a180a56d1bb170e6eceda6eb9d76f4cd3", "tree": "bc01ec7283808013e0b8ce7713fd6fc40f810429", "parents": [ "6aaccece1c483f189f76f1282b3984ff4c7ecb0a" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Mon Nov 01 15:38:34 2010 -0400" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Nov 01 15:38:34 2010 -0400" }, "message": "tree-wide: fix comment/printk typos\n\n\"gadget\", \"through\", \"command\", \"maintain\", \"maintain\", \"controller\", \"address\",\n\"between\", \"initiali[zs]e\", \"instead\", \"function\", \"select\", \"already\",\n\"equal\", \"access\", \"management\", \"hierarchy\", \"registration\", \"interest\",\n\"relative\", \"memory\", \"offset\", \"already\",\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "229aebb873e29726b91e076161649cf45154b0bf", "tree": "acc02a3702215bce8d914f4c8cc3d7a1382b1c67", "parents": [ "8de547e1824437f3c6af180d3ed2162fa4b3f389", "50a23e6eec6f20d55a3a920e47adb455bff6046e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 24 13:41:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 24 13:41:39 2010 -0700" }, "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: (39 commits)\n Update broken web addresses in arch directory.\n Update broken web addresses in the kernel.\n Revert \"drivers/usb: Remove unnecessary return\u0027s from void functions\" for musb gadget\n Revert \"Fix typo: configuation \u003d\u003e configuration\" partially\n ida: document IDA_BITMAP_LONGS calculation\n ext2: fix a typo on comment in ext2/inode.c\n drivers/scsi: Remove unnecessary casts of private_data\n drivers/s390: Remove unnecessary casts of private_data\n net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data\n drivers/infiniband: Remove unnecessary casts of private_data\n drivers/gpu/drm: Remove unnecessary casts of private_data\n kernel/pm_qos_params.c: Remove unnecessary casts of private_data\n fs/ecryptfs: Remove unnecessary casts of private_data\n fs/seq_file.c: Remove unnecessary casts of private_data\n arm: uengine.c: remove C99 comments\n arm: scoop.c: remove C99 comments\n Fix typo configue \u003d\u003e configure in comments\n Fix typo: configuation \u003d\u003e configuration\n Fix typo interrest[ing|ed] \u003d\u003e interest[ing|ed]\n Fix various typos of valid in comments\n ...\n\nFix up trivial conflicts in:\n\tdrivers/char/ipmi/ipmi_si_intf.c\n\tdrivers/usb/gadget/rndis.c\n\tnet/irda/irnet/irnet_ppp.c\n" }, { "commit": "ff10fca5ceacf7bc59636f5ab808e775d1717167", "tree": "a76795dbaaf7099c3accac1acc884e9e55aeea2e", "parents": [ "d4429f608abde89e8bc1e24b43cd503feb95c496" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Oct 22 08:46:36 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Oct 22 08:46:36 2010 +0200" }, "message": "pcmcia: IOCARD is also required for using IRQs\n\nDave Hinds pointed out to me that 37979e1546a7 will break b43 and\nray_cs, as IOCARD is not -- as the name would suggest -- only needed\nfor cards using IO ports. Instead, as it re-deines several pins, it\nis also required for using interrupts.\n\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "631dd1a885b6d7e9f6f51b4e5b311c2bb04c323c", "tree": "c431fa3479c1d35842fb5635ed7ccd487d063a62", "parents": [ "d7eccbbae84b2ee7dbb756e60287c4b47071444e" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Mon Oct 18 11:03:14 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 18 11:03:14 2010 +0200" }, "message": "Update broken web addresses in the kernel.\n\nThe patch below updates broken web addresses in the kernel\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nCc: Maciej W. Rozycki \u003cmacro@linux-mips.org\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nCc: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Matt Turner \u003cmattst88@gmail.com\u003e\nCc: Dimitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier.adi@gmail.com\u003e\nAcked-by: Ben Pfaff \u003cblp@cs.stanford.edu\u003e\nAcked-by: Hans J. Koch \u003chjk@linutronix.de\u003e\nReviewed-by: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "97299c726881603f44c30be8718c24015e7a4676", "tree": "1b8fae199393764bdef4b65c64badb79410510c7", "parents": [ "0f64f70e9c029450e38fcc496148ffc9256bf8c1" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Oct 15 16:58:21 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Oct 16 11:07:37 2010 +0200" }, "message": "pcmcia: don\u0027t call flush_scheduled_work() spuriously\n\nau100_generic and soc_common call flush_scheduled_work() spuriously.\nRemove them.\n\nThis is to prepare for the deprecation and removal of\nflush_scheduled_work().\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "a5360df9413987ed56ce8cffad678e557eff92e1", "tree": "ca6f3988aeeea411441e001f10ee285d7600fcf8", "parents": [ "3c7d2b765df974ae29a9f1d5a62e15b243a36763" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Fri Oct 15 14:18:21 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Oct 15 14:31:47 2010 +0200" }, "message": "pcmcia/yenta: guide users in case of problems with O2-bridges\n\nSome cards need the speedups on, some need them off. As we can\u0027t detect\nthis reliably, at least give the users a hint how to tweak the system.\n\nReported-by: David Bluecame \u003cdavid.bluecame@gmail.com\u003e\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "3c7d2b765df974ae29a9f1d5a62e15b243a36763", "tree": "a1f22e5f5d44441c1091cd6d40e5ffe5132fdaa4", "parents": [ "1ab488de544b7f94b4f8e5aed2b178cac685802f" ], "author": { "name": "Maciej Żenczykowski", "email": "zenczykowski@gmail.com", "time": "Wed Oct 13 21:47:14 2010 -0700" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Thu Oct 14 11:47:16 2010 +0200" }, "message": "pcmcia: fix unused function compile warning\n\npcmcia_socket_dev_resume() is only referenced from macro\nSET_SYSTEM_SLEEP_PM_OPS(NULL, pcmcia_socket_dev_resume)\nwhich based on CONFIG_PM_SLEEP may or may not actually\nuse its second parameter.\n\nSigned-off-by: Maciej Żenczykowski \u003czenczykowski@gmail.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "1ab488de544b7f94b4f8e5aed2b178cac685802f", "tree": "a2bb987928f4a8eb2a447b01898d578a7becbd45", "parents": [ "1c4a77bf54a61dde135740a563b6ec03382604e8" ], "author": { "name": "Rahul Ruikar", "email": "rahul.ruikar@gmail.com", "time": "Sun Sep 26 22:20:30 2010 +0530" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Tue Oct 05 15:49:51 2010 +0200" }, "message": "pcmcia: vrc4173_cardu: Fix error path for pci_release_regions and pci_disable_device\n\n- pci_release_regions called during return error path.\n- pci_disable_device called for cases where earlier it was enabled.\n- code duplication avoided/reduced by adding resource release at goto statements.\n\nSigned-off-by: Rahul Ruikar \u003crahul.ruikar@gmail.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "1c4a77bf54a61dde135740a563b6ec03382604e8", "tree": "8bd0e490fd9cca583a7fca69c48d2d43d36d83be", "parents": [ "2262054e74b4b26ed56a8535c1259f6c6c2862a4" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Sep 18 23:21:09 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:25 2010 +0200" }, "message": "pcmcia: add a few debug statements\n\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "2e9b981a7c63ee8278df6823f8389d69dad1a499", "tree": "7d88e2a03a3202ba26ce7dbcf6909e28d44f690c", "parents": [ "1cc745d1cdca8086b472a06671f0830fc0e98861" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Aug 08 11:36:26 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:24 2010 +0200" }, "message": "pcmcia: move driver name to struct pcmcia_driver\n\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "1cc745d1cdca8086b472a06671f0830fc0e98861", "tree": "f1d81106074d67fdab5c11da425ba0e7c27402e9", "parents": [ "00990e7ce0b0e596fe41d9c64d6933ea70084003" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Aug 01 11:21:14 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:24 2010 +0200" }, "message": "pcmcia: remove the \"Finally, report what we\u0027ve done\" message\n\nRemove this unnecessary message -- this info is either available\nin sysfs or by enabling dynamic debug from the PCMCIA core.\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-scsi@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "00990e7ce0b0e596fe41d9c64d6933ea70084003", "tree": "189e0dd92860feba84231c66955749574cac5d6d", "parents": [ "440eed43e2a95bb842488755683716814da10f2b" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Jul 30 13:13:46 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:24 2010 +0200" }, "message": "pcmcia: use autoconfiguration feature for ioports and iomem\n\nWhen CONF_AUTO_SET_IO or CONF_AUTO_SET_IOMEM are set, the corresponding\nfields in struct pcmcia_device *p_dev-\u003eresource[0,1,2] are set\naccordinly. Drivers wishing to override certain settings may do so in\nthe callback function, but they no longer need to parse the CIS entries\nstored in cistpl_cftable_entry_t themselves.\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: linux-bluetooth@vger.kernel.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCC: linux-scsi@vger.kernel.org\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "440eed43e2a95bb842488755683716814da10f2b", "tree": "45c49181a077f845cd366cfa7dc07f259fd01078", "parents": [ "9485ee14e143c7076e88deea1e87ca3eb0b2f94e" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Jul 30 09:51:52 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:23 2010 +0200" }, "message": "pcmcia: introduce autoconfiguration feature\n\nIntroduce an autoconfiguration feature to set certain values in\npcmcia_loop_config(), instead of copying the same code over and over\nin each PCMCIA driver. At first, introduce the following options:\n\nCONF_AUTO_CHECK_VCC\tcheck or matching Vcc entry\nCONF_AUTO_SET_VPP\tset Vpp\nCONF_AUTO_AUDIO\t\tenable the speaker line\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCC: linux-scsi@vger.kernel.org\nAcked-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e (for drivers/bluetooth)\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "9485ee14e143c7076e88deea1e87ca3eb0b2f94e", "tree": "781e50cb3f35722fcff8e3ecab22f364aac32ecb", "parents": [ "1ac71e5a35eebee60cdcf15b3980bd94498f037b" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Jul 31 07:09:32 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:23 2010 +0200" }, "message": "pcmcia: Documentation update\n\nFill in missing descriptions and update some others for functions in\npcmcia_resource.c.\n\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "1ac71e5a35eebee60cdcf15b3980bd94498f037b", "tree": "22fa9342ccccce6a774af029ce51a526e55f8180", "parents": [ "7feabb6412ea23edd298c0fa90e5aa6733eb4a42" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Thu Jul 29 19:27:09 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:23 2010 +0200" }, "message": "pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device\n\npcmcia_enable_device() now replaces pcmcia_request_configuration().\nInstead of config_req_t, all necessary flags are either passed as\na parameter to pcmcia_enable_device(), or (in rare circumstances)\nset in struct pcmcia_device -\u003e flags.\n\nWith the last remaining user of include/pcmcia/cs.h gone, remove\nall references.\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCC: linux-scsi@vger.kernel.org\nAcked-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e (for drivers/bluetooth)\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "7feabb6412ea23edd298c0fa90e5aa6733eb4a42", "tree": "bfafe961aeb5449a71fbb389172b3a6c68b56e7c", "parents": [ "37979e1546a790c44adbc7f27a85569944480ebc" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Thu Jul 29 18:35:47 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:22 2010 +0200" }, "message": "pcmcia: move config_{base,index,regs} to struct pcmcia_device\n\nSeveral drivers prefer to explicitly set config_{base,index,regs},\nformerly known as ConfigBase, ConfigIndex and Present. Instead of\npassing these values inside config_req_t, store it in struct\npcmcia_device.\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCC: linux-scsi@vger.kernel.org\nAcked-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e (for drivers/bluetooth)\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "37979e1546a790c44adbc7f27a85569944480ebc", "tree": "18499b4d2890409c1cbe49cc1af97b57f4a2c906", "parents": [ "fc301101034c06bf56a7f71bf682c48909e401a4" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Thu Jul 29 16:33:23 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:22 2010 +0200" }, "message": "pcmcia: simplify IntType\n\nIntType was only set to INT_MEMORY (driver pcmciamtd) or INT_MEMORY_AND_IO\n(all other drivers). As this flags seems to relate to ioport access, make\nit conditional to the driver having requested IO port access. There are two\ndrivers which do not request IO ports, but did set INT_MEMORY_AND_IO:\nray_cs and b43. For those, we consistently only set INT_MEMORY in future.\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCC: linux-scsi@vger.kernel.org\nAcked-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e (for drivers/bluetooth)\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "fc301101034c06bf56a7f71bf682c48909e401a4", "tree": "f1faa456d436515d73679bb12587967efba05e7c", "parents": [ "1a4a046030ade0f57b8f3b476d61c7c35d894b66" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Thu Jul 29 16:19:39 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:22 2010 +0200" }, "message": "pcmcia: simplify Status, ExtStatus register access\n\nThe Status (CISREG_CCSR) and ExtStatus (CISREG_ESR) registers were\nonly accessed to enable audio output for some drivers and IRQ for\nserial_cs.c. The former also required setting config_req_t.Attributes\nto CONF_ENABLE_SPKR; the latter can be simplified to setting this\nfield to CONF_ENABLE_ESR.\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-serial@vger.kernel.org\nCC: linux-scsi@vger.kernel.org\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "1a4a046030ade0f57b8f3b476d61c7c35d894b66", "tree": "07496ee2340444c87740745b140957347b4da1c3", "parents": [ "e8405f0f617856de0ceb7d04e65b663051451544" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Thu Jul 29 15:54:54 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:21 2010 +0200" }, "message": "pcmcia: remove Pin, Copy configuration register access\n\nThe \"Pin\" and \"Copy\" configuration registers (CISREG_SCR, CISREG_PPR)\ndo not seem to be utilized anywhere. If a device would request a\nwrite to these registers, \"0\" would be written. Continue to do so, but\nwarn of unexpected behavior -- and remove the \"Pin\" and \"Copy\" entries\nfrom config_req_t.\n\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "e8405f0f617856de0ceb7d04e65b663051451544", "tree": "06e9cd27419a40587bcec19b71010e52b7dfcba4", "parents": [ "fb49fa533f9d211994c33efb752ffa5b30033729" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Thu Jul 29 15:50:55 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:21 2010 +0200" }, "message": "pcmcia: move Vpp setup to struct pcmcia_device\n\nSome drivers prefer to explicitly set Vpp. Instead of passing the\nvoltage inside config_req_t, store it in struct pcmcia_device.\n\nCC: linux-ide@vger.kernel.org\nCC: netdev@vger.kernel.org\nCC: linux-mtd@lists.infradead.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-serial@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: linux-scsi@vger.kernel.org\nAcked-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e (for drivers/bluetooth)\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "fb49fa533f9d211994c33efb752ffa5b30033729", "tree": "675d26cf01c23d9623f274971a065b0dedb10f3a", "parents": [ "cdb138080b78146d1cdadba9f5dadbeb97445b91" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Thu Jul 29 14:06:42 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:21 2010 +0200" }, "message": "pcmcia: split up modify_configuration() into two fixup functions\n\npcmcia_modify_configuration() was only used by two drivers to fix up\none issue each: setting the Vpp to a different value, and reducing\nthe IO width to 8 bit. Introduce two explicitly named functions\nhandling these things, and remove one further typedef.\n\nCC: netdev@vger.kernel.org\nCC: linux-mtd@lists.infradead.org\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "cdb138080b78146d1cdadba9f5dadbeb97445b91", "tree": "fae26f709ed0f19648db79059234faf9fa028051", "parents": [ "899611ee7d373e5eeda08e9a8632684e1ebbbf00" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Jul 28 10:59:06 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:21 2010 +0200" }, "message": "pcmcia: do not use win_req_t when calling pcmcia_request_window()\n\nInstead of win_req_t, drivers are now requested to fill out\nstruct pcmcia_device *p_dev-\u003eresource[2,3,4,5] for up to four iomem\nranges. After a call to pcmcia_request_window(), the windows found there\nare reserved and may be used until pcmcia_release_window() is called.\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-mtd@lists.infradead.org\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCC: linux-scsi@vger.kernel.org\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "40d24ff9b4309d37999bc0ae91a271f57651d9dd", "tree": "07b3664ec20fa3fe20a518f0cb8a00de0dc781fb", "parents": [ "7cdffc86528ec9c55c83c649b6d64cadeb558136" ], "author": { "name": "Rahul Ruikar", "email": "rahul.ruikar@gmail.com", "time": "Sun Sep 26 17:00:29 2010 +0530" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Sep 26 15:54:25 2010 +0200" }, "message": "pcmcia: pd6729: Fix error path\n\nIn error return path\ncall pci_disable_device() which was enabled earlier.\n\nSigned-off-by: Rahul Ruikar \u003crahul.ruikar@gmail.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "7cdffc86528ec9c55c83c649b6d64cadeb558136", "tree": "7c802dba05b0c2c9f784452ff73d816469413c8c", "parents": [ "151b6a5f1d4c547c92ec67a5a6fedc16f435956e" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Sep 18 10:19:13 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Sep 18 16:30:18 2010 +0200" }, "message": "pcmcia: preserve configuration information if request_io fails partly\n\nIf pcmcia_request_io() only fails partly -- for the second of two\nrequested resources -- preserve the configuration settings for the\nfirst one.\n\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "eb838fe109b8f51ba590802761753a2631c3f7f0", "tree": "f55b03e4c7e6ffb9e24f515b66fda8e4e914bb62", "parents": [ "c494bc6c534c78fac2d308ad38073b9226448b0d" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Mon Sep 13 16:51:36 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 15 17:57:09 2010 +0200" }, "message": "pcmcia: per-device, not per-socket debug messages\n\nAs the iomem / ioport setup differs per device, it is much better\nto print out the device instead of the socket.\n\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "58d4ea65b98f154f3326b038eecda32f90b46ea8", "tree": "636aed413349dece12c08a4bd3d1fea0254976d8", "parents": [ "26f0cf91813bdc8e61595f8ad6660251e2ee9cf6", "fbe0f8348fd6c3d016a3f48756eb729b41a67c22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:11:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:11:31 2010 -0700" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6:\n mmc_spi: Fix unterminated of_match_table\n of/sparc: fix build regression from of_device changes\n of/device: Replace struct of_device with struct platform_device\n" }, { "commit": "0b019a41553a919965bb02d07d54e3e6c57a796d", "tree": "6e329b4159b440d2aac5200a5c07103fe261c096", "parents": [ "5f6878b0d22f9b93f9698f88c335007e2a3c3bbc", "054d5c9238f3c577ad51195c3ee7803613f322cc" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Aug 10 23:17:52 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Aug 10 23:17:52 2010 +0100" }, "message": "Merge branches \u0027master\u0027 and \u0027devel\u0027 into for-linus\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/mm/Kconfig\n" }, { "commit": "1685e633b396b0f3dabbc9fa5d65dfefe6435250", "tree": "ee83e26e2468ca1518a1b065c690159e12c8def9", "parents": [ "1cfd2bda8c486ae0e7a8005354758ebb68172bca", "127c03cdbad9bd5af5d7f33bd31a1015a90cb77f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 12:25:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 12:25:06 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:\n pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq\n pcmcia: do not request windows if you don\u0027t need to\n pcmcia: insert PCMCIA device resources into resource tree\n pcmcia: export resource information to sysfs\n pcmcia: use struct resource for PCMCIA devices, part 2\n pcmcia: remove memreq_t\n pcmcia: move local definitions out of include/pcmcia/cs.h\n pcmcia: do not use io_req_t when calling pcmcia_request_io()\n pcmcia: do not use io_req_t after call to pcmcia_request_io()\n pcmcia: use struct resource for PCMCIA devices\n pcmcia: clean up cs.h\n pcmcia: use pcmica_{read,write}_config_byte\n pcmcia: remove cs_types.h\n pcmcia: remove unused flag, simplify headers\n pcmcia: remove obsolete CS_EVENT_ definitions\n pcmcia: split up central event handler\n pcmcia: simplify event callback\n pcmcia: remove obsolete ioctl\n\nConflicts in:\n - drivers/staging/comedi/drivers/*\n - drivers/staging/wlags49_h2/wl_cs.c\ndue to dev_info_t and whitespace changes\n" } ], "next": "f165eb77f49cb6f6e86e2f2f09183904b2965d19" }