)]}' { "log": [ { "commit": "95694129b43165911dc4e8a972f0d39ad98d86be", "tree": "a7faf4b70c85b457f684cbc1033ac5b79457c2e9", "parents": [ "b1a808ff436343956a6ae63178ea1810c5e5a3a1", "80da6a4feeb9e4d6554f771f14f5b994e6c6c7e8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:43 2012 -0700" }, "message": "Merge branch \u0027paul\u0027 (Fixups from Paul Gortmaker)\n\nThis merges some of the fixes from Paul Gortmaker for the header file\ncleanup fallout.\n\nSome of the patches are going through arch maintainer trees, and David\nHowells suggested another be done differently, but this at least fixes a\nfew cases.\n\n* emailed from Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e:\n asm-generic: add linux/types.h to cmpxchg.h\n firewire: restore the device.h include in linux/firewire.h\n frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL\n parisc: fix missing cmpxchg file error from system.h split\n blackfin: fix cmpxchg build fails from system.h fallout\n avr32: fix build failures from mis-naming of atmel_nand.h\n ARM: mach-msm: fix compile fail from system.h fallout\n irq_work: fix compile failure on MIPS from system.h split\n" }, { "commit": "b443caf12f9ee14e9843e53d4d929319e637275a", "tree": "5d1a5b58411d06122fea2f7659e739dff52b7ea3", "parents": [ "83e3fa6f0193299f8b7180db588edd5ca61a3b82" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:38 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:16 2012 -0700" }, "message": "ARM: mach-msm: fix compile fail from system.h fallout\n\nTo fix:\n\n In file included from arm/boot/compressed/misc.c:28:0:\n arm/mach-msm/include/mach/uncompress.h: In function \u0027putc\u0027:\n arch/arm/mach-msm/include/mach/uncompress.h:48:3: error: implicit\n declaration of function \u0027smp_mb\u0027 [-Werror\u003dimplicit-function-declaration]\n\nThe putc does a cpu_relax which for this platform is smp_mb.\n\nBisect indicates the 1st failing commit as: 0195c00244dc (\"Merge tag\n\u0027split-asm_system_h...\")\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "deb74f5ca1f22f9e1c5da93143a250dbb96535af", "tree": "ee9eb01e5433ea50f3414a469521a4c1cfaccb7a", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928", "615399c84d1b8d8d8752629e5e5ab4e5044d6918" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 08:53:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 08:53:24 2012 -0700" }, "message": "Merge tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux\n\nPull cpumask cleanups from Rusty Russell:\n \"(Somehow forgot to send this out; it\u0027s been sitting in linux-next, and\n if you don\u0027t want it, it can sit there another cycle)\"\n\nI\u0027m a sucker for things that actually delete lines of code.\n\nFix up trivial conflict in arch/arm/kernel/kprobes.c, where Rusty fixed\na user of \u0026cpu_online_map to be cpu_online_mask, but that code got\ndeleted by commit b21d55e98ac2 (\"ARM: 7332/1: extract out code patch\nfunction from kprobes\").\n\n* tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux:\n cpumask: remove old cpu_*_map.\n documentation: remove references to cpu_*_map.\n drivers/cpufreq/db8500-cpufreq: remove references to cpu_*_map.\n remove references to cpu_*_map in arch/\n" }, { "commit": "923f79743c76583ed4684e2c80c8da51a7268af3", "tree": "e523a04c6b4cdddf70cf4adec25fa4fbbdbc5f5a", "parents": [ "a7697b945e6e5025f184d6762e7285f1c498411d", "7f3bd6c9cb8e9fa2b57bfa860cd3e734a28f48ed" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 18:15:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 18:15:43 2012 -0700" }, "message": "Merge branch \u0027kbuild\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild\n\nPull kbuild changes from Michal Marek:\n - Unification of cmd_uimage among archs that use it\n - make headers_check tries harder before reporting a missing\n \u003clinux/types.h\u003e include\n - kbuild portability fix for shells that do not support echo -e\n - make clean descends into samples/\n - setlocalversion grep fix\n - modpost typo fix\n - dtc warnings fix\n\n* \u0027kbuild\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:\n setlocalversion: Use \"grep -q\" instead of piping output to \"read dummy\"\n modpost: fix ALL_INIT_DATA_SECTIONS\n Kbuild: centralize MKIMAGE and cmd_uimage definitions\n headers_check: recursively search for linux/types.h inclusion\n scripts/Kbuild.include: Fix portability problem of \"echo -e\"\n scripts: dtc: fix compile warnings\n kbuild: clean up samples directory\n kbuild: disable -Wmissing-field-initializers for W\u003d1\n" }, { "commit": "623ff7739e7c00fa3d55dbfd42a492a68298fd7a", "tree": "0b7461753a1b13b27ea2958a7d48c6efb47bba54", "parents": [ "c39e8ede284f469971589f2e04af78216e1a771d", "7b0e67f604e1829e5292e1ad7743eb18dc42ea7c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 17:31:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 17:31:56 2012 -0700" }, "message": "Merge tag \u0027for-linus-3.4\u0027 of git://git.infradead.org/mtd-2.6\n\nPull MTD changes from David Woodhouse:\n - Artem\u0027s cleanup of the MTD API continues apace.\n - Fixes and improvements for ST FSMC and SuperH FLCTL NAND, amongst\n others.\n - More work on DiskOnChip G3, new driver for DiskOnChip G4.\n - Clean up debug/warning printks in JFFS2 to use pr_\u003clevel\u003e.\n\nFix up various trivial conflicts, largely due to changes in calling\nconventions for things like dmaengine_prep_slave_sg() (new inline\nwrapper to hide new parameter, clashing with rewrite of previously last\nparameter that used to be an \u0027append\u0027 flag, and is now a bitmap of\n\u0027unsigned long flags\u0027).\n\n(Also some header file fallout - like so many merges this merge window -\nand silly conflicts with sparse fixes)\n\n* tag \u0027for-linus-3.4\u0027 of git://git.infradead.org/mtd-2.6: (120 commits)\n mtd: docg3 add protection against concurrency\n mtd: docg3 refactor cascade floors structure\n mtd: docg3 increase write/erase timeout\n mtd: docg3 fix inbound calculations\n mtd: nand: gpmi: fix function annotations\n mtd: phram: fix section mismatch for phram_setup\n mtd: unify initialization of erase_info-\u003efail_addr\n mtd: support ONFI multi lun NAND\n mtd: sm_ftl: fix typo in major number.\n mtd: add device-tree support to spear_smi\n mtd: spear_smi: Remove default partition information from driver\n mtd: Add device-tree support to fsmc_nand\n mtd: fix section mismatch for doc_probe_device\n mtd: nand/fsmc: Remove sparse warnings and errors\n mtd: nand/fsmc: Add DMA support\n mtd: nand/fsmc: Access the NAND device word by word whenever possible\n mtd: nand/fsmc: Use dev_err to report error scenario\n mtd: nand/fsmc: Use devm routines\n mtd: nand/fsmc: Modify fsmc driver to accept nand timing parameters via platform\n mtd: fsmc_nand: add pm callbacks to support hibernation\n ...\n" }, { "commit": "c39e8ede284f469971589f2e04af78216e1a771d", "tree": "1134c135c1628eb468e106f5da1dc2850089cf27", "parents": [ "a335750b9a039a9d4cd727cdccacfb90fd63c4e8", "d3c7de52096a201ac188adb95b8351b90cab11f1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 17:00:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 17:00:34 2012 -0700" }, "message": "Merge tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull a few more ARM platform fixes from Olof Johansson:\n \"Apologies for back-to-back fixes pull requests, but one of the patches\n below are the kind we\u0027ll see posted over and over if we don\u0027t send it\n in. I hadn\u0027t done the full sanity-check of defconfig builds by the\n time I sent up the other fixes yesterday or I would have included it\n then.\n\n Two patches, one dealing with the system.h fallout, the other is a\n missing linux/bug.h in a place where ARRAY_SIZE() is used.\"\n\n* tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: clps711x: fix missing include file\n ARM: fix builds due to missing \u003casm/system_misc.h\u003e includes\n" }, { "commit": "a335750b9a039a9d4cd727cdccacfb90fd63c4e8", "tree": "8f3198984fb75fe494e771d9431f6799228623c5", "parents": [ "10f3cb41d48ab30f5c754b30eea557371892b4c2", "d326f44e5f2204c7a24db69bfc6dd3fe5f86182b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 16:45:38 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 16:45:39 2012 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux\n\nPull ACPI \u0026 Power Management changes from Len Brown:\n - ACPI 5.0 after-ripples, ACPICA/Linux divergence cleanup\n - cpuidle evolving, more ARM use\n - thermal sub-system evolving, ditto\n - assorted other PM bits\n\nFix up conflicts in various cpuidle implementations due to ARM cpuidle\ncleanups (ARM at91 self-refresh and cpu idle code rewritten into\n\"standby\" in asm conflicting with the consolidation of cpuidle time\nkeeping), trivial SH include file context conflict and RCU tracing fixes\nin generic code.\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (77 commits)\n ACPI throttling: fix endian bug in acpi_read_throttling_status()\n Disable MCP limit exceeded messages from Intel IPS driver\n ACPI video: Don\u0027t start video device until its associated input device has been allocated\n ACPI video: Harden video bus adding.\n ACPI: Add support for exposing BGRT data\n ACPI: export acpi_kobj\n ACPI: Fix logic for removing mappings in \u0027acpi_unmap\u0027\n CPER failed to handle generic error records with multiple sections\n ACPI: Clean redundant codes in scan.c\n ACPI: Fix unprotected smp_processor_id() in acpi_processor_cst_has_changed()\n ACPI: consistently use should_use_kmap()\n PNPACPI: Fix device ref leaking in acpi_pnp_match\n ACPI: Fix use-after-free in acpi_map_lsapic\n ACPI: processor_driver: add missing kfree\n ACPI, APEI: Fix incorrect APEI register bit width check and usage\n Update documentation for parameter *notrigger* in einj.txt\n ACPI, APEI, EINJ, new parameter to control trigger action\n ACPI, APEI, EINJ, limit the range of einj_param\n ACPI, APEI, Fix ERST header length check\n cpuidle: power_usage should be declared signed integer\n ...\n" }, { "commit": "d3c7de52096a201ac188adb95b8351b90cab11f1", "tree": "15eb9cf6bd91cab4c8312c277eaf034989db34f1", "parents": [ "86dfe446c2c10ab2ab437a1b0a3f29e63cb350cb" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Mar 29 23:34:29 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Mar 30 15:44:48 2012 -0700" }, "message": "ARM: clps711x: fix missing include file\n\nlinux/bug.h is needed due to an ARRAY_SIZE being used:\n\narch/arm/mach-clps711x/edb7211-mm.c: In function \u0027edb7211_map_io\u0027:\narch/arm/mach-clps711x/edb7211-mm.c:79:9: error: implicit declaration of function \u0027BUILD_BUG_ON_ZERO\u0027\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "86dfe446c2c10ab2ab437a1b0a3f29e63cb350cb", "tree": "7a8baaa9bb53d669ce5d62011550e3c052cde7f0", "parents": [ "f00e9b11863abdb837e555a2b1e3417e8b5d80dd" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Mar 29 23:22:44 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Mar 30 15:44:40 2012 -0700" }, "message": "ARM: fix builds due to missing \u003casm/system_misc.h\u003e includes\n\nThis does a sweeping change fixing up all the missing system_misc.h and\nsystem_info.h includes from the system.h split-up change. These were the\nones I came across when building all defconfigs in arch/arm/configs, there\nmight be more but they lack adequate build coverage to be easily caught.\n\nI\u0027m expecting to get a lot of these piecemeal by each maintainer, so we\nmight just as well do one sweeping change to get them all at once.\n\nCc: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Sascha Hauer \u003ckernel@pengutronix.de\u003e\nCc: Imre Kaloz \u003ckaloz@openwrt.org\u003e\nCc: Krzysztof Halasa \u003ckhc@pm.waw.pl\u003e\nCc: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nCc: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\nCc: Wan ZongShun \u003cmcuos.com@gmail.com\u003e\nAcked-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "2f7fa1be66dce77608330c5eb918d6360b5525f2", "tree": "05dbfe86d2b192389da11686fa380e7ae45be225", "parents": [ "1338631433d8de7cf85b7e8fcf1a389ad89e7a8f", "f182394033d639679264d61e6dca62761e659ff7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 23:17:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 23:17:44 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\nPull 2nd round of input updates from Dmitry Torokhov:\n - update to Wacom driver to support wireless devices\n - update to Sentelci touchpad driver to support newer hardware\n - update to gpio-keys driver to support \"interrupt-only\" keys\n - fixups to earlier commits\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: wacom - check for allocation failure in probe()\n Input: tegra-kbc - allocate pdata before using it\n Input: amijoy - add missing platform check\n Input: wacom - wireless battery status\n Input: wacom - create inputs when wireless connect\n Input: wacom - wireless monitor framework\n Input: wacom - isolate input registration\n Input: sentelic - improve packet debugging information\n Input: sentelic - minor code cleanup\n Input: sentelic - enabling absolute coordinates output for newer hardware\n Input: sentelic - refactor code for upcoming new hardware support\n Input: gpio_keys - add support for interrupt only keys\n Input: gpio_keys - consolidate key destructor code\n Input: revert \"gpio_keys - switch to using threaded IRQs\"\n Input: gpio_keys - constify platform data\n Input: spear-keyboard - remove kbd_set_plat_data()\n" }, { "commit": "4bde23f8751f388867766b0a62ed1ef8b7e01561", "tree": "9ad3d165483fda3349c2bf0195406eebaa7af5ce", "parents": [ "e152c38abaa92352679c9b53c4cce533c03997c6", "f00e9b11863abdb837e555a2b1e3417e8b5d80dd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 21:30:28 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 21:30:28 2012 -0700" }, "message": "Merge tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc fixes from Olof Johansson:\n \"This is a first pass of some of the merge window fallout for ARM\n platforms.\n\n Nothing controversial:\n - A system.h fallout fix for OMAP\n - PXA fixes for breakage caused by the regulator struct changes\n - GPIO fixes for OMAP to properly deal with dynamic IRQ allocation\n - A mismerge in our arm-soc tree of an lpc32xx change for networking\n - A fix for USB setup on tegra\n - An undo of __init annotation of display mux setup on OMAP that\u0027s\n needed at runtime\"\n\n* tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: pxa: fix build issue on stargate2\n ARM: pxa: fix build issue on cm-x300\n ARM: pxa: fix build failure for regulator consumer in em-x270.c\n ARM: LPC32xx: clock.c: Fix lpc-eth clock reference\n ARM: OMAP: pm: fix compilation break\n ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition\n drivers: input: Fix OMAP_GPIO_IRQ with gpio_to_irq() in ams_delta_serio_exit()\n ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq()\n ARM: pxa: fix regulator related build fail in magician_defconfig\n ARM: tegra: Fix device tree AUXDATA for USB/EHCI\n ARM: OMAP2+: Remove __init from DSI mux functions\n" }, { "commit": "f00e9b11863abdb837e555a2b1e3417e8b5d80dd", "tree": "e7bf466d8c49d8bd86b3edb906a7ca5cd592bcf5", "parents": [ "a92e7023caf6c3a58b047a4c3fc9e4981b327bb8", "5616131daff6047d293b25a05cff7b1890efd6a3" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Mar 29 20:36:18 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Mar 29 20:36:18 2012 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://github.com/hzhuang1/linux into fixes\n\n* \u0027fixes\u0027 of git://github.com/hzhuang1/linux:\n ARM: pxa: fix build issue on stargate2\n ARM: pxa: fix build issue on cm-x300\n ARM: pxa: fix build failure for regulator consumer in em-x270.c\n ARM: pxa: fix regulator related build fail in magician_defconfig\n" }, { "commit": "a591afc01d9e48affbacb365558a31e53c85af45", "tree": "9bb91f4eb94ec69fc4706c4944788ec5f3586063", "parents": [ "820d41cf0cd0e94a5661e093821e2e5c6b36a9d8", "31796ac4e8f0e88f5c10f1ad6dab8f19bebe44a4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 18:12:23 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 18:12:23 2012 -0700" }, "message": "Merge branch \u0027x86-x32-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x32 support for x86-64 from Ingo Molnar:\n \"This tree introduces the X32 binary format and execution mode for x86:\n 32-bit data space binaries using 64-bit instructions and 64-bit kernel\n syscalls.\n\n This allows applications whose working set fits into a 32 bits address\n space to make use of 64-bit instructions while using a 32-bit address\n space with shorter pointers, more compressed data structures, etc.\"\n\nFix up trivial context conflicts in arch/x86/{Kconfig,vdso/vma.c}\n\n* \u0027x86-x32-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (71 commits)\n x32: Fix alignment fail in struct compat_siginfo\n x32: Fix stupid ia32/x32 inversion in the siginfo format\n x32: Add ptrace for x32\n x32: Switch to a 64-bit clock_t\n x32: Provide separate is_ia32_task() and is_x32_task() predicates\n x86, mtrr: Use explicit sizing and padding for the 64-bit ioctls\n x86/x32: Fix the binutils auto-detect\n x32: Warn and disable rather than error if binutils too old\n x32: Only clear TIF_X32 flag once\n x32: Make sure TS_COMPAT is cleared for x32 tasks\n fs: Remove missed -\u003efds_bits from cessation use of fd_set structs internally\n fs: Fix close_on_exec pointer in alloc_fdtable\n x32: Drop non-__vdso weak symbols from the x32 VDSO\n x32: Fix coding style violations in the x32 VDSO code\n x32: Add x32 VDSO support\n x32: Allow x32 to be configured\n x32: If configured, add x32 system calls to system call tables\n x32: Handle process creation\n x32: Signal-related system calls\n x86: Add #ifdef CONFIG_COMPAT to \u003casm/sys_ia32.h\u003e\n ...\n" }, { "commit": "5616131daff6047d293b25a05cff7b1890efd6a3", "tree": "270fdfed5331255fbdfd177434835b4f6b1d663d", "parents": [ "e9478587c4fb43059f45acf25ee0959710280bdf" ], "author": { "name": "Haojian Zhuang", "email": "haojian.zhuang@gmail.com", "time": "Fri Mar 30 09:00:50 2012 +0800" }, "committer": { "name": "Haojian Zhuang", "email": "haojian.zhuang@gmail.com", "time": "Fri Mar 30 09:03:20 2012 +0800" }, "message": "ARM: pxa: fix build issue on stargate2\n\narch/arm/mach-pxa/stargate2.c:155:3: error: unknown field ‘dev’\nspecified in initializer\narch/arm/mach-pxa/stargate2.c:155:3: warning: initialization from\nincompatible pointer type [enabled by default]\narch/arm/mach-pxa/stargate2.c:155:3: warning: (near initialization for\n‘stargate2_sensor_3_con[0].dev_name’) [enabled by default]\nmake[1]: *** [arch/arm/mach-pxa/stargate2.o] Error 1\nmake: *** [arch/arm/mach-pxa] Error 2\n\nIt\u0027s caused by \u0027dev\u0027 field removed from struct\nregulator_consumer_supply.\n\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\n" }, { "commit": "e9478587c4fb43059f45acf25ee0959710280bdf", "tree": "f84e2160d76f0a4e90eeab47a6f2e146f38d465f", "parents": [ "804d2312309aaf8b80a09038cf12333f0cb4f32c" ], "author": { "name": "Haojian Zhuang", "email": "haojian.zhuang@gmail.com", "time": "Fri Mar 30 08:53:27 2012 +0800" }, "committer": { "name": "Haojian Zhuang", "email": "haojian.zhuang@gmail.com", "time": "Fri Mar 30 09:03:06 2012 +0800" }, "message": "ARM: pxa: fix build issue on cm-x300\n\narch/arm/mach-pxa/cm-x300.c:716:3: error: unknown field ‘dev’ specified\nin initializer\nmake[1]: *** [arch/arm/mach-pxa/cm-x300.o] Error 1\nmake: *** [arch/arm/mach-pxa] Error 2\n\nIt\u0027s caused by \u0027dev\u0027 field removed from struct\nregulator_consumer_supply.\n\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\n" }, { "commit": "820d41cf0cd0e94a5661e093821e2e5c6b36a9d8", "tree": "4d03046048dc52a8fa539c7e7b846e02738d8ca5", "parents": [ "6268b325c3066234e7bddb99d2b98bcedb0c0033", "88b48684fe2d4f6207223423227c80d5408bccaf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 18:02:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 18:02:10 2012 -0700" }, "message": "Merge tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: cleanups of io includes\" from Olof Johansson:\n \"Rob Herring has done a sweeping change cleaning up all of the\n mach/io.h includes, moving some of the oft-repeated macros to a common\n location and removing a bunch of boiler plate. This is another step\n closer to a common zImage for multiple platforms.\"\n\nFix up various fairly trivial conflicts (\u003cmach/io.h\u003e removal vs changes\naround it, tegra localtimer.o is *still* gone, yadda-yadda).\n\n* tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)\n ARM: tegra: Include assembler.h in sleep.S to fix build break\n ARM: pxa: use common IOMEM definition\n ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol\n ARM: __io abuse cleanup\n ARM: create a common IOMEM definition\n ARM: iop13xx: fix missing declaration of iop13xx_init_early\n ARM: fix ioremap/iounmap for !CONFIG_MMU\n ARM: kill off __mem_pci\n ARM: remove bunch of now unused mach/io.h files\n ARM: make mach/io.h include optional\n ARM: clps711x: remove unneeded include of mach/io.h\n ARM: dove: add explicit include of dove.h to addr-map.c\n ARM: at91: add explicit include of hardware.h to uncompressor\n ARM: ep93xx: clean-up mach/io.h\n ARM: tegra: clean-up mach/io.h\n ARM: orion5x: clean-up mach/io.h\n ARM: davinci: remove unneeded mach/io.h include\n [media] davinci: remove includes of mach/io.h\n ARM: OMAP: Remove remaining includes for mach/io.h\n ARM: msm: clean-up mach/io.h\n ...\n" }, { "commit": "804d2312309aaf8b80a09038cf12333f0cb4f32c", "tree": "766ee9748beb5c1ef153823a1f2beba7ba40753c", "parents": [ "3a5691326ed3d6a276b4a8663a9190bf73f5de2b" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri Mar 30 08:41:02 2012 +0800" }, "committer": { "name": "Haojian Zhuang", "email": "haojian.zhuang@gmail.com", "time": "Fri Mar 30 08:41:18 2012 +0800" }, "message": "ARM: pxa: fix build failure for regulator consumer in em-x270.c\n\nCommit 737f360d5bef5e01c6cfa755dca0b449a154c1e0\n\n\"regulator: Remove support for supplies specified by struct device\"\n\ncaused this file to break, since it was still relying on the\ndevice field to be present. Map it onto dev_name appropriately\n\nSince there are two consumers with the name \"reg-userspace-consumer\",\nwe have to supply the ID as a suffix in the REGULATOR_CONSUMER calls.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nCC: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\n" }, { "commit": "12679a2d7e3bfbdc7586e3e86d1ca90c46659363", "tree": "d9c00f2e599d1c3e04a349229a6a19906d01f99e", "parents": [ "1c036588772d01655d851f75dffc27c971e072e2", "b0df89868006517417251e02cc4ce5d4b0165885" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 16:53:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 16:53:48 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull more ARM updates from Russell King.\n\nThis got a fair number of conflicts with the \u003casm/system.h\u003e split, but\nalso with some other sparse-irq and header file include cleanups. They\nall looked pretty trivial, though.\n\n* \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm: (59 commits)\n ARM: fix Kconfig warning for HAVE_BPF_JIT\n ARM: 7361/1: provide XIP_VIRT_ADDR for no-MMU builds\n ARM: 7349/1: integrator: convert to sparse irqs\n ARM: 7259/3: net: JIT compiler for packet filters\n ARM: 7334/1: add jump label support\n ARM: 7333/2: jump label: detect %c support for ARM\n ARM: 7338/1: add support for early console output via semihosting\n ARM: use set_current_blocked() and block_sigmask()\n ARM: exec: remove redundant set_fs(USER_DS)\n ARM: 7332/1: extract out code patch function from kprobes\n ARM: 7331/1: extract out insn generation code from ftrace\n ARM: 7330/1: ftrace: use canonical Thumb-2 wide instruction format\n ARM: 7351/1: ftrace: remove useless memory checks\n ARM: 7316/1: kexec: EOI active and mask all interrupts in kexec crash path\n ARM: Versatile Express: add NO_IOPORT\n ARM: get rid of asm/irq.h in asm/prom.h\n ARM: 7319/1: Print debug info for SIGBUS in user faults\n ARM: 7318/1: gic: refactor irq_start assignment\n ARM: 7317/1: irq: avoid NULL check in for_each_irq_desc loop\n ARM: 7315/1: perf: add support for the Cortex-A7 PMU\n ...\n" }, { "commit": "ef08e78268423fc4d7fbc3e54bd9a67fc8da7cc5", "tree": "d0561d3ef89c9cd277a38168e33850666cbd33c4", "parents": [ "71db34fc4330f7c784397acb9f1e6ee7f7b32eb2", "5b2e02e401deb44e7f5befe19404d8b2688efea4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 15:34:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 15:34:57 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\nPull slave-dmaengine update from Vinod Koul:\n \"This includes the cookie cleanup by Russell, the addition of context\n parameter for dmaengine APIs, more arm dmaengine driver cleanup by\n moving code to dmaengine, this time for imx by Javier and pl330 by\n Boojin along with the usual driver fixes.\"\n\nFix up some fairly trivial conflicts with various other cleanups.\n\n* \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma: (67 commits)\n dmaengine: imx: fix the build failure on x86_64\n dmaengine: i.MX: Fix merge of cookie branch.\n dmaengine: i.MX: Add support for interleaved transfers.\n dmaengine: imx-dma: use \u0027dev_dbg\u0027 and \u0027dev_warn\u0027 for messages.\n dmaengine: imx-dma: remove \u0027imx_dmav1_baseaddr\u0027 and \u0027dma_clk\u0027.\n dmaengine: imx-dma: remove unused arg of imxdma_sg_next.\n dmaengine: imx-dma: remove internal structure.\n dmaengine: imx-dma: remove \u0027resbytes\u0027 field of \u0027internal\u0027 structure.\n dmaengine: imx-dma: remove \u0027in_use\u0027 field of \u0027internal\u0027 structure.\n dmaengine: imx-dma: remove sg member from internal structure.\n dmaengine: imx-dma: remove \u0027imxdma_setup_sg_hw\u0027 function.\n dmaengine: imx-dma: remove \u0027imxdma_config_channel_hw\u0027 function.\n dmaengine: imx-dma: remove \u0027imxdma_setup_mem2mem_hw\u0027 function.\n dmaengine: imx-dma: remove dma_mode member of internal structure.\n dmaengine: imx-dma: remove data member from internal structure.\n dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c\n dmaengine: at_hdmac: add slave config operation\n dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic\n dmaengine/dma_slave: introduce inline wrappers\n dma: imx-sdma: Treat firmware messages as warnings instead of erros\n ...\n" }, { "commit": "a92e7023caf6c3a58b047a4c3fc9e4981b327bb8", "tree": "44eb26c76f9c566295476c4c5cae0fa96a19d2f7", "parents": [ "a99ab88815aec12bd257e121dee06003e2401a68", "2533c2cfbff8f0ee53b8448d6362b54c272125aa" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Mar 29 12:25:23 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Mar 29 12:25:23 2012 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes\n\nFrom Tony Lindgren:\n\"This contains the updated gpio_to_irq patches from Tarun, and a trivial\nbuild fix from Govindraj to #include \u003casm/system_misc.h\u003e in pm.c.\nThe DSI mux patch is the same.\"\n\n* \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:\n ARM: OMAP: pm: fix compilation break\n ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition\n drivers: input: Fix OMAP_GPIO_IRQ with gpio_to_irq() in ams_delta_serio_exit()\n ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq()\n ARM: OMAP2+: Remove __init from DSI mux functions\n" }, { "commit": "a99ab88815aec12bd257e121dee06003e2401a68", "tree": "89535cf82f33e2041af34433b8f2aa7f704ffa36", "parents": [ "714daf73d0889c62e90abf4510e4fab65b4668e8", "8c3ec84102d171a24f050a086bfc546e9de93f9f" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Mar 29 10:59:20 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Mar 29 11:00:56 2012 -0700" }, "message": "Merge branch \u0027for-3.4/fixes-for-rc1-and-v3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into fixes\n\n* \u0027for-3.4/fixes-for-rc1-and-v3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:\n ARM: tegra: Fix device tree AUXDATA for USB/EHCI\n" }, { "commit": "714daf73d0889c62e90abf4510e4fab65b4668e8", "tree": "0ae303523768d933218ada96ecceb57c3d1fd74b", "parents": [ "b5174fa3a7f4f8f150bfa3b917c92608953dfa0f" ], "author": { "name": "Roland Stigge", "email": "stigge@antcom.de", "time": "Thu Mar 29 00:49:56 2012 +0200" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Mar 29 10:58:14 2012 -0700" }, "message": "ARM: LPC32xx: clock.c: Fix lpc-eth clock reference\n\nDuring a complex merge for v3.4, one line of the commit\nc20b909be9ba27173294a52d08cab293ec030a2c (\"ARM: LPC32xx: Ethernet support\") was\nreverted wrongly (\"lpc-eth.0\" -\u003e \"lpc-net.0\") while the other conflicts were\nmerged correctly. This patch re-applies the clock name \"lpc-eth.0\".\n\nSigned-off-by: Roland Stigge \u003cstigge@antcom.de\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "2533c2cfbff8f0ee53b8448d6362b54c272125aa", "tree": "e254f804f2da2f79e66ea71a1e534574ae9da2ac", "parents": [ "a2cb960f171228e17a28ff734289be60b75417c7", "21235bdb8aa5e8320b08f79525a45185a52b07df" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Mar 29 10:16:04 2012 -0700" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Mar 29 10:16:04 2012 -0700" }, "message": "Merge branch \u0027fixes-gpio-to-irq\u0027 into fixes\n\nConflicts:\n\tarch/arm/mach-omap1/board-htcherald.c\n\tarch/arm/mach-omap2/board-rx51-peripherals.c\n\tarch/arm/plat-omap/include/plat/gpio.h\n\tdrivers/input/serio/ams_delta_serio.c\n" }, { "commit": "a2cb960f171228e17a28ff734289be60b75417c7", "tree": "84bbe5acf032d197e72578486042158ac422ceb9", "parents": [ "335aece5c502672fd0eb26ede5427ab14f4f7948", "e8a30b251bcf1999bea1726b3fc7ae186f551a6b" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Mar 29 10:05:37 2012 -0700" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Mar 29 10:05:37 2012 -0700" }, "message": "Merge branch \u0027fix-dss-mux\u0027 into fixes\n" }, { "commit": "335aece5c502672fd0eb26ede5427ab14f4f7948", "tree": "84004d6c4450809d7f88be35355345060e17d09e", "parents": [ "0195c00244dc2e9f522475868fa278c473ba7339" ], "author": { "name": "Govindraj.R", "email": "govindraj.raja@ti.com", "time": "Thu Mar 29 09:30:28 2012 -0700" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Mar 29 10:05:02 2012 -0700" }, "message": "ARM: OMAP: pm: fix compilation break\n\nFix the compilation break observed on latest mainline caused\nby 9f97da78 (Disintegrate asm/system.h for ARM):\n\narch/arm/mach-omap1/pm.c: In function \u0027omap_pm_prepare\u0027:\narch/arm/mach-omap1/pm.c:587: error: implicit declaration of function \u0027disable_hlt\u0027\narch/arm/mach-omap1/pm.c: In function \u0027omap_pm_finish\u0027:\narch/arm/mach-omap1/pm.c:624: error: implicit declaration of function \u0027enable_hlt\u0027\narch/arm/mach-omap1/pm.c: In function \u0027omap_pm_init\u0027:\narch/arm/mach-omap1/pm.c:681: error: \u0027arm_pm_idle\u0027 undeclared (first use in this function)\n...\n\narch/arm/mach-omap2/pm.c: In function \u0027omap_pm_begin\u0027:\narch/arm/mach-omap2/pm.c:239: error: implicit declaration of function \u0027disable_hlt\u0027\narch/arm/mach-omap2/pm.c: In function \u0027omap_pm_end\u0027:\narch/arm/mach-omap2/pm.c:247: error: implicit declaration of function \u0027enable_hlt\u0027\n\nSigned-off-by: Govindraj.R \u003cgovindraj.raja@ti.com\u003e\nAcked-by: Kevin Hilman \u003ckhilman@ti.com\u003e\n[tony@atomide.com: updated to fix omap1 too]\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "21235bdb8aa5e8320b08f79525a45185a52b07df", "tree": "6a454ac5222017da4a5e9b74b62b9f09abc88885", "parents": [ "e6801afb6bef30c47d4933191f9140e5a475914e" ], "author": { "name": "Tarun Kanti DebBarma", "email": "tarun.kanti@ti.com", "time": "Thu Mar 29 08:41:02 2012 -0700" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Mar 29 08:41:02 2012 -0700" }, "message": "ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition\n\nSince all references to OMAP_GPIO_IRQ macro are replaced now\nwith gpio_to_irq(), this can be removed altogether.\n\nSigned-off-by: Tarun Kanti DebBarma \u003ctarun.kanti@ti.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "46a0a5402f7b477bc98bf26596c2234f2ddbf473", "tree": "a42f80deeecb3d59b2fa771c1ab031c68307f7b2", "parents": [ "a26d3c4fcd4bb875ae5adc32f27fab7a478bb00d" ], "author": { "name": "Tarun Kanti DebBarma", "email": "tarun.kanti@ti.com", "time": "Thu Mar 29 08:41:01 2012 -0700" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Thu Mar 29 08:41:01 2012 -0700" }, "message": "ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq()\n\nThe following commits change gpio-omap to use dynamic\nIRQ allocation:\n\n25db711 gpio/omap: Fix IRQ handling for SPARSE_IRQ\n384ebe1 gpio/omap: Add DT support to GPIO driver\n\nWith dynamic allocation of IRQ the usage of OMAP_GPIO_IRQ\nis no longer valid. We must be using gpio_to_irq() instead.\n\nSigned-off-by: Tarun Kanti DebBarma \u003ctarun.kanti@ti.com\u003e\n[tony@atomide.com: updated comments]\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "0b5f9c005def154f9c21f9be0223b65b50d54368", "tree": "bbee9b3e549acc5886d1022c2aad46d5abfdd22e", "parents": [ "b5174fa3a7f4f8f150bfa3b917c92608953dfa0f" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Mar 29 15:38:30 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Mar 29 15:38:30 2012 +1030" }, "message": "remove references to cpu_*_map in arch/\n\nThis has been obsolescent for a while; time for the final push.\n\nIn adjacent context, replaced old cpus_* with cpumask_*.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e (arch/sparc)\nAcked-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e (arch/tile)\nCc: user-mode-linux-devel@lists.sourceforge.net\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: linux-arm-kernel@lists.infradead.org\nCc: Richard Kuo \u003crkuo@codeaurora.org\u003e\nCc: linux-hexagon@vger.kernel.org\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: linux-mips@linux-mips.org\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nCc: Helge Deller \u003cdeller@gmx.de\u003e\nCc: sparclinux@vger.kernel.org\n" }, { "commit": "b5174fa3a7f4f8f150bfa3b917c92608953dfa0f", "tree": "5efd32dd52fe55f760094e78f18acd3ff869751d", "parents": [ "afb9bd704c7116076879352a2cc2c43aa12c1e14", "135111cc5595c6a24dd826d503e2d2bae92da1c4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 20:59:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 20:59:45 2012 -0700" }, "message": "Merge tag \u0027mmc-merge-for-3.4-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\nPull MMC updates from Chris Ball:\n\nCore:\n * Support for MMC 4.5 Data Tag feature -- we tag REQ_META, so devices\n that support Data Tag will provide increased throughput for metadata.\n * Faster detection of card removal on I/O errors.\n\nDrivers:\n * dw_mmc now supports eMMC Power Off Notify, has PCI support, and\n implements pre_req and post_req for asynchronous requests.\n * omap_hsmmc now supports device tree.\n * esdhc now has power management support.\n * sdhci-tegra now supports Tegra30 devices.\n * sdhci-spear now supports hibernation.\n * tmio_mmc now supports using a GPIO for card detection.\n * Intel PCH now supports 8-bit bus transfers.\n\n* tag \u0027mmc-merge-for-3.4-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (53 commits)\n mmc: sh_mmcif: simplify bitmask macros\n mmc: sh_mobile_sdhi: support modular mmc-core with non-standard hotplug\n mmc: sh_mobile_sdhi: add a callback for board specific init code\n mmc: tmio: cosmetic: prettify the tmio_mmc_set_ios() function\n mmc: sh_mobile_sdhi: do not manage PM clocks manually\n mmc: tmio_mmc: remove unused sdio_irq_enabled flag\n mmc: tmio_mmc: power status flag doesn\u0027t have to be exposed in platform data\n mmc: sh_mobile_sdhi: pass card hotplug GPIO number to TMIO MMC\n mmc: tmio_mmc: support the generic MMC GPIO card hotplug helper\n mmc: tmio: calculate the native hotplug condition only once\n mmc: simplify mmc_cd_gpio_request() by removing two parameters\n mmc: sdhci-pci: allow 8-bit bus width for Intel PCH\n mmc: sdhci: check interrupt flags in ISR again\n mmc: sdhci-pci: Add MSI support\n mmc: core: warn when card doesn\u0027t support HPI\n mmc: davinci: Poll status for small size transfers\n mmc: davinci: Eliminate spurious interrupts\n mmc: omap_hsmmc: Avoid a regulator voltage change with dt\n mmc: omap_hsmmc: Convert hsmmc driver to use device tree\n mmc: sdhci-pci: add SDHCI_QUIRK2_HOST_OFF_CARD_ON for Medfield SDIO\n ...\n" }, { "commit": "532bfc851a7475fb6a36c1e953aa395798a7cca7", "tree": "a7892e5a31330dd59f31959efbe9fda1803784fd", "parents": [ "0195c00244dc2e9f522475868fa278c473ba7339", "8da00edc1069f01c34510fa405dc15d96c090a3f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 17:19:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 17:19:28 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge third batch of patches from Andrew Morton:\n - Some MM stragglers\n - core SMP library cleanups (on_each_cpu_mask)\n - Some IPI optimisations\n - kexec\n - kdump\n - IPMI\n - the radix-tree iterator work\n - various other misc bits.\n\n \"That\u0027ll do for -rc1. I still have ~10 patches for 3.4, will send\n those along when they\u0027ve baked a little more.\"\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (35 commits)\n backlight: fix typo in tosa_lcd.c\n crc32: add help text for the algorithm select option\n mm: move hugepage test examples to tools/testing/selftests/vm\n mm: move slabinfo.c to tools/vm\n mm: move page-types.c from Documentation to tools/vm\n selftests/Makefile: make `run_tests\u0027 depend on `all\u0027\n selftests: launch individual selftests from the main Makefile\n radix-tree: use iterators in find_get_pages* functions\n radix-tree: rewrite gang lookup using iterator\n radix-tree: introduce bit-optimized iterator\n fs/proc/namespaces.c: prevent crash when ns_entries[] is empty\n nbd: rename the nbd_device variable from lo to nbd\n pidns: add reboot_pid_ns() to handle the reboot syscall\n sysctl: use bitmap library functions\n ipmi: use locks on watchdog timeout set on reboot\n ipmi: simplify locking\n ipmi: fix message handling during panics\n ipmi: use a tasklet for handling received messages\n ipmi: increase KCS timeouts\n ipmi: decrease the IPMI message transaction time in interrupt mode\n ...\n" }, { "commit": "3fc498f165304dc913f1d13b5ac9ab4c758ee7ab", "tree": "c8c23d2255151d593383e3e3e62900073c6afd78", "parents": [ "d15cab975459fb6092eeba1be72c13621337784f" ], "author": { "name": "Gilad Ben-Yossef", "email": "gilad@benyossef.com", "time": "Wed Mar 28 14:42:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 17:14:35 2012 -0700" }, "message": "smp: introduce a generic on_each_cpu_mask() function\n\nWe have lots of infrastructure in place to partition multi-core systems\nsuch that we have a group of CPUs that are dedicated to specific task:\ncgroups, scheduler and interrupt affinity, and cpuisol\u003d boot parameter.\nStill, kernel code will at times interrupt all CPUs in the system via IPIs\nfor various needs. These IPIs are useful and cannot be avoided\naltogether, but in certain cases it is possible to interrupt only specific\nCPUs that have useful work to do and not the entire system.\n\nThis patch set, inspired by discussions with Peter Zijlstra and Frederic\nWeisbecker when testing the nohz task patch set, is a first stab at trying\nto explore doing this by locating the places where such global IPI calls\nare being made and turning the global IPI into an IPI for a specific group\nof CPUs. The purpose of the patch set is to get feedback if this is the\nright way to go for dealing with this issue and indeed, if the issue is\neven worth dealing with at all. Based on the feedback from this patch set\nI plan to offer further patches that address similar issue in other code\npaths.\n\nThis patch creates an on_each_cpu_mask() and on_each_cpu_cond()\ninfrastructure API (the former derived from existing arch specific\nversions in Tile and Arm) and uses them to turn several global IPI\ninvocation to per CPU group invocations.\n\nCore kernel:\n\non_each_cpu_mask() calls a function on processors specified by cpumask,\nwhich may or may not include the local processor.\n\nYou must not call this function with disabled interrupts or from a\nhardware interrupt handler or from a bottom half handler.\n\narch/arm:\n\nNote that the generic version is a little different then the Arm one:\n\n1. It has the mask as first parameter\n2. It calls the function on the calling CPU with interrupts disabled,\n but this should be OK since the function is called on the other CPUs\n with interrupts disabled anyway.\n\narch/tile:\n\nThe API is the same as the tile private one, but the generic version\nalso calls the function on the with interrupts disabled in UP case\n\nThis is OK since the function is called on the other CPUs\nwith interrupts disabled.\n\nSigned-off-by: Gilad Ben-Yossef \u003cgilad@benyossef.com\u003e\nReviewed-by: Christoph Lameter \u003ccl@linux.com\u003e\nAcked-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Pekka Enberg \u003cpenberg@kernel.org\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Alexander Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Avi Kivity \u003cavi@redhat.com\u003e\nAcked-by: Michal Nazarewicz \u003cmina86@mina86.org\u003e\nCc: Kosaki Motohiro \u003ckosaki.motohiro@gmail.com\u003e\nCc: Milton Miller \u003cmiltonm@bga.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0195c00244dc2e9f522475868fa278c473ba7339", "tree": "f97ca98ae64ede2c33ad3de05ed7bbfa4f4495ed", "parents": [ "f21ce8f8447c8be8847dadcfdbcc76b0d7365fa5", "141124c02059eee9dbc5c86ea797b1ca888e77f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 15:58:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 15:58:21 2012 -0700" }, "message": "Merge tag \u0027split-asm_system_h-for-linus-20120328\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system\n\nPull \"Disintegrate and delete asm/system.h\" from David Howells:\n \"Here are a bunch of patches to disintegrate asm/system.h into a set of\n separate bits to relieve the problem of circular inclusion\n dependencies.\n\n I\u0027ve built all the working defconfigs from all the arches that I can\n and made sure that they don\u0027t break.\n\n The reason for these patches is that I recently encountered a circular\n dependency problem that came about when I produced some patches to\n optimise get_order() by rewriting it to use ilog2().\n\n This uses bitops - and on the SH arch asm/bitops.h drags in\n asm-generic/get_order.h by a circuituous route involving asm/system.h.\n\n The main difficulty seems to be asm/system.h. It holds a number of\n low level bits with no/few dependencies that are commonly used (eg.\n memory barriers) and a number of bits with more dependencies that\n aren\u0027t used in many places (eg. switch_to()).\n\n These patches break asm/system.h up into the following core pieces:\n\n (1) asm/barrier.h\n\n Move memory barriers here. This already done for MIPS and Alpha.\n\n (2) asm/switch_to.h\n\n Move switch_to() and related stuff here.\n\n (3) asm/exec.h\n\n Move arch_align_stack() here. Other process execution related bits\n could perhaps go here from asm/processor.h.\n\n (4) asm/cmpxchg.h\n\n Move xchg() and cmpxchg() here as they\u0027re full word atomic ops and\n frequently used by atomic_xchg() and atomic_cmpxchg().\n\n (5) asm/bug.h\n\n Move die() and related bits.\n\n (6) asm/auxvec.h\n\n Move AT_VECTOR_SIZE_ARCH here.\n\n Other arch headers are created as needed on a per-arch basis.\"\n\nFixed up some conflicts from other header file cleanups and moving code\naround that has happened in the meantime, so David\u0027s testing is somewhat\nweakened by that. We\u0027ll find out anything that got broken and fix it..\n\n* tag \u0027split-asm_system_h-for-linus-20120328\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system: (38 commits)\n Delete all instances of asm/system.h\n Remove all #inclusions of asm/system.h\n Add #includes needed to permit the removal of asm/system.h\n Move all declarations of free_initmem() to linux/mm.h\n Disintegrate asm/system.h for OpenRISC\n Split arch_align_stack() out from asm-generic/system.h\n Split the switch_to() wrapper out of asm-generic/system.h\n Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h\n Create asm-generic/barrier.h\n Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h\n Disintegrate asm/system.h for Xtensa\n Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt]\n Disintegrate asm/system.h for Tile\n Disintegrate asm/system.h for Sparc\n Disintegrate asm/system.h for SH\n Disintegrate asm/system.h for Score\n Disintegrate asm/system.h for S390\n Disintegrate asm/system.h for PowerPC\n Disintegrate asm/system.h for PA-RISC\n Disintegrate asm/system.h for MN10300\n ...\n" }, { "commit": "7bf97e1d5a94b6a71815771bb9452fc2c022c966", "tree": "f89082dbd33a51a79c9a9c0dddb29e2b11b8207e", "parents": [ "30304e5a79d424eb2c8707b3ff0e9b8bf6ab3e8f", "c77c8a6fd3d57b586ff5ecb5ab5b32ca4f54fe75" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 14:08:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 14:08:46 2012 -0700" }, "message": "Merge tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull GPIO changes for v3.4 from Grant Likely:\n \"Primarily gpio device driver changes with some minor side effects\n under arch/arm and arch/x86. Also includes a few core changes such as\n explicitly supporting (electrical) open source and open drain outputs\n and some help for parsing gpio devicetree properties.\"\n\nFix up context conflict due to Laxman Dewangan adding sleep control for\nthe tps65910 driver separately for gpio\u0027s and regulators.\n\n* tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6: (34 commits)\n gpio/ep93xx: Remove unused inline function and useless pr_err message\n gpio/sodaville: Mark broken due to core irqdomain migration\n gpio/omap: fix redundant decoding of gpio offset\n gpio/omap: fix incorrect update to context.irqenable1\n gpio/omap: fix incorrect context restore logic in omap_gpio_runtime_*\n gpio/omap: fix missing dataout context save in _set_gpio_dataout_reg\n gpio/omap: fix _set_gpio_irqenable implementation\n gpio/omap: fix trigger type to unsigned\n gpio/omap: fix wakeup_en register update in _set_gpio_wakeup()\n gpio: tegra: tegra_gpio_config shouldn\u0027t be __init\n gpio/davinci: fix enabling unbanked GPIO IRQs\n gpio/davinci: fix oops on unbanked gpio irq request\n gpio/omap: Fix section warning for omap_mpuio_alloc_gc()\n ARM: tegra: export tegra_gpio_{en,dis}able\n gpio/gpio-stmpe: Fix the value returned by _get_value routine\n Documentation/gpio.txt: Explain expected pinctrl interaction\n GPIO: LPC32xx: Add output reading to GPO P3\n GPIO: LPC32xx: Fix missing bit selection mask\n gpio/omap: fix wakeups on level-triggered GPIOs\n gpio/omap: Fix IRQ handling for SPARSE_IRQ\n ...\n" }, { "commit": "30304e5a79d424eb2c8707b3ff0e9b8bf6ab3e8f", "tree": "63968fb97b86861e31922515395feef8a110f884", "parents": [ "750f77064a290beb162352077b52c61b04bcae0e", "b8589e2a8065b8e7773742b60ae96b63b757bb69" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 13:56:35 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 13:56:35 2012 -0700" }, "message": "Merge tag \u0027mfd_3.4-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6\n\nPull MFD changes from Samuel Ortiz:\n - 4 new drivers: Freescale i.MX on-chip Anatop, Ricoh\u0027s RC5T583 and\n TI\u0027s TPS65090 and TPS65217.\n - New variants support (8420, 8520 ab9540), cleanups and bug fixes for\n the abx500 and db8500 ST-E chipsets.\n - Some minor fixes and update for the wm8994 from Mark.\n - The beginning of a long term TWL cleanup effort coming from the TI\n folks.\n - Various fixes and cleanups for the s5m, TPS659xx, pm860x, and MAX8997\n drivers.\n\nFix up trivial conflicts due to duplicate patches and header file\ncleanups (\u003clinux/device.h\u003e removal etc).\n\n* tag \u0027mfd_3.4-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (97 commits)\n gpio/twl: Add DT support to gpio-twl4030 driver\n gpio/twl: Allocate irq_desc dynamically for SPARSE_IRQ support\n mfd: Detach twl6040 from the pmic mfd driver\n mfd: Replace twl-* pr_ macros by the dev_ equivalent and do various cleanups\n mfd: Micro-optimization on twl4030 IRQ handler\n mfd: Make twl4030 SIH SPARSE_IRQ capable\n mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files\n mfd: Remove references already defineid in header file from twl-core\n mfd: Remove unneeded header from twl-core\n mfd: Make twl-core not depend on pdata-\u003eirq_base/end\n ARM: OMAP2+: board-omap4-*: Do not use anymore TWL6030_IRQ_BASE in board files\n mfd: Return twl6030_mmc_card_detect IRQ for board setup\n Revert \"mfd: Add platform data for MAX8997 haptic driver\"\n mfd: Add support for TPS65090\n mfd: Add some da9052-i2c section annotations\n mfd: Build rtc5t583 only if I2C config is selected to y.\n mfd: Add anatop mfd driver\n mfd: Fix compilation error in tps65910.h\n mfd: Add 8420 variant to db8500-prcmu\n mfd: Add 8520 PRCMU variant to db8500-prcmu\n ...\n" }, { "commit": "09893ee84591b0417a9186a7e7cf1503ccf99ac2", "tree": "da8b044ad157b82203df04ae48cb60f4737cc390", "parents": [ "4bb2d1009f671815870e8f78e826e4f9071392a7", "7d1206bc2859c6e9f46e35ae697c138e7d7858a7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 12:34:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 12:34:33 2012 -0700" }, "message": "Merge tag \u0027dt2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: More device tree support updates\" from Olof Johansson:\n \"This branch contains a number of updates for device tree support on\n several ARM platforms, in particular:\n\n * AT91 continues the device tree conversion adding support for a\n number of on-chip drivers and other functionality\n * ux500 adds probing of some of the core SoC blocks through device\n tree\n * Initial device tree support for ST SPEAr600 platforms\n * kirkwood continues the conversion to device-tree probing\"\n\nManually merge arch/arm/mach-ux500/Kconfig due to MACH_U8500 rename, and\ndrivers/usb/gadget/at91_udc.c due to header file include cleanups.\n\nAlso do an \"evil merge\" for the MACH_U8500 config option rename that the\naffected RMI4 touchscreen driver in staging. It\u0027s called MACH_MOP500\nnow, and it was missed during previous merges.\n\n* tag \u0027dt2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)\n ARM: SPEAr600: Add device-tree support to SPEAr600 boards\n ARM: ux500: Provide local timer support for Device Tree\n ARM: ux500: Enable PL022 SSP Controller in Device Tree\n ARM: ux500: Enable PL310 Level 2 Cache Controller in Device Tree\n ARM: ux500: Enable PL011 AMBA UART Controller for Device Tree\n ARM: ux500: Enable Cortex-A9 GIC (Generic Interrupt Controller) in Device Tree\n ARM: ux500: db8500: list most devices in the snowball device tree\n ARM: ux500: split dts file for snowball into generic part\n ARM: ux500: combine the board init functions for DT boot\n ARM: ux500: Initial Device Tree support for Snowball\n ARM: ux500: CONFIG: Enable Device Tree support for future endeavours\n ARM: kirkwood: use devicetree for rtc-mv\n ARM: kirkwood: rtc-mv devicetree bindings\n ARM: kirkwood: fdt: define uart[01] as disabled, enable uart0\n ARM: kirkwood: fdt: facilitate new boards during fdt migration\n ARM: kirkwood: fdt: absorb kirkwood_init()\n ARM: kirkwood: fdt: use mrvl ticker symbol\n ARM: orion: wdt: use resource vice direct access\n ARM: Kirkwood: Remove tclk from kirkwood_asoc_platform_data.\n ARM: orion: spi: remove enable_clock_fix which is not used\n ...\n" }, { "commit": "4bb2d1009f671815870e8f78e826e4f9071392a7", "tree": "4b9f4e3b349a67d47b11eff7fcebbf57a3c40a1e", "parents": [ "ff877c498eb2f9c4ea386270642e383bc867f63c", "83fe628e16d84efc8df2731bc403eae4e4f53801" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 12:24:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 12:24:40 2012 -0700" }, "message": "Merge tag \u0027soc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: More SoC support updates\" from Olof Johansson:\n \"This branch contains a handful of updates of SoC base code that had\n dependencies on other external trees that have now been merged:\n\n * Support for the new EXYNOS5250 SoC from Samsung\n * SMP and power domain support for Tegra3 from NVIDIA\n * ux500 updates for exporting SoC information through sysfs\"\n\nFix up trivial merge conflicts as per Olof.\n\n* tag \u0027soc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (30 commits)\n ARM: mach-shmobile: ap4evb: Reserve DMA memory for the frame buffer\n ARM: EXYNOS: Fix compilation error with mach-exynos4-dt board\n ARM: dts: add initial dts file for EXYNOS5250, SMDK5250\n ARM: EXYNOS: add support device tree enabled board file for EXYNOS5\n ARM: EXYNOS: add support ARCH_EXYNOS5 for EXYNOS5 SoCs\n ARM: EXYNOS: add support get_core_count() for EXYNOS5250\n ARM: EXYNOS: support EINT for EXYNOS4 and EXYNOS5\n ARM: EXYNOS: add interrupt definitions for EXYNOS5250\n ARM: EXYNOS: add support for EXYNOS5250 SoC\n ARM: EXYNOS: add support uart for EXYNOS4 and EXYNOS5\n ARM: EXYNOS: add initial setup-i2c0 for EXYNOS5\n ARM: EXYNOS: add clock part for EXYNOS5250 SoC\n ARM: EXYNOS: use exynos_init_uarts() instead of exynos4_init_uarts()\n ARM: EXYNOS: to declare static for mach-exynos/common.c\n ARM: EXYNOS: Add clkdev lookup entry for lcd clock\n ARM: dt: Explicitly configure all serial ports on Tegra Cardhu\n ARM: tegra: support for secondary cores on Tegra30\n ARM: tegra: support for Tegra30 CPU powerdomains\n ARM: tegra: add support for Tegra30 powerdomains\n ARM: tegra: export tegra_powergate_is_powered()\n ...\n" }, { "commit": "ff877c498eb2f9c4ea386270642e383bc867f63c", "tree": "ae37e2f57ac6e6d19d01b7380f77db2a1c6c5b14", "parents": [ "529b73fc0a9764050dcc597f4851728e8ff59165", "1f5b7dcfdad3840d4bce27ab0b3cc8f376b81544" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 12:17:06 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 12:17:06 2012 -0700" }, "message": "Merge tag \u0027drivers2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: More SoC driver updates\" from Olof Johansson:\n \"This branch contains a handful of driver updates, mostly to the\n LPC32xx platform but also for Samsung EXYNOS and Davinci.\n\n It had a few context conflicts against patches already merged through\n fixes-non-critical. We should have resolved this early during the\n development cycle by pulling them in as a dependency, instead I did it\n after the fact this time.\"\n\n* tag \u0027drivers2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n gpio/samsung: use ioremap() for EXYNOS4 GPIOlib\n gpio/samsung: add support GPIOlib for EXYNOS5250\n ARM: EXYNOS: add support GPIO for EXYNOS5250\n ARM: LPC32xx: Ethernet support\n ARM: LPC32xx: USB Support\n ARM: davinci: dm644x evm: add support for VPBE display\n ARM: davinci: dm644x: add support for v4l2 video display\n ARM: EXYNOS: Hook up JPEG PD to generic PD infrastructure\n ARM: EXYNOS: Hook up G2D PD to generic PD infrastructure\n arm: lpc32xx: phy3250: add rtc \u0026 touch device\n ARM: LPC32xx: clock.c: Clock registration fixes\n ARM: LPC32xx: clock.c: jiffies wrapping\n ARM: LPC32xx: clock.c: Missing header file\n ARM: LPC32XX: Remove broken non-static declaration\n ARM: LPC32xx: clock.c: Fix mutex lock issues\n ARM: LPC32xx: clock.c: warning fix\n ARM: LPC32xx: Added lpc32xx_defconfig\n" }, { "commit": "9f97da78bf018206fb623cd351d454af2f105fe0", "tree": "509971bf0d93f56d7ad182bdad3c89886f7ce675", "parents": [ "15d07dc9c59eae51219c40253bdf920f62bb10f2" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:01 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:01 2012 +0100" }, "message": "Disintegrate asm/system.h for ARM\n\nDisintegrate asm/system.h for ARM.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\ncc: Russell King \u003clinux@arm.linux.org.uk\u003e\ncc: linux-arm-kernel@lists.infradead.org\n" }, { "commit": "15d07dc9c59eae51219c40253bdf920f62bb10f2", "tree": "d830b428bf55526b1ab80139f6b4c24d4b38d627", "parents": [ "ec2212088c42ff7d1362629ec26dda4f3e8bdad3" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Mar 28 18:30:01 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:01 2012 +0100" }, "message": "ARM: move CP15 definitions to separate header file\n\nAvoid namespace conflicts with drivers over the CP15 definitions by\nmoving CP15 related prototypes and definitions to a private header\nfile.\n\nAcked-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nTested-by: Stephen Warren \u003cswarren@nvidia.com\u003e [Tegra]\nAcked-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nTested-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e [EP93xx]\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nAcked-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "3a5691326ed3d6a276b4a8663a9190bf73f5de2b", "tree": "fb8a0a1560c6ed53c3be9f2dd87f93ea13792666", "parents": [ "c16fa4f2ad19908a47c63d8fa436a1178438c7e7" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Mar 06 14:46:43 2012 -0500" }, "committer": { "name": "Haojian Zhuang", "email": "haojian.zhuang@gmail.com", "time": "Wed Mar 28 21:42:53 2012 +0800" }, "message": "ARM: pxa: fix regulator related build fail in magician_defconfig\n\ncommit 737f360d5bef5e01c6cfa755dca0b449a154c1e0 (linux-next)\n\n \"regulator: Remove support for supplies specified by struct device\"\n\ndeletes the field from the struct, but this platform was still trying\nto set those fields. Delete the assignments.\n\narch/arm/mach-pxa/magician.c:581: error: unknown field \u0027dev\u0027 specified in initializer\narch/arm/mach-pxa/magician.c:581: warning: initialization from incompatible pointer type\narch/arm/mach-pxa/magician.c:585: error: unknown field \u0027dev\u0027 specified in initializer\narch/arm/mach-pxa/magician.c:585: warning: initialization from incompatible pointer type\n\narch/arm/mach-pxa/hx4700.c:683: error: unknown field \u0027dev\u0027 specified in initializer\narch/arm/mach-pxa/hx4700.c:683: warning: initialization from incompatible pointer type\narch/arm/mach-pxa/hx4700.c:687: error: unknown field \u0027dev\u0027 specified in initializer\narch/arm/mach-pxa/hx4700.c:687: warning: initialization from incompatible pointer type\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\n" }, { "commit": "1f5b7dcfdad3840d4bce27ab0b3cc8f376b81544", "tree": "41ea81fdecc67d766789ea3e46b1a49773dc8ec4", "parents": [ "4788d72ce6c0d71220c06a242f935a056eccf424", "489e7bece7f6859a7df484a4dce08fa51fb0d876" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Mar 27 21:21:44 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Mar 27 21:24:03 2012 -0700" }, "message": "Merge branch \u0027fixes-non-critical\u0027 into next/drivers2\n\nfixes-non-critical has already been merged upstream, and there are a\nhandful of annoying context conflicts that it makes sense to resolve\nbefore sending up. Part of this is because there was parallel development\ngoing on between more urgent fixes and general driver fixups, it should\nsettle down once the lpc32xx platform reaches a more steady state.\n\nConflicts:\n\tarch/arm/mach-lpc32xx/clock.c\n\tarch/arm/mach-lpc32xx/common.h\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "9e4db1c3eed55c22328d8022c2c80adb3093833f", "tree": "9643545e6bd182f1d3e19942f590a6a1e3198320", "parents": [ "de8856d2c11f562c60ed9340a83db4a4f829a6e6", "aae528d9a8ad79d4b21b1b723abc9447fdb0d200" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 18:17:02 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 18:17:02 2012 -0700" }, "message": "Merge branch \u0027platforms\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull ARM platform updates from Russell King:\n \"This covers platform stuff for platforms I have a direct interest in\n (iow, I have the hardware). Essentially:\n - as we no longer support any other Acorn platforms other than RiscPC\n anymore, we can collect all that code into mach-rpc.\n - convert Acorn expansion card stuff to use IRQ allocation functions,\n and get rid of NO_IRQ from there.\n - cleanups to the ebsa110 platform to move some private stuff out of\n its header files.\n - large amount of SA11x0 updates:\n - conversion of private DMA implementation to DMA engine support\n (this actually gives us greater flexibility in drivers over the old\n API.)\n - re-worked ucb1x00 updates - convert to genirq, remove sa11x0\n dependencies, fix various minor issues\n - move platform specific sa11x0 framebuffer data into platform files\n in arch/arm instead of keeping this in the driver itself\n - update sa11x0 IrDA driver for DMA engine, and allow it to use DMA\n for SIR transmissions as well as FIR\n - rework sa1111 support for genirq, and irq allocation\n - fix sa1111 IRQ support so it works again\n - use sparse IRQ support\n\n After this, I have one more pull request remaining from my current\n set, which I think is going to be the most problematical as it\n generates 8 conflicts.\"\n\nFixed up the trivial conflict in arch/arm/mach-rpc/Makefile as per\nRussell.\n\n* \u0027platforms\u0027 of git://git.linaro.org/people/rmk/linux-arm: (125 commits)\n ARM: 7343/1: sa11x0: convert to sparse IRQ\n ARM: 7342/2: sa1100: prepare for sparse irq conversion\n ARM: 7341/1: input: prepare jornada720 keyboard and ts for sa11x0 sparse irq\n ARM: 7340/1: rtc: sa1100: include mach/irqs.h instead of asm/irq.h\n ARM: sa11x0: remove unused DMA controller definitions\n ARM: sa11x0: remove old SoC private DMA driver\n USB: sa1111: add hcd .reset method\n USB: sa1111: add OHCI shutdown methods\n USB: sa1111: reorganize ohci-sa1111.c\n USB: sa1111: get rid of nasty printk(KERN_DEBUG \"%s: ...\", __FILE__)\n USB: sa1111: sparse and checkpatch cleanups\n ARM: sa11x0: don\u0027t static map sa1111\n ARM: sa1111: use dev_err() rather than printk()\n ARM: sa1111: cleanup sub-device registration and unregistration\n ARM: sa1111: only setup DMA for DMA capable devices\n ARM: sa1111: register sa1111 devices with dmabounce in bus notifier\n ARM: sa1111: move USB interface register definitions to ohci-sa1111.c\n ARM: sa1111: move PCMCIA interface register definitions to sa1111_generic.c\n ARM: sa1111: move PS/2 interface register definitions to sa1111p2.c\n ARM: sa1111: delete unused physical GPIO register definitions\n ...\n" }, { "commit": "88b48684fe2d4f6207223423227c80d5408bccaf", "tree": "856e9ce9f7b1ec5d94569925ac78c38daef71317", "parents": [ "b521d929b330d665cb3a42b26eaaa5690dc9dad7", "7175f80ba38a6b056508c4eadaab829593abbf2b" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Mar 27 17:20:21 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Mar 27 17:25:45 2012 -0700" }, "message": "Merge branch \u0027for-3.4/fixes-for-io-cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup2\n\n* \u0027for-3.4/fixes-for-io-cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:\n ARM: tegra: Include assembler.h in sleep.S to fix build break\n" }, { "commit": "b521d929b330d665cb3a42b26eaaa5690dc9dad7", "tree": "7c1ddf1c06922c4728b6625fb10cf11de5a29387", "parents": [ "83b5938ce77bbbd9a04e5270ef2b3f17921bf0d4", "d405e4b07a15b9d24d504a459295cf00a618c10c" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Mar 27 17:19:15 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Mar 27 17:19:15 2012 -0700" }, "message": "Merge branch \u0027tegra/soc\u0027 into next/cleanup2\n\nConflicts:\n\tarch/arm/mach-tegra/Makefile\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "66f03c614c0902ccf7d6160459362a9352f33271", "tree": "b9a8864efe5aa7fc5c96cc5ccbeca41f5cd6f6a7", "parents": [ "34800598b2eebe061445216473b1e4c2ff5cba99", "cdc3df6f44f72c5924a16a47e1663c3fb0e57820" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:47:35 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:47:35 2012 -0700" }, "message": "Merge tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: device tree work\" from Arnd Bergmann:\n \"Most of these patches convert code from using static platform data to\n describing the hardware in the device tree. This is only the first\n half of the changes for v3.4 because a lot of patches for this topic\n came in the last week before the merge window.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\nFix up trivial conflicts in arch/arm/mach-vexpress/{Kconfig,core.h}\n\n* tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (86 commits)\n Document: devicetree: add OF documents for arch-mmp\n ARM: dts: append DTS file of pxa168\n ARM: mmp: append OF support on pxa168\n ARM: mmp: enable rtc clk in pxa168\n i2c: pxa: add OF support\n serial: pxa: add OF support\n arm/dts: mt_ventoux: very basic support for TeeJet Mt.Ventoux board\n ARM: OMAP2+: Remove extra ifdefs for board-generic\n ARM: OMAP2+: Fix build error when only ARCH_OMAP2/3 or 4 is selected\n ASoC: DT: Add digital microphone binding to PAZ00 board.\n ARM: dt: Add ARM PMU to tegra*.dtsi\n ARM: at91: at91sam9x5cm/dt: add leds support\n ARM: at91: usb_a9g20/dt: add gpio-keys support\n ARM: at91: at91sam9m10g45ek/dt: add gpio-keys support\n ARM: at91: at91sam9m10g45ek/dt: add leds support\n ARM: at91: usb_a9g20/dt: add leds support\n ARM: at91/pio: add new PIO3 features\n ARM: at91: add sam9_smc.o to at91sam9x5 build\n ARM: at91/tc/clocksource: Add 32 bit variant to Timer Counter\n ARM: at91/tc: add device tree support to atmel_tclib\n ...\n" }, { "commit": "34800598b2eebe061445216473b1e4c2ff5cba99", "tree": "a6d0eb6fe45d9480888d7ddb34840e172ed80e56", "parents": [ "46b407ca4a6149c8d27fcec1881d4f184bec7c77", "511f1cb6d426938fabf9c6d69ce4861b66ffd919" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:41:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:41:24 2012 -0700" }, "message": "Merge tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: driver specific updates\" from Arnd Bergmann:\n \"These are all specific to some driver. They are typically the\n platform side of a change in the drivers directory, such as adding a\n new driver or extending the interface to the platform. In cases where\n there is no maintainer for the driver, or the maintainer prefers to\n have the platform changes in the same branch as the driver changes,\n the patches to the drivers are included as well.\n\n A much smaller set of driver updates that depend on other branches\n getting merged first will be sent later.\n\n The new export of tegra_chip_uid conflicts with other changes in\n fuse.c. In rtc-sa1100.c, the global removal of IRQF_DISABLED\n conflicts with the cleanup of the interrupt handling of that driver.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\nFixed up aforementioned trivial conflicts.\n\n* tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)\n ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci\n mmc: sdhci-s3c: add platform data for the second capability\n ARM: SAMSUNG: support the second capability for samsung-soc\n ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC\n ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1\n ARM: EXYNOS: Enable MDMA driver\n regulator: Remove bq24022 regulator driver\n rtc: sa1100: add OF support\n pxa: magician/hx4700: Convert to gpio-regulator from bq24022\n ARM: OMAP3+: SmartReflex: fix error handling\n ARM: OMAP3+: SmartReflex: fix the use of debugfs_create_* API\n ARM: OMAP3+: SmartReflex: micro-optimization for sanity check\n ARM: OMAP3+: SmartReflex: misc cleanups\n ARM: OMAP3+: SmartReflex: move late_initcall() closer to its argument\n ARM: OMAP3+: SmartReflex: add missing platform_set_drvdata()\n ARM: OMAP3+: hwmod: add SmartReflex IRQs\n ARM: OMAP3+: SmartReflex: clear ERRCONFIG_VPBOUNDINTST only on a need\n ARM: OMAP3+: SmartReflex: Fix status masking in ERRCONFIG register\n ARM: OMAP3+: SmartReflex: Add a shutdown hook\n ARM: OMAP3+: SmartReflex Class3: disable errorgen before disable VP\n ...\n\nConflicts:\n\tarch/arm/mach-tegra/Makefile\n\tarch/arm/mach-tegra/fuse.c\n\tdrivers/rtc/rtc-sa1100.c\n" }, { "commit": "46b407ca4a6149c8d27fcec1881d4f184bec7c77", "tree": "a608dadec12b8dd74866721b3de32435f575e809", "parents": [ "1bfecd935849a45b6b47d9f011e1c278ff880512", "6458acb5a31926dcc1295410221493544d628cf7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:30:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:30:09 2012 -0700" }, "message": "Merge tag \u0027rpmsg\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"remoteproc/rpmsg: new subsystem\" from Arnd Bergmann:\n \"This new subsystem provides a common way to talk to secondary\n processors on an SoC, e.g. a DSP, GPU or service processor, using\n virtio as the transport. In the long run, it should replace a few\n dozen vendor specific ways to do the same thing, which all never made\n it into the upstream kernel. There is a broad agreement that rpmsg is\n the way to go here and several vendors have started working on\n replacing their own subsystems.\n\n Two branches each add one virtio protocol number. Fortunately the\n numbers were agreed upon in advance, so there are only context\n changes.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\nFixed up trivial protocol number conflict due to the mentioned additions\nnext to each other.\n\n* tag \u0027rpmsg\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (32 commits)\n remoteproc: cleanup resource table parsing paths\n remoteproc: remove the hardcoded vring alignment\n remoteproc/omap: remove the mbox_callback limitation\n remoteproc: remove the single rpmsg vdev limitation\n remoteproc: safer boot/shutdown order\n remoteproc: remoteproc_rpmsg -\u003e remoteproc_virtio\n remoteproc: resource table overhaul\n rpmsg: fix build warning when dma_addr_t is 64-bit\n rpmsg: fix published buffer length in rpmsg_recv_done\n rpmsg: validate incoming message length before propagating\n rpmsg: fix name service endpoint leak\n remoteproc/omap: two Kconfig fixes\n remoteproc: make sure we\u0027re parsing a 32bit firmware\n remoteproc: s/big switch/lookup table/\n remoteproc: bail out if firmware has different endianess\n remoteproc: don\u0027t use virtio\u0027s weak barriers\n rpmsg: rename virtqueue_add_buf_gfp to virtqueue_add_buf\n rpmsg: depend on EXPERIMENTAL\n remoteproc: depend on EXPERIMENTAL\n rpmsg: add Kconfig menu\n ...\n\nConflicts:\n\tinclude/linux/virtio_ids.h\n" }, { "commit": "1bfecd935849a45b6b47d9f011e1c278ff880512", "tree": "23c08a9c103c92e5a4a4cd3311823426c9d2bdf9", "parents": [ "281b05392fc2cb26209b4d85abaf4889ab1991f3", "a754a87ce8b17024358c1be8ee0232ef09a7055f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:27:28 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:27:28 2012 -0700" }, "message": "Merge tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: board specific updates\" from Arnd Bergmann/Olof Johansson:\n \"These changes are all specific to one board only. We\u0027re trying to\n keep the number of board files low, but generally board level updates\n are ok on platforms that are working on moving towards DT based\n probing, which will eventually lead to removing them.\n\n The board-ams-delta.c board file gets a conflict between the removal\n of ams_delta_config and the addition of a lot of other data. The\n Kconfig file has two changes in the same line, and in exynos, the\n power domain cleanup conflicts with the addition of the image sensor\n device.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n [olof: Amended a fix for a mismerge to board-omap4panda.c]\n Signed-off-by: Olof Johansson \u003colof@lixom.net\u003e\"\n\nFixed up some fairly trivial conflicts manually.\n\n* tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (82 commits)\n i.MX35-PDK: Add Camera support\n ARM : mx35: 3ds-board: add framebuffer device\n pxa/hx4700: Remove pcmcia platform_device structure\n ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35%\n ARM: pxa/hx4700: Remove unwanted request for GPIO105\n ARM: EXYNOS: support Exynos4210-bus Devfreq driver on Nuri board\n ARM: EXYNOS: Register JPEG on nuri\n ARM: EXYNOS: Register JPEG on universal_c210\n ARM: S5PV210: Enable JPEG on SMDKV210\n ARM: S5PV210: Add JPEG board definition\n ARM: EXYNOS: Enable JPEG on Origen\n ARM: EXYNOS: Enable JPEG on SMDKV310\n ARM: EXYNOS: Add __init attribute to universal_camera_init()\n ARM: EXYNOS: Add __init attribute to nuri_camera_init()\n ARM: S5PV210: Enable FIMC on SMDKC110\n ARM: S5PV210: Enable FIMC on SMDKV210\n ARM: S5PV210: Enable MFC on SMDKC110\n ARM: S5PV210: Enable MFC on SMDKV210\n ARM: EXYNOS: Enable G2D on SMDKV310\n ARM: tegra: update defconfig\n ...\n" }, { "commit": "281b05392fc2cb26209b4d85abaf4889ab1991f3", "tree": "bbf5000ce7bd739b1ca85e9918741e285d267c7c", "parents": [ "48d554418d3bfbba5e9dc1ebdf352f1b1f3ff4ee", "bde755679a3ba5af0d16231f8532e8373c5e2ecc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:14:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:14:44 2012 -0700" }, "message": "Merge tag \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: SoC specific updates\" from Arnd Bergmann:\n \"These changes are all specific to an soc family or the code for one\n soc. Lots of work for Tegra3 this time, but also a lot of other\n platforms. There will be another (smaller) set of soc patches later\n in the merge window for stuff that has dependencies on external trees\n or that was sent just before the merge window opened.\n\n The asoc tree added a few devices to the i.mx platform, which conflict\n with other devices added in the same place here.\n\n The tegra Makefile conflicts between a number of branches, mostly\n because of changes regarding localtimer.c, which was removed in the\n end.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\nFix up some trivial conflicts, including the mentioned Tegra Makefile.\n\n* tag \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (51 commits)\n ARM: EXYNOS: fix cycle count for periodic mode of clock event timers\n ARM: EXYNOS: add support JPEG\n ARM: EXYNOS: Add DMC1, allow PPMU access for DMC\n ARM: SAMSUNG: Correct MIPI-CSIS io memory resource definition\n ARM: SAMSUNG: fix __init attribute on regarding s3c_set_platdata()\n ARM: SAMSUNG: Add __init attribute to samsung_bl_set()\n ARM: S5PV210: Add usb otg phy control\n ARM: S3C64XX: Add usb otg phy control\n ARM: EXYNOS: Enable l2 configuration through device tree\n ARM: EXYNOS: remove useless code to save/restore L2\n ARM: EXYNOS: save L2 settings during bootup\n ARM: S5P: add L2 early resume code\n ARM: EXYNOS: Add support AFTR mode on EXYNOS4210\n ARM: mx35: Setup the AIPS registers\n ARM: mx5: Use common function for configuring AIPS\n ARM: mx3: Setup AIPS registers\n ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFI\n ARM: defconfig: imx_v6_v7: build in REGULATOR_FIXED_VOLTAGE\n ARM: imx: update imx_v6_v7_defconfig\n ARM: tegra: Demote EMC clock inconsistency BUG to WARN\n ...\n" }, { "commit": "48d554418d3bfbba5e9dc1ebdf352f1b1f3ff4ee", "tree": "696bdc0c1087e82c6493c852bca514bb0fcd7881", "parents": [ "d61b7a572b292e2be409e13b4b3adf475f18fb29", "2cbe23e3a432e3d09a849adb197c8fcc09e7391d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:06:17 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:06:17 2012 -0700" }, "message": "Merge tag \u0027timer\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: timer cleanup work\" from Arnd Bergmann:\n \"These are split out from the generic soc and driver updates because\n there was a lot of conflicting work by multiple people. Marc Zyngier\n worked on simplifying the \"localtimer\" interfaces, and some of the\n platforms are touching the same code as they move to device tree based\n booting.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\n* tag \u0027timer\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (61 commits)\n ARM: tegra: select USB_ULPI if USB is selected\n arm/tegra: pcie: fix return value of function\n ARM: ux500: fix compilation after local timer rework\n ARM: shmobile: remove additional __io() macro use\n ARM: local timers: make the runtime registration interface mandatory\n ARM: local timers: convert MSM to runtime registration interface\n ARM: local timers: convert exynos to runtime registration interface\n ARM: smp_twd: remove old local timer interface\n ARM: imx6q: convert to twd_local_timer_register() interface\n ARM: highbank: convert to twd_local_timer_register() interface\n ARM: ux500: convert to twd_local_timer_register() interface\n ARM: shmobile: convert to twd_local_timer_register() interface\n ARM: tegra: convert to twd_local_timer_register() interface\n ARM: plat-versatile: convert to twd_local_timer_register() interface\n ARM: OMAP4: convert to twd_local_timer_register() interface\n ARM: smp_twd: add device tree support\n ARM: smp_twd: add runtime registration support\n ARM: local timers: introduce a new registration interface\n ARM: smp_twd: make local_timer_stop a symbol instead of a #define\n ARM: mach-shmobile: default to no earlytimer\n ...\n" }, { "commit": "d61b7a572b292e2be409e13b4b3adf475f18fb29", "tree": "e9d30390860147136c05e66abf1edda1bc5b0562", "parents": [ "18d9946bc7e2252fe3c0f2f609ac383c627edefd", "f4e2467bad53023589cbff18dd1ab6e0aa3f004c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:03:32 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:03:32 2012 -0700" }, "message": "Merge tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: global cleanups\" from Arnd Bergmann:\n \"Quite a bit of code gets removed, and some stuff moved around, mostly\n the old samsung s3c24xx stuff. There should be no functional changes\n in this series otherwise. Some cleanups have dependencies on other\n arm-soc branches and will be sent in the second round.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\nFixed up trivial conflicts mainly due to #include\u0027s being changes on\nboth sides.\n\n* tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (121 commits)\n ep93xx: Remove unnecessary includes of ep93xx-regs.h\n ep93xx: Move EP93XX_SYSCON defines to SoC private header\n ep93xx: Move crunch code to mach-ep93xx directory\n ep93xx: Make syscon access functions private to SoC\n ep93xx: Configure GPIO ports in core code\n ep93xx: Move peripheral defines to local SoC header\n ep93xx: Convert the watchdog driver into a platform device.\n ep93xx: Use ioremap for backlight driver\n ep93xx: Move GPIO defines to gpio-ep93xx.h\n ep93xx: Don\u0027t use system controller defines in audio drivers\n ep93xx: Move PHYS_BASE defines to local SoC header file\n ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver\n ARM: EXYNOS: add clock registers for exynos4x12-cpufreq\n PM / devfreq: update the name of EXYNOS clock registers that were omitted\n PM / devfreq: update the name of EXYNOS clock register\n ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock\n ARM: EXYNOS: use static declaration on regarding clock\n ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs\n ARM: OMAP2+: Fix build error after merge\n ARM: S3C24XX: remove call to s3c24xx_setup_clocks\n ...\n" }, { "commit": "83b5938ce77bbbd9a04e5270ef2b3f17921bf0d4", "tree": "fa67d6dc9642d0e37ba164d667d9eea718027668", "parents": [ "fdd8397497b389090a008f32bc67ba4f067bca1b", "23019a733bb83c8499f192fb428b7e6e81c95a34" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Mar 27 16:00:49 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Mar 27 16:00:49 2012 -0700" }, "message": "Merge branch \u0027io-cleanup-for-3.4\u0027 of git://sources.calxeda.com/kernel/linux into next/cleanup2\n\n* \u0027io-cleanup-for-3.4\u0027 of git://sources.calxeda.com/kernel/linux:\n ARM: pxa: use common IOMEM definition\n ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol\n" }, { "commit": "c8bc5e39ac110acc88e41dd45d3f99956686f074", "tree": "1e4c21347e6d7b3cd7ac649436bbf3e2c1854229", "parents": [ "e22057c8599373e5caef0bc42bdb95d2a361ab0d", "489e7bece7f6859a7df484a4dce08fa51fb0d876" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 15:55:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 15:55:54 2012 -0700" }, "message": "Merge tag \u0027fixes-non-critical\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: Non-critical bug fixes\" from Ardn Bergmann:\n \"Simple bug fixes that were not considered important enough for\n inclusion into 3.3. One bug fix was originally intended for 3.3 but\n accidentally got missed, but is not marked stable because it should\n only get backported once later fixes also make it into v3.4.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\n* tag \u0027fixes-non-critical\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (66 commits)\n iomux-mx25.h slew rate adjusted for LCD __LD pins\n ARM: davinci: DA850: move da850_register_pm to .init.text\n ARM: davinci: cpufreq: fix compiler warning\n ARM: OMAP2+: Fix build for omap4 only builds with missing include of linux/bug.h\n ARM: OMAP2+: Fix section warnings for hsmmc_init_one\n ARM: OMAP2+: Fix build issues with missing include of linux/bug.h\n ARM: OMAP2+: gpmc-smsc911x: only register regulator for first instance\n ARM: OMAP3+: PM: VP: fix integer truncation error\n ARM: OMAP2+: PM: fix wakeupgen warning when hotplug disabled\n ARM: OMAP2+: PM: fix section mismatch with omap2_init_processor_devices()\n ARM: OMAP2: Fix section warning for n8x0 when CONFIG_MMC_OMAP is not set\n ARM: OMAP2+: Fix omap24xx_io_desc warning if SoC subtypes are not selected\n ARM: OMAP1: Fix section mismatch for omap1_init_early()\n ARM: OMAP1: Fix typo in lcd_dma.c\n ARM: OMAP: mailbox: trivial whitespace fix\n ARM: OMAP: Remove definition cpu_is_omap4430()\n ARM: OMAP2+: included some headers twice\n ARM: OMAP: clock.c: included linux/debugfs.h twice\n ARM: OMAP: don\u0027t build hwspinlock in vain\n ARM: OMAP2+: ads7846_init: put gpio_pendown into pdata if it\u0027s provided\n ...\n" }, { "commit": "a754a87ce8b17024358c1be8ee0232ef09a7055f", "tree": "c0d4adee8f490828ca04cd45d6fbb13596d88322", "parents": [ "70688056a8b4d610249716befe262a74fd123d90", "22f8d055350066b4a87de4adea8c5213cac54534" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Mar 24 11:33:59 2012 +0000" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Mar 27 15:18:19 2012 -0700" }, "message": "Merge tag \u0027asoc-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards\n\nThe asoc branch that was already merged into v3.4 contains some\nboard-level changes that conflict with patches we already have\nhere, so pull in that branch to resolve the conflicts.\n\nConflicts:\n\tarch/arm/mach-imx/mach-imx27_visstrim_m10.c\n\tarch/arm/mach-omap2/board-omap4panda.c\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n[olof: Amended fix for mismerge as reported by Kevin Hilman]\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "907d2e7cc7ebba4ab398422a7f0435e1802be65b", "tree": "40e51b724bf01a9a507c83c2f1152ec67d5c9a7e", "parents": [ "4b1a61705a563edb951b8fd9734bcb14286a7888" ], "author": { "name": "Adrian Hunter", "email": "adrian.hunter@intel.com", "time": "Wed Feb 29 09:17:21 2012 +0200" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue Mar 27 12:20:03 2012 -0400" }, "message": "mmc: start removing enable / disable API\n\nMost parts of the enable / disable API are no longer used and\ncan be removed.\n\nSigned-off-by: Adrian Hunter \u003cadrian.hunter@intel.com\u003e\nTested-by: Venkatraman S \u003csvenkatr@ti.com\u003e\nTested-by: Jaehoon Chung \u003cjh80.chung@samsung.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "80d17f3a1bd8b5045fedb7dee6b41208497c72d0", "tree": "99b210c3ff56c7e2e75ea6cd0ce49fff811edc6a", "parents": [ "b7bf773b0eaac633276a8c3b2867db4d8b64c04a" ], "author": { "name": "Balaji T K", "email": "balajitk@ti.com", "time": "Wed Mar 07 09:55:30 2012 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue Mar 27 12:19:59 2012 -0400" }, "message": "mmc: omap_hsmmc: remove unused .set_sleep function\n\nset_sleep seems to be unused in omap_hsmmc driver. so get rid of it.\n\nSigned-off-by: Balaji T K \u003cbalajitk@ti.com\u003e\nSigned-off-by: Rajendra Nayak \u003crnayak@ti.com\u003e\nTested-by: Venkatraman S \u003csvenkatr@ti.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "d418ed87c4e3ecf45d42718c4ead91180997681f", "tree": "8da29767609df1b6eced0f1121a0f1e8325e3327", "parents": [ "b81cfc413047181a8f2599cacf927dc09a81a123" ], "author": { "name": "Daniel Mack", "email": "zonque@gmail.com", "time": "Sun Feb 19 13:20:33 2012 +0100" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Tue Mar 27 12:19:56 2012 -0400" }, "message": "ARM: OMAP: hsmmc: add max_freq field\n\nExternal circuitry like level shifters may limit the maximum operation\nspeed of the hsmmc controller. Add a field to struct omap2_hsmmc_info\nso boards can adjust the setting on demand.\n\nSigned-off-by: Daniel Mack \u003czonque@gmail.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "b0df89868006517417251e02cc4ce5d4b0165885", "tree": "6800388c633a13f64fd1f7845ce026ca2606522f", "parents": [ "4ba21e868f4b6e2ce5432055e206edadc6319533", "6c634726352f0d796a4b5e6aa9849ee5b45712ce" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Mar 27 11:30:31 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Mar 27 11:30:31 2012 +0100" }, "message": "Merge branch \u0027devel-stable\u0027 into for-linus\n\nConflicts:\n\tarch/arm/Kconfig.debug\n\tarch/arm/plat-versatile/Kconfig\nMerge fixes:\n\tarch/arm/mach-integrator/Kconfig\n\tdrivers/clocksource/Kconfig\n" }, { "commit": "4ba21e868f4b6e2ce5432055e206edadc6319533", "tree": "0d06d66d00c091ebd2abc88cfcf9332b6bc08f18", "parents": [ "3e175ca4cab37b1eb99f7cf032142a1e5cdb3d97", "60db4fcf14c6b562399579473a67e51eed694ff4", "fada8dcf2d085f4e2eb1ba760c8d37111977dbec" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Mar 27 11:29:31 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Mar 27 11:29:31 2012 +0100" }, "message": "Merge branches \u0027l2\u0027, \u0027pgt2\u0027 and \u0027misc\u0027 into for-linus\n" }, { "commit": "fada8dcf2d085f4e2eb1ba760c8d37111977dbec", "tree": "10f9b86ac3f1ea04be15a8f26818da270e68bfab", "parents": [ "38b4205abeaed7eaae0a2a9e9af8e1252fa5c86a" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Mar 27 10:44:23 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Mar 27 10:44:23 2012 +0100" }, "message": "ARM: fix Kconfig warning for HAVE_BPF_JIT\n\nLast night\u0027s randconfig and the allnoconfig builds spat out the\nfollowing warning while building:\n\nwarning: (ARM) selects HAVE_BPF_JIT which has unmet direct dependencies (NET)\n\nAcked-by: Mircea Gherzan \u003cmgherzan@gmail.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "876fe76d793d03077eb61ba3afab4a383f46c554", "tree": "fb7d98bd746ebd1c3c5919f10a998e8f2dbd9e8b", "parents": [ "e7d9377e0440c25805dcc5b0af189a87beb69f5e" ], "author": { "name": "Paul Parsons", "email": "lost.distance@yahoo.com", "time": "Wed Mar 07 14:12:08 2012 +0000" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Tue Mar 27 00:52:28 2012 +0100" }, "message": "mtd: maps: physmap: Add reference counter to set_vpp()\n\nThis patch is part of a set which fixes unnecessary flash erase and write errors\nresulting from the MTD CFI driver turning off vpp while an erase is in progress.\nThis patch allows physmap_set_vpp() calls to be nested by adding a reference\ncounter.\n\nomap1_set_vpp() already used a reference counter. Since it is called from\nphysmap_set_vpp(), omap1_set_vpp() can now be simplified.\n\nsimtec_nor_vpp() already disabled hard interrupts. Since it is called from\nphysmap_set_vpp(), simtec_nor_vpp() can now be simplified.\n\nSigned-off-by: Paul Parsons \u003clost.distance@yahoo.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cartem.bityutskiy@linux.intel.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "02bfc4ebbd2532440fadd78076f3a51e0ae89f7f", "tree": "51317b0b1bce317b83c4b78d33ba02551a889e6e", "parents": [ "b2acc92e144336dd29e30dc5d26439355be750b6" ], "author": { "name": "Shiraz Hashim", "email": "shiraz.hashim@st.com", "time": "Wed Mar 07 17:00:52 2012 +0530" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Tue Mar 27 00:46:19 2012 +0100" }, "message": "mtd: fsmc: Move ALE, CLE defines to their respective platform\n\nAddress Latch Enable (ALE) and Command Latch Enable (CLE) defines are\nplatform specific and were wrongly put in driver specific fsmc.h file.\nMove such defines to their respective platform.\n\nAlso instead of relying on fsmc driver, pass ALE, CLE offsets explicitly\nfrom individual platform.\n\nSigned-off-by: Shiraz Hashim \u003cshiraz.hashim@st.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cartem.bityutskiy@linux.intel.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "2aab52e8fe9bffb451508f37a7affa5370bfcc9e", "tree": "9e1a8198325d9aa79656fd02286e581bbfd27359", "parents": [ "3f2e924b26989bbe1ad600a83fdc72a3056104d1" ], "author": { "name": "Bastian Hecht", "email": "hechtb@googlemail.com", "time": "Thu Mar 01 10:48:41 2012 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Tue Mar 27 00:43:23 2012 +0100" }, "message": "ARM: mach-shmobile: mackerel: Add the flash controller flctl\n\nAdd board and clock setup code for the SH Mobile flctl controller.\n\nSigned-off-by: Bastian Hecht \u003chechtb@gmail.com\u003e\nAcked-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cartem.bityutskiy@linux.intel.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "3946860409130038ef6e0e5c50f2203053eae2b7", "tree": "826247e754823ddb1b3d18cabd13a34c3ff2f102", "parents": [ "273a65ad3256a829bdeb073a2e9b359433de2fe5" ], "author": { "name": "Huang Shijie", "email": "b32955@freescale.com", "time": "Thu Feb 16 14:17:32 2012 +0800" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Tue Mar 27 00:37:23 2012 +0100" }, "message": "mxs-dma : move the mxs dma.h to a more common place\n\nMove the header to a more common place.\nThe mxs dma engine is not only used in mx23/mx28, but also used\nin mx50/mx6q. It will also be used in the future chips.\n\nRename it to mxs-dma.h, and create a new folder include/linux/fsl/ to\nstore the Freescale\u0027s header files.\n\nchange mxs-dma driver, mxs-mmc driver, gpmi-nand driver, mxs-saif driver\nto the new header file.\n\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Huang Shijie \u003cb32955@freescale.com\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\nAcked-by: Chris Ball \u003ccjb@laptop.org\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "7175f80ba38a6b056508c4eadaab829593abbf2b", "tree": "8b91b504c13f57ee95c7e58b19aafd86125ecdc0", "parents": [ "1ad105fc77e61f9dd7a272659a248e2979fdb893" ], "author": { "name": "Stephen Warren", "email": "swarren@wwwdotorg.org", "time": "Mon Mar 19 09:55:12 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@wwwdotorg.org", "time": "Mon Mar 26 09:55:22 2012 -0600" }, "message": "ARM: tegra: Include assembler.h in sleep.S to fix build break\n\nCommit 6f6f6a7 \"ARM: create a common IOMEM definition\" moved macro\nIOMEM(), and requires users to include \u003casm/assembler.h\u003e. Fix Tegra\u0027s\nsleep.S to do so. This fixes:\n\narch/arm/mach-tegra/sleep.S: Assembler messages:\narch/arm/mach-tegra/sleep.S:77: Error: missing \u0027)\u0027\narch/arm/mach-tegra/sleep.S:77: Error: garbage following instruction\n -- `movw r0,#:lower16:(0x60007000-0x60000000+IOMEM(0xFE200000))\u0027\n\nNote: This only shows up after 0a25893 \"ARM: tegra: update defconfig\"\n\nSigned-off-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\n" }, { "commit": "1ad105fc77e61f9dd7a272659a248e2979fdb893", "tree": "b8f0c64314e05c9208501d9aba89cc5abb57234e", "parents": [ "2bc856c419d9941589ff210900a60906d773f1c4", "e186ad74c0941f5caeda28bde76dab903b342c1c" ], "author": { "name": "Stephen Warren", "email": "swarren@wwwdotorg.org", "time": "Mon Mar 26 09:49:22 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@wwwdotorg.org", "time": "Mon Mar 26 09:49:22 2012 -0600" }, "message": "Merge remote branch \u0027remotes/korg_olof_tegra/for-3.4/soc\u0027 into for-3.4/fixes-for-io-cleanup\n" }, { "commit": "e33936451484b06b61b259172fa3761a7d1cd4dc", "tree": "acdbb021fc7f3ba4c13adbd70059f7a7c70c9803", "parents": [ "f75a8df3bd6466e29a4e40b86b2cfc96fe06d328" ], "author": { "name": "Stephen Warren", "email": "swarren@wwwdotorg.org", "time": "Fri Mar 16 15:03:55 2012 -0600" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Mon Mar 26 15:49:20 2012 +0200" }, "message": "Kbuild: centralize MKIMAGE and cmd_uimage definitions\n\nAll ARCHs have the same definition of MKIMAGE. Move it to Makefile.lib\nto avoid duplication.\n\nAll ARCHs have similar definitions of cmd_uimage. Place a sufficiently\nparameterized version in Makefile.lib to avoid duplication.\n\nSigned-off-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nTested-by: Mike Frysinger \u003cvapier@gentoo.org\u003e [Blackfin]\nTested-by: Michal Simek \u003cmonstr@monstr.eu\u003e [Microblaze]\nTested-by: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e [unicore32]\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "6bd081277ea03e2b165fc68534b61bc64db93990", "tree": "288ba74063dcc002a347cefcfb65e70bc5b63d22", "parents": [ "beeaa103eecc7a132682c40867f0ef70655383a5" ], "author": { "name": "Javier Martin", "email": "javier.martin@vista-silicon.com", "time": "Thu Mar 22 14:54:01 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Mar 26 11:31:29 2012 +0530" }, "message": "dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c\n\nIt is mainly a simple merge changing the prefix of some\nfunctions to fit the imx-dma namings.\n\nAs there are no users of the old dma-v1.c api we can safely\nremove this file.\n\nSigned-off-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "aae528d9a8ad79d4b21b1b723abc9447fdb0d200", "tree": "146617a0ab9032b8ad0dfaf4afad24a8f954179f", "parents": [ "41569e370c5e1f5714a3386a3795efff99891f97", "5eca8f3a8048235d7fa3faa9ee4fc292d25a7425", "375dec92777c96015a13a23eaeb4f23281fb8662" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:57:55 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:57:55 2012 +0100" }, "message": "Merge branches \u0027acorn\u0027, \u0027ebsa110\u0027 and \u0027sa11x0\u0027 into platforms\n" }, { "commit": "375dec92777c96015a13a23eaeb4f23281fb8662", "tree": "74164b30e8aa689c51ccb552c06aedc86219539d", "parents": [ "f314f33be77d6a48ae19748e3dc4a6657042b525" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 23 14:29:33 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:57:22 2012 +0100" }, "message": "ARM: 7343/1: sa11x0: convert to sparse IRQ\n\nNow that Neponset, UCB1x00 and SA1111 are all converted to use the IRQ\nallocation interfaces, we can enable sparse IRQ support for SA11x0\nplatforms.\n" }, { "commit": "f314f33be77d6a48ae19748e3dc4a6657042b525", "tree": "6943191f7d9052c51dd66c4cdb99e5a265d2d0de", "parents": [ "3638dd2b45ceac2e9526f0ee83b0923db3546979" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Fri Feb 24 00:06:51 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:57:20 2012 +0100" }, "message": "ARM: 7342/2: sa1100: prepare for sparse irq conversion\n\nIn preparation to convert SA1100 to sparse irq, set .nr_irqs for each machine\nand explicitly include mach/irqs.h as needed.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "7256ecc2b7b91b4212ccc5511cb12254bdf806d0", "tree": "1a39b3de03cfc92c5b5dedfb01174d17b49df18a", "parents": [ "18bbff9f679cd470db66402fdb9c577b34324183", "6ed3e2acc7995625625592abe8cd3383c34a471b" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:56:30 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:57:10 2012 +0100" }, "message": "Merge branch \u0027sa11x0-mcp\u0027 into sa11x0\n\nConflicts:\n\tarch/arm/mach-sa1100/assabet.c\n\tarch/arm/mach-sa1100/collie.c\n\tarch/arm/mach-sa1100/generic.c\n\tarch/arm/mach-sa1100/lart.c\n\tarch/arm/mach-sa1100/shannon.c\n" }, { "commit": "18bbff9f679cd470db66402fdb9c577b34324183", "tree": "f8e90adadfde630368034268de8cc5763898ab37", "parents": [ "e7d863d0f42e2cf19a13c867bfcab7424388bff8", "7cb66dcc828662c8cacb74af08478433cef102b1" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:55:54 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:55:54 2012 +0100" }, "message": "Merge branch \u0027sa11x0-lcd\u0027 into sa11x0\n\nConflicts:\n\tarch/arm/mach-sa1100/assabet.c\n" }, { "commit": "c21320104ec5b8ffa0d62865d43ee56cbfccc2de", "tree": "3f97e63255b40dddf150f56860ea46fe698febb8", "parents": [ "9903405be58c481e926d485b8fe50a1b9e4048be" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jan 14 16:57:02 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:55:12 2012 +0100" }, "message": "ARM: sa11x0: remove unused DMA controller definitions\n\nRemove the new unused DMA controller definitions from mach/SA-1100.h.\nThese are now private to the SA-11x0 DMA engine driver and contained\nwithin the driver.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "9903405be58c481e926d485b8fe50a1b9e4048be", "tree": "af635ee50830cee52036da285850c46edd41f207", "parents": [ "277dc7ae147e971cfdbf4aa3529477909852b780" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jan 13 12:07:24 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:55:09 2012 +0100" }, "message": "ARM: sa11x0: remove old SoC private DMA driver\n\nNow that all users are converted over to using the DMA engine API,\nwe can get rid of the old platform dependent DMA driver.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "277dc7ae147e971cfdbf4aa3529477909852b780", "tree": "59fe6d5cb428e1a543f24cf0d4d16edebb247c5e", "parents": [ "374da9da22ebaad0524c77905b5e89ae4619bef3", "d138dacb4b8255c02e4380ce2aadab758a99d2c1" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:54:52 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:54:57 2012 +0100" }, "message": "Merge branch \u0027sa11x0-ir\u0027 into sa11x0\n" }, { "commit": "374da9da22ebaad0524c77905b5e89ae4619bef3", "tree": "78f8ebbbc2e730b8e510e3a68b5b73755196fb68", "parents": [ "fbae0f8912dc12b284433c05417ea76311205bbf", "81e6ca3eb74d6bdbab181dd2db378f49f76f0d97" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:54:16 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:54:16 2012 +0100" }, "message": "Merge branch \u0027sa1111\u0027 into sa11x0\n\nConflicts:\n\tarch/arm/common/sa1111.c\n\tarch/arm/mach-sa1100/neponset.c\n\nFixed:\n\tarch/arm/mach-sa1100/assabet.c\nfor the neponset changes\n" }, { "commit": "23019a733bb83c8499f192fb428b7e6e81c95a34", "tree": "710285ef4691a54bb2ca9a5ceb4f82474f55a638", "parents": [ "58af4a244fa9f7ef86f45aa9f8fa835a89274bdd" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Mar 20 14:33:19 2012 -0500" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Sun Mar 25 14:36:31 2012 -0500" }, "message": "ARM: pxa: use common IOMEM definition\n\npxa was missed in the moving of IOMEM to a common definition, so lots of\nIOMEM redefined warnings were introduced. So remove pxa IOMEM definition\nand fix all the fallout.\n\nReported-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Haojian Zhuang \u003chaojian.zhuang@marvell.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Jaroslav Kysela \u003cperex@perex.cz\u003e\nCc: Takashi Iwai \u003ctiwai@suse.de\u003e\nCc: rtc-linux@googlegroups.com\nCc: alsa-devel@alsa-project.org\n" }, { "commit": "58af4a244fa9f7ef86f45aa9f8fa835a89274bdd", "tree": "ebd669001d231a354f4ccc8d885fd4d01b1e6369", "parents": [ "a2a47ca36642e3995e982957bc42678cf11ca6ac" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Mar 20 14:33:01 2012 -0500" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Sun Mar 25 14:35:58 2012 -0500" }, "message": "ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol\n\nThe only users of ARCH_HAS_DMA_SET_COHERENT_MASK are 2 ARM platforms:\nixp4xx and pxa cm_x2xx. We\u0027ve been getting lucky that the define is\nimplicitly included before dma-mapping.h, but the removal of io.h broke\nthings (c334bc1 ARM: make mach/io.h include optional). Since memory.h\nis the correct place, but no longer exists, convert the define to a\nkconfig entry.\n\nReported-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Imre Kaloz \u003ckaloz@openwrt.org\u003e\nCc: Krzysztof Halasa \u003ckhc@pm.waw.pl\u003e\nCc: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nAcked-by: Haojian Zhuang \u003chaojian.zhuang@marvell.com\u003e\nCc: Vinod Koul \u003cvinod.koul@intel.com\u003e\nCc: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "7d1206bc2859c6e9f46e35ae697c138e7d7858a7", "tree": "14af84e9a635e59293edf81aa562b6740c57d310", "parents": [ "f4eb28340771c12cdbf8b5ec149dbd3b0eef1687", "c899445f9783309ac73073282d4c0ae27f51fa9a" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Mar 24 19:15:55 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Mar 24 19:16:04 2012 +0000" }, "message": "Merge branch \u0027kirkwood/dt\u0027 into next/dt2\n\nThis was part of the for-next branch earlier but for some reasons\na rebuild of the tree missed it, so I\u0027m putting it back in now.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "83fe628e16d84efc8df2731bc403eae4e4f53801", "tree": "9a51c292235621d0f4f632c2a55ddb5a6ab582af", "parents": [ "853a0231e057c04255a848f6998f84faaa635c58", "426f1af947c61dee48a9267f84bff227e503a547" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Mar 24 19:13:59 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Mar 24 19:13:59 2012 +0000" }, "message": "Merge branch \u0027renesas/soc\u0027 into next/soc2\n" }, { "commit": "426f1af947c61dee48a9267f84bff227e503a547", "tree": "adbd2ad224278c58ac483af0b0d77f2c59e54315", "parents": [ "5cd9eb2736a572a9ef2689829f47ffd4262adc00", "e9dd7ed2a365b021cdbb35b5cad62f6ab6aeb5d2" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Mar 22 22:02:16 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Mar 24 19:13:31 2012 +0000" }, "message": "Merge branch \u0027rmobile-fixes-for-linus\u0027 of git://github.com/pmundt/linux-sh into renesas/soc\n\nConflicts:\n\tarch/arm/mach-shmobile/board-ap4evb.c\n\nThis moves the addition of init_consistent_dma_size() from the board\nfiles into the common sh7372_map_io() functions where all the other\ncontents of the board specific map_io calls have gone.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "ed2d265d1266736bd294332d7f649003943ae36e", "tree": "860e5b7bb72933e4a9abacdc2f2d75a0e6254e32", "parents": [ "f1d38e423a697b7aa06e12d3ca4753bcc1aa3531", "6c03438edeb5c359af35f060ea016ca65671c269" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:08:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:08:39 2012 -0700" }, "message": "Merge tag \u0027bug-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\nPull \u003clinux/bug.h\u003e cleanup from Paul Gortmaker:\n \"The changes shown here are to unify linux\u0027s BUG support under the one\n \u003clinux/bug.h\u003e file. Due to historical reasons, we have some BUG code\n in bug.h and some in kernel.h -- i.e. the support for BUILD_BUG in\n linux/kernel.h predates the addition of linux/bug.h, but old code in\n kernel.h wasn\u0027t moved to bug.h at that time. As a band-aid, kernel.h\n was including \u003casm/bug.h\u003e to pseudo link them.\n\n This has caused confusion[1] and general yuck/WTF[2] reactions. Here\n is an example that violates the principle of least surprise:\n\n CC lib/string.o\n lib/string.c: In function \u0027strlcat\u0027:\n lib/string.c:225:2: error: implicit declaration of function \u0027BUILD_BUG_ON\u0027\n make[2]: *** [lib/string.o] Error 1\n $\n $ grep linux/bug.h lib/string.c\n #include \u003clinux/bug.h\u003e\n $\n\n We\u0027ve included \u003clinux/bug.h\u003e for the BUG infrastructure and yet we\n still get a compile fail! [We\u0027ve not kernel.h for BUILD_BUG_ON.] Ugh -\n very confusing for someone who is new to kernel development.\n\n With the above in mind, the goals of this changeset are:\n\n 1) find and fix any include/*.h files that were relying on the\n implicit presence of BUG code.\n 2) find and fix any C files that were consuming kernel.h and hence\n relying on implicitly getting some/all BUG code.\n 3) Move the BUG related code living in kernel.h to \u003clinux/bug.h\u003e\n 4) remove the asm/bug.h from kernel.h to finally break the chain.\n\n During development, the order was more like 3-4, build-test, 1-2. But\n to ensure that git history for bisect doesn\u0027t get needless build\n failures introduced, the commits have been reorderd to fix the problem\n areas in advance.\n\n\t[1] https://lkml.org/lkml/2012/1/3/90\n\t[2] https://lkml.org/lkml/2012/1/17/414\"\n\nFix up conflicts (new radeon file, reiserfs header cleanups) as per Paul\nand linux-next.\n\n* tag \u0027bug-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n kernel.h: doesn\u0027t explicitly use bug.h, so don\u0027t include it.\n bug: consolidate BUILD_BUG_ON with other bug code\n BUG: headers with BUG/BUG_ON etc. need linux/bug.h\n bug.h: add include of it to various implicit C users\n lib: fix implicit users of kernel.h for TAINT_WARN\n spinlock: macroize assert_spin_locked to avoid bug.h dependency\n x86: relocate get/set debugreg fcns to include/asm/debugreg.\n" }, { "commit": "876c1f27852ff1e45e1164da15847d3b25600160", "tree": "628ab226ed9cacf8192019fd85a6529842626d80", "parents": [ "22eeaff367ac85a09643b2b8a5af064ec8773f63" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Jan 29 10:37:36 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 11:30:13 2012 +0000" }, "message": "ARM: sa11x0: don\u0027t static map sa1111\n\nThe sa1111 support will ioremap() the device; there is no need for\nplatforms to setup a static mapping for this. Remove the static\nmapping for this device from badge4, jornada720 and neponset.\n\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "22eeaff367ac85a09643b2b8a5af064ec8773f63", "tree": "0aa093016d08a78d0f59c24ee76ddf0a692b7f1e", "parents": [ "924e1d4910a1f7d53f949a92a5d7793e572bb21d" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Jan 29 10:28:09 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 11:30:12 2012 +0000" }, "message": "ARM: sa1111: use dev_err() rather than printk()\n\nUse dev_err() to report device specific errors rather than printk().\n\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "924e1d4910a1f7d53f949a92a5d7793e572bb21d", "tree": "e71b578f6c97bd5c35916adfc4e60c82ed2fea43", "parents": [ "21d1c7702e74337717a1133fe8665f6591768581" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Jan 29 10:20:00 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 11:30:12 2012 +0000" }, "message": "ARM: sa1111: cleanup sub-device registration and unregistration\n\nMove the releasing of resources out of the release function - this\nallows a cleaner and more conventional arrangement of the registration\nfailure paths and a saner unregistration process for these devices.\n\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "21d1c7702e74337717a1133fe8665f6591768581", "tree": "7f90b864e45f53909a21897c46985973e3174463", "parents": [ "09a2ba2fa0eba3da747db860ac1c8c0956665316" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Jan 29 10:22:49 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 11:30:12 2012 +0000" }, "message": "ARM: sa1111: only setup DMA for DMA capable devices\n\nIt\u0027s pointless registering the PS/2 interfaces with the dmabounce code\nwhen there\u0027s no DMA support for these in hardware, so only setup the\nDMA masks for two subdevices which support DMA - the OHCI and SAC.\n\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "09a2ba2fa0eba3da747db860ac1c8c0956665316", "tree": "dc6ff8dccb13f30812dadeb24cb04633d95efaa9", "parents": [ "2213536d78a2ed96e870396b06ee53f4a54a1e42" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Jan 29 09:31:31 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 11:30:12 2012 +0000" }, "message": "ARM: sa1111: register sa1111 devices with dmabounce in bus notifier\n\nUse the bus notifier to register sa1111 devices with dmabounce, rather\nthan after the device has been registered, potentially racing with\ndriver binding.\n\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "2213536d78a2ed96e870396b06ee53f4a54a1e42", "tree": "91e611020dd8046f108a9ff01807ffb8436d9c36", "parents": [ "ea8c00ac18198763bceb7ca53d26df4aa8d3c414" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 16 11:37:03 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 11:30:12 2012 +0000" }, "message": "ARM: sa1111: move USB interface register definitions to ohci-sa1111.c\n\nMove the USB interface register definitions into the driver, rather\nthan keeping them in a common place.\n\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "ea8c00ac18198763bceb7ca53d26df4aa8d3c414", "tree": "0313ef4b1f2cb52adc1d01b8dfbff657297f83f7", "parents": [ "4f8d9cae15b5b5c89ec17c8168215aa06a5c9b2c" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 16 11:32:09 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 11:30:11 2012 +0000" }, "message": "ARM: sa1111: move PCMCIA interface register definitions to sa1111_generic.c\n\nMove the PCMCIA interface register definitions into the driver, rather\nthan keeping them in a common place.\n\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "4f8d9cae15b5b5c89ec17c8168215aa06a5c9b2c", "tree": "688c7dd56b3ba4286a82343f8372bded93cee927", "parents": [ "6995f5b007c6b774e7d0c7528ced171145c03a09" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 16 11:29:43 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 11:30:11 2012 +0000" }, "message": "ARM: sa1111: move PS/2 interface register definitions to sa1111p2.c\n\nMove the PS/2 interface register definitions into the driver, rather\nthan keeping them in a common location.\n\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "6995f5b007c6b774e7d0c7528ced171145c03a09", "tree": "53530b45a280019375cd01fef7ecfc7c883c6182", "parents": [ "07be45f57ebe037977c8033a008e9012617b1915" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 16 14:28:25 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 11:30:11 2012 +0000" }, "message": "ARM: sa1111: delete unused physical GPIO register definitions\n\nGet rid of the unused GPIO register definitions - we access GPIO\nregisters through the base + offset method, and having the phys\naddress definitions is unnecessary duplication.\n\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "511f1cb6d426938fabf9c6d69ce4861b66ffd919", "tree": "88fd9b5c15ccb42d5d582f83e87ce5d3f16127cb", "parents": [ "f907ab06bb021bcb91d39c8d1b36536ebdb318fa", "4992fa1fd425f1934f503ffa96b68e235b89db9a" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Mar 24 11:29:58 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Mar 24 11:29:58 2012 +0000" }, "message": "Merge tag \u0027regulator-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next/drivers\n\nThe pxa regulator branch removes the bq24022 driver, while a lot of\nother regulator drivers got added in the regulator tree. This\nresolves the trivial conflicts by merging in the regulator patches\nthat are already merged into v3.4.\n\nConflicts:\n\tdrivers/regulator/Kconfig\n\tdrivers/regulator/Makefile\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "07be45f57ebe037977c8033a008e9012617b1915", "tree": "a3b7f11eb00c78e5817c68412cad0e412a5c55db", "parents": [ "e5c0fc4185c551c270868dcb6573604db2bc3171" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 26 13:34:21 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 11:29:52 2012 +0000" }, "message": "ARM: sa1111: provide a generic way to prevent devices from registering\n\nSome platforms don\u0027t want certain devices to be registered, because,\neg, the interface is not wired. Provide a way for platforms to\nprevent various devices from being registered via a devid bitmask in\nthe platform data.\n\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "38b4205abeaed7eaae0a2a9e9af8e1252fa5c86a", "tree": "006f6c9206e7a581c0a9e2c0c971692d261e9e63", "parents": [ "695436e3738ec6375a4a1026034d14433be3fb3a" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Wed Mar 14 10:30:52 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 09:38:56 2012 +0000" }, "message": "ARM: 7361/1: provide XIP_VIRT_ADDR for no-MMU builds\n\nXIP_VIRT_ADDR is needed for XIP builds and currently only defined for\nbuilds with CONFIG_MMU.\n\nAlso provide it for no-MMU builds to make it possible to build an XIP\nkernel for MMU-less machines. As these lack an MMU it has to be an\nidentity mapping.\n\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "695436e3738ec6375a4a1026034d14433be3fb3a", "tree": "3255d6fbe91c470f55cc4328b8c4f318a657151e", "parents": [ "ddecdfcea0ae891f782ae853771c867ab51024c2" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Sun Feb 26 10:46:48 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 09:38:56 2012 +0000" }, "message": "ARM: 7349/1: integrator: convert to sparse irqs\n\nThis converts the Integrator AP/CP to use sparse IRQs.\nTested on both machines.\n\nAcked-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "ddecdfcea0ae891f782ae853771c867ab51024c2", "tree": "bf344a86217258b88425834ef513585d71f58861", "parents": [ "09f05d8529ff4aa92311c1a55ce35ac98cb59b8c" ], "author": { "name": "Mircea Gherzan", "email": "mgherzan@gmail.com", "time": "Fri Mar 16 13:37:12 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 09:38:56 2012 +0000" }, "message": "ARM: 7259/3: net: JIT compiler for packet filters\n\nBased of Matt Evans\u0027s PPC64 implementation.\n\nThe compiler generates ARM instructions but interworking is\nsupported for Thumb2 kernels.\n\nSupports both little and big endian. Unaligned loads are emitted\nfor ARMv6+. Not all the BPF opcodes that deal with ancillary data\nare supported. The scratch memory of the filter lives on the stack.\nHardware integer division is used if it is available.\n\nEnabled in the same way as for x86-64 and PPC64:\n\n\techo 1 \u003e /proc/sys/net/core/bpf_jit_enable\n\nA value greater than 1 enables opcode output.\n\nSigned-off-by: Mircea Gherzan \u003cmgherzan@gmail.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "09f05d8529ff4aa92311c1a55ce35ac98cb59b8c", "tree": "0196ddc9e80d74c8d3e3473bd7bc21b3e520c3d9", "parents": [ "a9468f30b5eac6957c86aea97954553bfb7c1f18" ], "author": { "name": "Rabin Vincent", "email": "rabin@rab.in", "time": "Sat Feb 18 17:52:41 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 09:38:56 2012 +0000" }, "message": "ARM: 7334/1: add jump label support\n\nAdd the arch-specific code to support jump labels for ARM and Thumb-2.\n\nThis code will only be activated on compilers that are capable of\nbuilding it. It has been tested with GCC 4.6 patched with the patch\nfrom GCC bug 48637.\n\nCc: Jason Baron \u003cjbaron@redhat.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin@rab.in\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "9b5a146a43db3733c731d47022f4f5259e6b31e6", "tree": "3fc6d02c65c3f373d6408f9c332de183be7230b0", "parents": [ "101d9b0dedbc9e560737d3357104bf09db48eb3e" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Wed Feb 22 21:58:03 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 09:38:55 2012 +0000" }, "message": "ARM: 7338/1: add support for early console output via semihosting\n\nThis is a very simple method for code running in an emulator, or under\nthe supervision of a debugger, to use I/O facilities on the controlling\nhost.\n\nTested with OpenOCD, and ARM\u0027s Fast Models.\n\nDetails on semihosting can be found in chapter 8 of\nDUI0203I_rvct_developer_guide.pdf from ARM Ltd.\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "101d9b0dedbc9e560737d3357104bf09db48eb3e", "tree": "c04dbbbc2e70b92f05668913d705378d9e717d64", "parents": [ "e88443cdfc61af5cd22d6aeb245ee94833c473bc" ], "author": { "name": "Matt Fleming", "email": "matt.fleming@intel.com", "time": "Mon Mar 05 15:05:34 2012 -0800" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 09:38:55 2012 +0000" }, "message": "ARM: use set_current_blocked() and block_sigmask()\n\nAs described in e6fa16ab (\"signal: sigprocmask() should do\nretarget_shared_pending()\") the modification of current-\u003eblocked is\nincorrect as we need to check for shared signals we\u0027re about to block.\n\nAlso, use the new helper function introduced in commit 5e6292c0f28f\n(\"signal: add block_sigmask() for adding sigmask to current-\u003eblocked\")\nwhich centralises the code for updating current-\u003eblocked after\nsuccessfully delivering a signal and reduces the amount of duplicate code\nacross architectures. In the past some architectures got this code wrong,\nso using this helper function should stop that from happening again.\n\nCc: Arnd Bergmann \u003carnd.bergmann@linaro.org\u003e\nCc: Dave Martin \u003cdave.martin@linaro.org\u003e\nCc: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nCc: Will Deacon \u003cwill.deacon@arm.com\u003e\nAcked-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Matt Fleming \u003cmatt.fleming@intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" } ], "next": "e88443cdfc61af5cd22d6aeb245ee94833c473bc" }