)]}' { "log": [ { "commit": "30b842889eea1bea02dff55b13d2ddf07a46ce78", "tree": "827d96b61384d5fe22ed7aeba02b34026648046e", "parents": [ "84a442b9a16ee69243ce7fce5d6f6f9c3fbdee68", "820f3dd7964f1889baaaaa0c2ba45d05bb619f66" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 13:05:55 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 13:05:55 2012 -0700" }, "message": "Merge tag \u0027soc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc: soc specific changes (part 2) from Olof Johansson:\n \"This adds support for the spear13xx platform, which has first been\n under review a long time ago and finally been completed after generic\n spear work has gone into the clock, dt and pinctrl branches.\n\n Also a number of updates for the samsung socs are part of this branch.\"\n\nFix up trivial conflicts in drivers/gpio/gpio-samsung.c that look much\nworse than they are: the exonys5 init code was refactored in commit\nfd454997d687 (\"gpio: samsung: refactor gpiolib init for exynos4/5\"), and\nthen commit f10590c9836c (\"ARM: EXYNOS: add GPC4 bank instance\") added a\nnew gpio chip define and did tiny updates to the init code.\n\nSo the conflict diff looks like hell, but it\u0027s actually a fairly simple\nchange.\n\n* tag \u0027soc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (34 commits)\n ARM: exynos: fix building with CONFIG_OF disabled\n ARM: EXYNOS: Add AUXDATA for i2c controllers\n ARM: dts: Update device tree source files for EXYNOS5250\n ARM: EXYNOS: Add device tree support for interrupt combiner\n ARM: EXYNOS: Add irq_domain support for interrupt combiner\n ARM: EXYNOS: Remove a new bus_type instance for EXYNOS5\n ARM: EXYNOS: update irqs for EXYNOS5250 SoC\n ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpll\n ARM: EXYNOS: add GPC4 bank instance\n ARM: EXYNOS: Redefine IRQ_MCT_L0,1 definition\n ARM: EXYNOS: Modify the GIC physical address for static io-mapping\n ARM: EXYNOS: Add watchdog timer clock instance\n pinctrl: SPEAr1310: Fix pin numbers for clcd_high_res\n SPEAr: Update MAINTAINERS and Documentation\n SPEAr13xx: Add defconfig\n SPEAr13xx: Add compilation support\n SPEAr13xx: Add dts and dtsi files\n pinctrl: Add SPEAr13xx pinctrl drivers\n pinctrl: SPEAr: Create macro for declaring GPIO PINS\n SPEAr13xx: Add common clock framework support\n ...\n" }, { "commit": "2c757fd5d1a92086f225a75a8fac7cab242d11b0", "tree": "d150ea105242d551f6959c2525472295e151144c", "parents": [ "ce53044c68cf4fb6c50a2a0d88786be65fae7235", "424663566c43ce87e8b33228860bf882f1ea61bf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:31:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:31:49 2012 -0700" }, "message": "Merge tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc cleanups (part 2) from Olof Johansson:\n \"More cleanups, continuing an earlier set with omap and samsung\n specific cleanups. These could not go into the first set because they\n have dependencies on various other series that in turn depend on the\n first cleanups.\"\n\nFixed up conflicts in arch/arm/plat-omap/counter_32k.c due to commit\nbd0493eaaf5c: \"move read_{boot,persistent}_clock to the architecture\nlevel\" that changed how the persistent clocks were handled. And trivial\nconflicts in arch/arm/mach-omap1/common.h due to just independent\nchanges close to each other.\n\n* tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (35 commits)\n ARM: SAMSUNG: merge plat-s5p into plat-samsung\n ARM: SAMSUNG: move options for common s5p into plat-samsung/Kconfig\n ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung\n ARM: SAMSUNG: move platform device for s5p uart into plat-samsung\n ARM: SAMSUNG: move hr timer for common s5p into plat-samsung\n ARM: SAMSUNG: move pm part for common s5p into plat-samsung\n ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung\n ARM: SAMSUNG: move clock part for common s5p into plat-samsung\n ARM: S3C24XX: Use common macro to define resources on dev-uart.c\n ARM: S3C24XX: move common clock init into common.c\n ARM: S3C24XX: move common power-management code to mach-s3c24xx\n ARM: S3C24XX: move plat-s3c24xx/dev-uart.c into common.c\n ARM: S3C24XX: move plat-s3c24xx/cpu.c\n ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX\n ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX\n GPMC: add ECC control definitions\n ARM: OMAP2+: dmtimer: remove redundant sysconfig context restore\n ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx\n ARM: OMAP: AM35xx: remove redunant cpu_is checks for AM3505\n ARM: OMAP1: Pass dma request lines in platform data to MMC driver\n ...\n" }, { "commit": "9bc747bea5fad819e0c0ad96e6a67ea0640dfe2b", "tree": "d500225e7a1c90a6bd17d3e63e2f6e781810db2b", "parents": [ "32b908eea9e5ecd1049008e134eadbfcd0da5e38", "0e896b1ddc1905df904df98c204bacf028219729" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:23:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:23:24 2012 -0700" }, "message": "Merge tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull first batch of arm-soc cleanups from Olof Johansson:\n \"These cleanups are basically all over the place. The idea is to\n collect changes with minimal impact but large number of changes so we\n can avoid them from distracting in the diffstat in the other series.\n\n A significant number of lines get removed here, in particular because\n the ixp2000 and ixp23xx platforms get removed. These have never been\n extremely popular and have fallen into disuse over time with no active\n maintainer taking care of them. The u5500 soc never made it into a\n product, so we are removing it from the ux500 platform.\n\n Many good cleanups also went into the at91 and omap platforms, as has\n been the case for a number of releases.\"\n\nTrivial modify-delete conflicts in arch/arm/mach-{ixp2000,ixp23xx}\n\n* tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (152 commits)\n ARM: clps711x: Cleanup IRQ handling\n ARM clps711x: Removed unused header mach/time.h\n ARM: clps711x: Added note about support EP731x CPU to Kconfig\n ARM: clps711x: Added missing register definitions\n ARM: clps711x: Used own subarch directory for store header file\n Dove: Fix Section mismatch warnings\n ARM: orion5x: ts78xx debugging changes\n ARM: orion5x: remove PM dependency from ts78xx\n ARM: orion5x: ts78xx fix NAND resource off by one\n ARM: orion5x: ts78xx whitespace cleanups\n Orion5x: Fix Section mismatch warnings\n Orion5x: Fix warning: struct pci_dev declared inside paramter list\n ARM: clps711x: Combine header files into one for clps711x-targets\n ARM: S3C24XX: Use common macro to define resources on mach-qt2410.c\n ARM: S3C24XX: Use common macro to define resources on mach-osiris.c\n ARM: EXYNOS: Adapt to cpuidle core time keeping and irq enable\n ARM: S5PV210: Use common macro to define resources on mach-smdkv210.c\n ARM: S5PV210: Use common macro to define resources on dev-audio.c\n ARM: S5PC100: Use common macro to define resources on dev-audio.c\n ARM: S5P64X0: Use common macro to define resources on dev-audio.c\n ...\n" }, { "commit": "bf67f3a5c456a18f2e8d062f7e88506ef2cd9837", "tree": "2a2324b2572162059307db82f9238eeb25673a77", "parents": [ "226da0dbc84ed97f448523e2a4cb91c27fa68ed9", "203dacbdca977bedaba61ad2fca75d934060a5d5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 19:43:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 19:43:57 2012 -0700" }, "message": "Merge branch \u0027smp-hotplug-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull smp hotplug cleanups from Thomas Gleixner:\n \"This series is merily a cleanup of code copied around in arch/* and\n not changing any of the real cpu hotplug horrors yet. I wish I\u0027d had\n something more substantial for 3.5, but I underestimated the lurking\n horror...\"\n\nFix up trivial conflicts in arch/{arm,sparc,x86}/Kconfig and\narch/sparc/include/asm/thread_info_32.h\n\n* \u0027smp-hotplug-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (79 commits)\n um: Remove leftover declaration of alloc_task_struct_node()\n task_allocator: Use config switches instead of magic defines\n sparc: Use common threadinfo allocator\n score: Use common threadinfo allocator\n sh-use-common-threadinfo-allocator\n mn10300: Use common threadinfo allocator\n powerpc: Use common threadinfo allocator\n mips: Use common threadinfo allocator\n hexagon: Use common threadinfo allocator\n m32r: Use common threadinfo allocator\n frv: Use common threadinfo allocator\n cris: Use common threadinfo allocator\n x86: Use common threadinfo allocator\n c6x: Use common threadinfo allocator\n fork: Provide kmemcache based thread_info allocator\n tile: Use common threadinfo allocator\n fork: Provide weak arch_release_[task_struct|thread_info] functions\n fork: Move thread info gfp flags to header\n fork: Remove the weak insanity\n sh: Remove cpu_idle_wait()\n ...\n" }, { "commit": "a551204badbea5119a84ee4f03faefce9f2c0543", "tree": "8592f756c984f376be13cf839c4815ff8a7266a6", "parents": [ "26625ddadbe9cd5791c9d64b0425821b036c5188", "199642bfe107c411f25fbfc16c9fd49cfef9785d" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 16 15:53:15 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 16 15:53:15 2012 +0200" }, "message": "Merge branch \u0027samsung/cleanup-plat-s5p\u0027 into next/soc2\n" }, { "commit": "424663566c43ce87e8b33228860bf882f1ea61bf", "tree": "07b53452a890979f414493f569b5831a5e05545a", "parents": [ "eedd52e3c462d5434412fd0b7bc183ed76d3a4a8", "163ec0369be4c26e68385f6cec88d0ee38c8d8e5" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 21:15:20 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 21:15:20 2012 +0200" }, "message": "Merge branch \u0027next/cleanup-plat-s3c24xx-s5p\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup2\n\nKukjin Kim \u003ckgene.kim@samsung.com\u003e writes:\n We can remove plat-s5p directory with this series and I think, the\n plat-s3c24xx can be removed next time for one plat-samsung of Samsung\n stuff.\n Note, this is including cleanup-samsung-iommu which is removing s5p\n iommu stuff in plat-s5p.\n\n* \u0027next/cleanup-plat-s3c24xx-s5p\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:\n ARM: SAMSUNG: merge plat-s5p into plat-samsung\n ARM: SAMSUNG: move options for common s5p into plat-samsung/Kconfig\n ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung\n ARM: SAMSUNG: move platform device for s5p uart into plat-samsung\n ARM: SAMSUNG: move hr timer for common s5p into plat-samsung\n ARM: SAMSUNG: move pm part for common s5p into plat-samsung\n ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung\n ARM: SAMSUNG: move clock part for common s5p into plat-samsung\n ARM: S3C24XX: Use common macro to define resources on dev-uart.c\n ARM: S3C24XX: move common clock init into common.c\n ARM: S3C24XX: move common power-management code to mach-s3c24xx\n ARM: S3C24XX: move plat-s3c24xx/dev-uart.c into common.c\n ARM: S3C24XX: move plat-s3c24xx/cpu.c\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "0d8e08f5a3b8cda3785e5bc854d89ebba60e9994", "tree": "bb74addf5b8c39aad34aab40007cbb38b12be432", "parents": [ "07658d9a659ba2e297cead3872ad4be8ec38b5b9" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Thu Apr 19 22:34:25 2012 +0530" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 17:34:09 2012 +0200" }, "message": "SPEAr13xx: Add compilation support\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\n" }, { "commit": "199642bfe107c411f25fbfc16c9fd49cfef9785d", "tree": "a2ca24d98d38d389c0dc5ae69cce82df4d2dd14a", "parents": [ "e033ca9bfa0831889d7b8fdad516c771ad200e41" ], "author": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Sun May 13 07:11:38 2012 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Sun May 13 07:52:54 2012 +0900" }, "message": "ARM: SAMSUNG: merge plat-s5p into plat-samsung\n\nSince just plat-samsung can support all of Samsung stuff so\nthat there is no more need to keep the plat-s5p for S5P SoCs.\n\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "256aa5fc239d7c1986dd47b88c6297d582e7763c", "tree": "0358f540827a43107ab580b4c605488ee5083e3b", "parents": [ "d07c3df8019bf01306065c4271421d70ad23e5e8" ], "author": { "name": "Santosh Shilimkar", "email": "santosh.shilimkar@ti.com", "time": "Sat Apr 28 20:25:31 2012 +0530" }, "committer": { "name": "Santosh Shilimkar", "email": "santosh.shilimkar@ti.com", "time": "Tue May 08 11:54:24 2012 +0530" }, "message": "ARM: All OMAP2PLUS machines use omap2 directory so just add one entry\n\nAll OMAP2PLUS arch based machines makes use of mach-omap2 directory.\nSo just add one entry so that there is no need to patch this file\nfor any OMAP2+ devices.\n\nSigned-off-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\n" }, { "commit": "5290dc292915aaed6ae71ec3db5d4aa3285e7d51", "tree": "aafbe36686b38228391fd32cea60d6221d71fd8a", "parents": [ "5dced29d71c2ad9b6e69a4af360bd2fd1b3c4950" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu May 03 09:02:50 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat May 05 13:00:22 2012 +0200" }, "message": "arm: Use generic init_task\n\nSame code. Use the generic version. The special Makefile treatment is\npointless anyway as init_task.o contains only data which is handled by\nthe linker script. So no point on being treated like head text.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Russell King \u003clinux@arm.linux.org.uk\u003e\nLink: http://lkml.kernel.org/r/20120503085034.221811388@linutronix.de\n" }, { "commit": "357c9c1f07d4546bc3fbc0fd1044d96b114d14ed", "tree": "a355e9cd73ab9f7b536b4c7562d931cfb3f5a885", "parents": [ "69964ea4c7b68c9399f7977aa5b9aa6539a6a98a" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri May 04 12:04:26 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat May 05 05:50:50 2012 +0100" }, "message": "ARM: Remove support for ARMv3 ARM610 and ARM710 CPUs\n\nThis patch removes support for ARMv3 CPUs, which haven\u0027t worked properly\nfor quite some time (see the FIXME comment in arch/arm/mm/fault.c). The\nonly V3 parts left is the cache model for ARMv3, which is needed for some\nodd reason by ARM740T CPUs, and being able to build with -march\u003darmv3,\nwhich is required for the RiscPC platform due to its bus structure.\n\nAcked-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nAcked-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "c65f2abf54a6d07260f1fa64773154e1d7047961", "tree": "5ebc35115ba1f4d46727cc6db0b4f70ec3f9b437", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Fri Mar 30 23:37:53 2012 -0500" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Fri Apr 06 08:26:18 2012 -0500" }, "message": "ARM: remove ixp23xx and ixp2000 platforms\n\nixp2xxx platforms have had no real changes since ~2006 and the maintainer\nhas said on irc that they can be removed:\n\n13:05 \u003c nico\u003e do you still care about ixp2000?\n13:22 \u003c lennert\u003e not really, no\n13:58 \u003c nico\u003e do you think we could remove it from the kernel tree?\n14:01 \u003c lennert\u003e go for it, and remove ixp23xx too while you\u0027re at it\n\nRemoving will help simplify ARM consolidation in general and PCI re-work\nspecifically.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nAcked-by: Lennert Buytenhek \u003cbuytenh@wantstofly.org\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": "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": "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": "94c7ca71c40ffcde28388a712cab524d636bec60", "tree": "baf9c7efd2326a8b936e16cebd1aa3e2f1be2217", "parents": [ "171c067c1a3f903fca78f2610794441a7d1e64f3" ], "author": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Sat Feb 11 22:15:45 2012 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Wed Mar 14 02:13:06 2012 -0700" }, "message": "ARM: EXYNOS: add support for EXYNOS5250 SoC\n\nThis patch add support for EXYNOS5250 SoC has two Cortex-A15 cores.\nSince actually, most codes in mach-exynos/ are used commonly for\nEXYNOS4 and EXYNOS5 the EXYNOS5/EXYNOS5250 has been implemented\nin mach-exynos/.\n\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "880bcd4a8363f24375027f9ded4670960dcfa70a", "tree": "31894d9dc2c29f31234e479de520a50858cce54c", "parents": [ "a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13", "8c3d7c30c306d83ff9c303f42307765a5a7bc254" ], "author": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Sat Mar 03 08:57:03 2012 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Wed Mar 07 01:36:33 2012 -0800" }, "message": "Merge branch \u0027topic/cleanup-s3c24xx\u0027 into next/cleanup-s3c24xx\n\nConflicts:\n\tarch/arm/mach-s3c24xx/include/mach/system.h\n" }, { "commit": "84c028b9cebd928cf434b27093fa65f7b4b81cfe", "tree": "9451edaa92cf44112e80d6bf5dc057d913122163", "parents": [ "dd6f01b5ccba602cf0790bc44cc4429013373719" ], "author": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Mon Feb 06 13:21:03 2012 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Sat Mar 03 08:55:54 2012 +0900" }, "message": "ARM: S3C2443: move mach-s3c2443/* into mach-s3c24xx/\n\nThis patch moves S3C2443 stuff into mach-s3c24xx/ directory\nso that we can merge the s3c24 series\u0027 directories to the\njust one mach-s3c24xx/ directory.\n\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "26febf8ef14a3682eb99af3805c1f8149ed8eb6c", "tree": "f6206e4ac98c76f04dc7cc290e99056bfbfe3264", "parents": [ "85e2a26f3d17b349a921b93e02b778fa8a09027b" ], "author": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Mon Feb 06 10:59:47 2012 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Sat Mar 03 08:55:12 2012 +0900" }, "message": "ARM: S3C2416: move mach-s3c2416/* into mach-s3c24xx/\n\nThis patch moves S3C2416 stuff into mach-s3c24xx/ directory\nso that we can merge the s3c24 series\u0027 directories to the\njust one mach-s3c24xx/ directory.\n\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nTested-by: Heiko Stuebner \u003cheiko@sntech.de\u003e\n[kgene.kim@samsung.com: removed compiling s3c2416 as per Heiko\u0027s suggestion]\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "85fd6d63bf2927b9da7ab1b0d46723bfdb13808c", "tree": "7033ac06e365209b09ba4b97eba0cf2f7ceb3312", "parents": [ "b130d5c29544fe4cedafd35b112d27a06550d844" ], "author": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Mon Feb 06 09:38:19 2012 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Sat Mar 03 07:47:38 2012 +0900" }, "message": "ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/\n\nThis patch moves S3C2410 stuff into mach-s3c24xx/ directory\nso that we can merge the s3c24 series\u0027 directories to the\njust one mach-s3c24xx/ directory.\n\nAnd this patch is including following.\n- re-ordered alphabetically by option text at Kconfig and Makefile\n- removed unused option, MACH_N35\n- fixed duplcated option name, S3C2410_DMA to S3C24XX_DMA which is\n in plat-s3c24xx/\n\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "b130d5c29544fe4cedafd35b112d27a06550d844", "tree": "3a12051f935c7a3ea819a4fee606b8a139523c9b", "parents": [ "507164d22357b26ac73411f42765054045ca0b76" ], "author": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Fri Feb 03 14:29:23 2012 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Sat Mar 03 07:44:51 2012 +0900" }, "message": "ARM: S3C24XX: change the ARCH_S3C2410 to ARCH_S3C24XX\n\nThis patch changes the ARCH name to \"ARCH_S3C24XX\" for Samsung\nS3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443,\nand S3C2450 SoCs so that we can merge the mach-xxx directories\nand plat-s3c24xx dir. to just one mach-s3c24xx for them.\n\nI think this should be sent to upstream via samsung tree because\nthis touches many samsung stuff.\n\nCc: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nCc: Richard Purdie \u003crpurdie@rpsys.net\u003e\nCc: Chris Ball \u003ccjb@laptop.org\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n[for the gadget part:]\nAcked-by: Felipe Balbi \u003cbalbi@ti.com\u003e\n[for the framebuffer (video) part:]\nAcked-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\n[For the watchdog-part:]\nAcked-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\nCc: Sangbeom Kim \u003csbkim73@samsung.com\u003e\nCc: Liam Girdwood \u003clrg@ti.com\u003e\nCc: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "eaed435a7b870a38d89dbdb535c7842d618d3214", "tree": "75c2d90c7c1fa937fc83027699fad1455644df8e", "parents": [ "a99cbf6b43a7b3b15f6139b2d9ac4ecceccd3c99", "3f07f355704bc2ae26399f17c6d5d46c9a3d78d1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 14:50:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 14:50:30 2012 -0800" }, "message": "Merge tag \u0027arm-soc-imx-move\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nConsolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.\n\n* tag \u0027arm-soc-imx-move\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM i.MX: Update defconfig\n ARM i.MX: Merge i.MX5 support into mach-imx\n ARM i.MX5: remove unnecessary includes from board files\n\nFix up fairly trivial conflicts due to various changes nearby in\narch/arm/{mach,plat}-imx/{Kconfig,Makefile}\n\nPull request had been sent to the wrong email address, but happened\nbefore the merge window closed. I\u0027m merging the MX 5 consolidation,\nsince it apparently will help the next development window and will avoid\nconflicts later as per Arnd.\n" }, { "commit": "273b5e5189791a9b6d0bffb24568378d767e1711", "tree": "f0f2b9b63d0081016feb1281a852b1fa4a86e331", "parents": [ "03534a415fa9a7390051fa0ce466611ca250ac4d" ], "author": { "name": "Hans J. Koch", "email": "hjk@hansjkoch.de", "time": "Thu Dec 22 20:46:34 2011 +0100" }, "committer": { "name": "Hans J. Koch", "email": "hjk@hansjkoch.de", "time": "Thu Jan 05 13:33:59 2012 +0100" }, "message": "arm: Remove TCC subarch from Kconfig/Makefile\n\nThe Telechips subarchitecture is being completely removed.\n\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Harry Sievers \u003chsievers@csselectronic.com\u003e\nSigned-off-by: Hans J. Koch \u003chjk@hansjkoch.de\u003e\n" }, { "commit": "784a90c0a7d8f5aa94b6c7d295ad44ae8e045aa3", "tree": "e28d645f519b5bd86df3ae6f5d06704b1755f09b", "parents": [ "035c17dac4ce1f03d6831ff403f5aea7dcb927b4" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Nov 07 12:36:48 2011 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Nov 16 08:37:37 2011 +0100" }, "message": "ARM i.MX: Merge i.MX5 support into mach-imx\n\nThis patch moves the contents of arch/arm/mach-mx5 to arch/arm/mach-imx\nand adjusts the Makefile/Kconfig entries in a way that it\u0027s possible\nto compile i.MX5 together with i.MX3/6.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nTested-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nTested-by: Dirk Behme \u003cdirk.behme@de.bosch.com\u003e\n" }, { "commit": "830145796a5c8f1ca3f87ea619063c1d99a57df5", "tree": "e72a0ecacfcce228c46d93c946cfd65a44cc1fd3", "parents": [ "e700e41d9abfbf9fee01e979a41b185695132c19" ], "author": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Sun Nov 06 13:54:56 2011 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Sun Nov 06 13:54:56 2011 +0900" }, "message": "ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos\n\nThe arch/arm/mach-exynos4 directory (CONFIG_ARCH_EXYNOS4) has\nmade for plaforms based on EXYNOS4 SoCs. But since upcoming\nSamsung\u0027s SoCs such as EXYNOS5 (ARM Cortex A15) can reuse most\ncodes in current mach-exynos4, one mach-exynos directory will\nbe used for them.\n\nThis patch changes to CONFIG_ARCH_EXYNOS (arch/arm/mach-exynos)\nbut keeps original CONFIG_ARCH_EXYNOS4 in mach-exynos/Kconfig to\navoid changing in driver side.\n\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "994c0e992522c123298b4a91b72f5e67ba2d1123", "tree": "411952f844b8e1d5ef2854e44df793529078d3eb", "parents": [ "367069f16e32e188d4687fe2c3e30f2ca583836f", "abc3f126ac736280c68db6472eb0040ddf6e1b1f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 21:08:03 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 21:08:03 2011 -0700" }, "message": "Merge branch \u0027next/soc\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/soc\u0027 of git://git.linaro.org/people/arnd/arm-soc: (21 commits)\n MAINTAINERS: add ARM/FREESCALE IMX6 entry\n arm/imx: merge i.MX3 and i.MX6\n arm/imx6q: add suspend/resume support\n arm/imx6q: add device tree machine support\n arm/imx6q: add smp and cpu hotplug support\n arm/imx6q: add core drivers clock, gpc, mmdc and src\n arm/imx: add gic_handle_irq function\n arm/imx6q: add core definitions and low-level debug uart\n arm/imx6q: add device tree source\n ARM: highbank: add suspend support\n ARM: highbank: Add cpu hotplug support\n ARM: highbank: add SMP support\n MAINTAINERS: add Calxeda Highbank ARM platform\n ARM: add Highbank core platform support\n ARM: highbank: add devicetree source\n ARM: l2x0: add empty l2x0_of_init\n picoxcell: add a definition of VMALLOC_END\n picoxcell: remove custom ioremap implementation\n picoxcell: add the DTS for the PC7302 board\n picoxcell: add the DTS for pc3x2 and pc3x3 devices\n ...\n\nFix up trivial conflicts in arch/arm/Kconfig, and some more header file\nconflicts in arch/arm/mach-omap2/board-generic.c (as per an ealier merge\nby Arnd).\n" }, { "commit": "16ee792e45cf0c97ce061fce03c36cab5551ec72", "tree": "dc68af705fbac4b5d71325aa972730199bb187dd", "parents": [ "f906fb1d70e016726fccfb0d978c5d425503db9d", "efa62e1355f0495f37f1296754b8880947c8da72" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:31:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:31:25 2011 -0700" }, "message": "Merge branch \u0027next/devel\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/devel\u0027 of git://git.linaro.org/people/arnd/arm-soc: (50 commits)\n ARM: tegra: update defconfig\n arm/tegra: Harmony: Configure PMC for low-level interrupts\n arm/tegra: device tree support for ventana board\n arm/tegra: add support for ventana pinmuxing\n arm/tegra: prepare Seaboard pinmux code for derived boards\n arm/tegra: pinmux: ioremap registers\n gpio/tegra: Convert to a platform device\n arm/tegra: Convert pinmux driver to a platform device\n arm/dt: Tegra: Add pinmux node to tegra20.dtsi\n arm/tegra: Prep boards for gpio/pinmux conversion to pdevs\n ARM: mx5: fix clock usage for suspend\n ARM i.MX entry-macro.S: remove now unused code\n ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER\n ARM i.MX tzic: add handle_irq function\n ARM i.MX avic: add handle_irq function\n ARM: mx25: Add the missing IIM base definition\n ARM i.MX avic: convert to use generic irq chip\n mx31moboard: Add poweroff support\n ARM: mach-qong: Add watchdog support\n ARM: davinci: AM18x: Add wl1271/wlan support\n ...\n\nFix up conflicts in:\n\tarch/arm/mach-at91/at91sam9g45.c\n\tarch/arm/mach-mx5/devices-imx53.h\n\tarch/arm/plat-mxc/include/mach/memory.h\n" }, { "commit": "510597e26e2a072e2d46ea5bc57feaf385e37f70", "tree": "5ffe90e6569481506b06fb6d6a409655fac4f7f6", "parents": [ "cd9a0b6bd67ec372b0ef3cb2abe26974f888b956", "4702abd3f9728893ad5b0f4389e1902588510459" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:24:30 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:24:30 2011 -0700" }, "message": "Merge branch \u0027next/deletion\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/deletion\u0027 of git://git.linaro.org/people/arnd/arm-soc:\n ARM: mach-nuc93x: delete\n\nFix up trivial delete/edit conflicts in\n\tarch/arm/mach-nuc93x/{Makefile.boot,mach-nuc932evb.c,time.c}\n" }, { "commit": "abc3f126ac736280c68db6472eb0040ddf6e1b1f", "tree": "4e3333cde6da6c49dcd81920410bf5a33055f03a", "parents": [ "b8df0ea26ac17c9a073f235c7fdfbdd1851b59ea", "8bcb97659656042f3132b2814b19709856aa1335" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 02 02:46:55 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 02 02:46:55 2011 +0100" }, "message": "Merge branch \u0027imx/imx6q\u0027 into next/soc\n\nConflicts:\n\tDocumentation/devicetree/bindings/arm/fsl.txt\n\tarch/arm/Kconfig\n\tarch/arm/Kconfig.debug\n\tarch/arm/plat-mxc/include/mach/common.h\n" }, { "commit": "b8df0ea26ac17c9a073f235c7fdfbdd1851b59ea", "tree": "5e57a2fdc5fa05155d7d8214ad054b16f6b1c3d8", "parents": [ "884897e6a10a86de0e611a76f4bf3fd0068a672c", "76780127914d5dc69a458eda5e471e65a5fd3dc9" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 02 02:46:17 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 02 02:46:17 2011 +0100" }, "message": "Merge branch \u0027picoxcell/soc\u0027 into next/soc\n" }, { "commit": "884897e6a10a86de0e611a76f4bf3fd0068a672c", "tree": "019689fb9d129404af1efba4df10975bc9e0a57a", "parents": [ "c72dbae971400e466ad9ff16c920cd6d9d8c55a1", "8b61f37440388ebbd2a894178fe098f2e70ab392" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 02 02:46:10 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 02 02:46:10 2011 +0100" }, "message": "Merge branch \u0027highbank/soc\u0027 into next/soc\n\nConflicts:\n\tarch/arm/mach-mxs/include/mach/gpio.h\n\tarch/arm/mach-omap2/board-generic.c\n\tarch/arm/plat-mxc/include/mach/gpio.h\n" }, { "commit": "c72dbae971400e466ad9ff16c920cd6d9d8c55a1", "tree": "7a0ebba8b14d889a8b42edfa1272be222b908a82", "parents": [ "7e1efcf5d2039fb7a91e21df32f4175dbca4d61c", "b4cbb8a4e602ea77b0525d06eff89c6a6070dab3" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Nov 01 17:12:22 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Nov 01 17:12:22 2011 +0100" }, "message": "Merge branch \u0027imx/devel\u0027 into next/dt\n\nThe board changes in the imx/devel branch conflict with other changes in\nthe device imx/dt branch.\n\nConflicts:\n\tarch/arm/mach-mx5/board-mx53_loco.c\n\tarch/arm/mach-mx5/board-mx53_smd.c\n\tarch/arm/plat-mxc/include/mach/common.h\n\tarch/arm/plat-mxc/include/mach/memory.h\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "a89cf59b5c344e50b7be3cabb67dc1ed94439b6e", "tree": "8a0a76073e6e0d618910621d1cebaf1787f9574b", "parents": [ "a1f1c7efb0c1c78b5e84455bb5a6c8b2bee3059c" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Tue Sep 27 13:48:02 2011 +0800" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 14:26:28 2011 +0100" }, "message": "arm/imx: merge i.MX3 and i.MX6\n\nThe patch merges the build of imx3 and imx6. The Kconfig symbol\nARCH_IMX_V6_V7 is introduced to replace ARCH_MX3 and ARCH_MX6.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "bac89d754ba333453576fd38eb6073d7f89818fe", "tree": "b53d79778a231d9cb62cacd97910e03ac93da921", "parents": [ "7d740f87fd0741c00231a4b13074660d526d5630" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Sun Oct 02 15:09:11 2011 +0800" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 14:26:21 2011 +0100" }, "message": "arm/imx6q: add core definitions and low-level debug uart\n\nIt adds the core definitions and low-level debug uart support\nfor imx6q.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "7e0cac630c7c90f12a78131df9913657fa30243b", "tree": "c09aa76b07a9bcb0ab0dea4885909421f7a9f4a6", "parents": [ "94314a40bcc537c396012e37cf887572f0d82aef", "b4cbb8a4e602ea77b0525d06eff89c6a6070dab3" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 14:24:28 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 14:24:28 2011 +0100" }, "message": "Merge branch \u0027imx/devel\u0027 into imx/imx6q\n\nConflicts:\n\tarch/arm/plat-mxc/include/mach/memory.h\n" }, { "commit": "220e6cf7b793d702596506a8c4bf1f4fd4040df1", "tree": "ba9f94611ca71799e67a66555c5124a0be975920", "parents": [ "253d7addbcb06acc90eb722f122d32a6ccbf67a7" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Jun 07 10:02:55 2011 -0500" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 14:14:00 2011 +0100" }, "message": "ARM: add Highbank core platform support\n\nThis adds basic support for the Calxeda Highbank platform.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nReviewed-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nReviewed-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "af75655c066621352c419646ec0775e9523dc720", "tree": "ae3895ab4f9d8ce7823f4ef4dcbdbb8f838f3073", "parents": [ "c6a389f123b9f68d605bb7e0f9b32ec1e3e14132" ], "author": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Mon Jul 25 17:36:42 2011 +0100" }, "committer": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Mon Sep 26 16:11:56 2011 +0100" }, "message": "picoxcell: support for Picochip picoxcell devices\n\npicoXcell is a family of femtocell devices with an ARM application\nprocessor and picoArray DSP processor array.\n\nThis patch adds support for picoXcell boards to be booted using the\ndevice tree registering the VIC\u0027s, UART\u0027s and timers.\n\nv3:\t- fixup vic compatible string in binding\nv2:\t- cleanup empty mach headers\n\t- convert to of_platform_populate()\n\t- simplify uncompress.h\n\t- split vic node into 2 devices\n\t- add missing __initconst attributes\n\nSigned-off-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\n" }, { "commit": "4702abd3f9728893ad5b0f4389e1902588510459", "tree": "32926e7c55ef585d9b9c174a0e5f9ed13ed6bf7e", "parents": [ "ddf28352b80c86754a6424e3a61e8bdf9213b3c7" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Wed Aug 03 15:50:38 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Sep 22 14:02:48 2011 +0000" }, "message": "ARM: mach-nuc93x: delete\n\nThis architecture received only generic maintenance since December 2009\nwhen it was originally submitted, and no actual additional support since\nthen. It has no defconfig entry either, meaning that it was never built\nby the ARM KAutobuild. Incidentally it currently doesn\u0027t build either\nwhen CONFIG_MACH_NUC932EVB is selected which is the only possible config\nchoice.\n\nThis is therefore dead code and should be removed. If someone wants to\nrevive this code, it could be retrieved from the Git repository, and\nideally be merged in mach-w90x900/ instead.\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nCc: Wan ZongShun \u003cmcuos.com@gmail.com\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "ae4fa7f66e542ef5c7662ceabfaaa33283eb4216", "tree": "147282db8a7a417ad45f919ee92235b081bd32e7", "parents": [ "fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Tue Aug 23 09:39:35 2011 +0200" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Aug 24 09:24:43 2011 +0200" }, "message": "ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCs\n\nFor this we need CONFIG_AUTO_ZRELADDR and CONFIG_ARM_PATCH_PHYS_VIRT.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "9e775ad19f52d70a53797b4d0eb740c52b0a9567", "tree": "3136bbf2c8d26bc5c6791a96fdbc5540cc858ba5", "parents": [ "c1becedc8871645278832fabdc6fe138082a495b" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Fri Aug 12 00:14:28 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Aug 13 11:26:18 2011 +0100" }, "message": "ARM: 7012/1: Set proper TEXT_OFFSET for newer MSMs\n\nMSMs post 8x50 have 2Mb at the beginning of RAM reserved for\nshared memory. Since the kernel hasn\u0027t typically been told this\nRAM exists, PHYS_OFFSET has been set to 0xN0200000 and the memory\natags passed to the kernel have matched. This doesn\u0027t play nicely\nwith things such as AUTO_ZRELADDR, which doesn\u0027t work at all, and\ndynamic phys to virt, which requires an MSM specific workaround.\n\nWork around these issues by telling the kernel RAM starts at\n0xN0000000 (it actually does) and fixup the atags from the\nbootloader (if necessary) to say the same. In addition, make sure\nto set TEXT_OFFSET at least 2Mb beyond the start of RAM so that\nthe kernel doesn\u0027t end up being decompressed into shared memory.\n\nAfter doing this, AUTO_ZRELADDR should work on MSM with no\nproblems and ARM_PATCH_PHYS_VIRT_16BIT should no longer be\nnecessary.\n\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nAcked-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "6124a4e430b64d1577438c8648c59e996d02e73e", "tree": "49cfafad785d1c9e403a5b0d755298b9af2c260f", "parents": [ "8e267f3da5f117d2f1316cf6ddf740f93f1c73aa", "580975d7f48d7d047e22bb0f42adf7557801d8d4" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Jul 28 15:25:46 2011 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Jul 28 15:25:46 2011 +0000" }, "message": "Merge branch \u0027imx/dt\u0027 into next/dt\n" }, { "commit": "4b30b6f23a1a59cda29cc12566eb4f32a22a8069", "tree": "69e262a5065ce8be21c919febd29d5d9660f3e97", "parents": [ "38da590bef19f23d4b610aecaad4f32de483890d", "6c59c115b0f295434cc4f917d180fecd84d39f81" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 17:09:31 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 17:09:31 2011 -0700" }, "message": "Merge branch \u0027next/soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc\n\n* \u0027next/soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:\n MAINTAINERS: add maintainer of CSR SiRFprimaII machine\n ARM: CSR: initializing L2 cache\n ARM: CSR: mapping early DEBUG_LL uart\n ARM: CSR: Adding CSR SiRFprimaII board support\n OMAP4: clocks: Update the clock tree with 4460 clock nodes\n OMAP4: PRCM: OMAP4460 specific PRM and CM register bitshifts\n OMAP4: ID: add omap_has_feature for max freq supported\n OMAP: ID: introduce chip detection for OMAP4460\n ARM: Xilinx: merge board file into main platform code\n ARM: Xilinx: Adding Xilinx board support\n\nFix up conflicts in arch/arm/mach-omap2/cm-regbits-44xx.h\n" }, { "commit": "5fd1a2ed0ec6fb5449c71a988cc15edb8671b3d0", "tree": "82d49394874271f1dcaa7c38775c1dab0b71d87f", "parents": [ "2b4180af3faaf6088162d8a6b8d3f571bd7c2004" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Mon Jul 25 09:52:12 2011 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Jul 25 09:52:12 2011 -0600" }, "message": "arm/dt: Add dtb make rule\n\nAdd a make rule to compile dt blobs for ARM.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@freescale.com\u003e\nTested-by: Jason Liu \u003cjason.hui@linaro.org\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "c8b7d43b6d539218c36f0ac8a6ad434b93195703", "tree": "5e84acb8215d86838f176e44ac74cf34f845701d", "parents": [ "632b7cf6c056a355fe920c5165c4d7772393b817" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Tue Jul 05 23:44:31 2011 -0400" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Mon Jul 18 11:04:43 2011 -0400" }, "message": "ARM: mach-loki: delete\n\nThis was introduced more than 3 years ago, and since then only generic\njanitorial changes were made without further addition of actual support\nfor \"real\" devices. This is therefore a cost with no benefits to keep\nin the tree. If someone wishes to revive this code, it is always\npossible to retrieve it from the Git repository.\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nCC: Ke Wei \u003ckewei@marvell.com\u003e\nCC: Saeed Bishara \u003csaeed@marvell.com\u003e\nCC: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\n" }, { "commit": "632b7cf6c056a355fe920c5165c4d7772393b817", "tree": "75ef47d4bfca9ecc090afe5a294de688163f0118", "parents": [ "af0e060e24ce120804ac2b7c4abf3a13d57881ca" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Tue Jul 05 23:44:31 2011 -0400" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Mon Jul 18 10:59:26 2011 -0400" }, "message": "ARM: mach-s3c2400: delete\n\nOn Tue, 28 Jun 2011, Ben Dooks wrote:\n\n\u003e On Tue, Jun 28, 2011 at 11:22:57PM +0200, Arnd Bergmann wrote:\n\u003e\n\u003e \u003e On a related note, what about mach-s3c2400? It seems to be even more\n\u003e \u003e incomplete.\n\u003e\n\u003e Probably the same fate awaits that. It is so old that there\u0027s little\n\u003e incentive to do anything with it.\n\nSo out it goes as well.\n\nThe PORT_S3C2400 definition in include/linux/serial_core.h is left there\nto prevent a reuse of the same number for another port type.\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "af0e060e24ce120804ac2b7c4abf3a13d57881ca", "tree": "d24ade96129bbab4dbe79271e1990fae92a81c9e", "parents": [ "620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Tue Jul 05 23:44:31 2011 -0400" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Mon Jul 18 10:58:18 2011 -0400" }, "message": "ARM: mach-s3c24a0: delete\n\nCommit bcae8aeb32 \"[ARM] S3C24A0: Initial architecture support files\"\nbrought in a bunch of files while explicitly leaving out the corresponding\nKconfig entry, stating that the series is not complete.\n\nMore than 2.5 years later, the support for this has not seen any progress.\nThis is therefore dead code. If someone wants to revive this code, it is\nalways possible to retrieve it from the Git repository.\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nAcked-by: Ben Dooks \u003cben-linux@fluff.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4", "tree": "7d729e347d8860c9ef5631cb8cdfa96e892f86d5", "parents": [ "a990cbd887585a1056b927b3b20de325f14fdf96", "3d64b4496f5fd90618106555344205a522178c0c" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Jul 17 21:43:26 2011 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Jul 17 21:43:26 2011 +0200" }, "message": "Merge branch \u0027zynq/master\u0027 of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/soc\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/mm/Kconfig\n" }, { "commit": "02c981c07bc95ac1e42ec6c817f0c28cf3fe993a", "tree": "3b0f9a368d7d3b4cef3eab9128a0c3d95e8188d4", "parents": [ "f1bb20a8365f6753e0f7b6e94981ca2b662bae13" ], "author": { "name": "Binghua Duan", "email": "binghua.duan@csr.com", "time": "Fri Jul 08 17:40:12 2011 +0800" }, "committer": { "name": "Barry Song", "email": "21cnbao@gmail.com", "time": "Sat Jul 09 07:19:28 2011 +0800" }, "message": "ARM: CSR: Adding CSR SiRFprimaII board support\n\nSiRFprimaII is the latest generation application processor from CSR’s\nMultifunction SoC product family. Designed around an ARM cortex A9 core,\nhigh-speed memory bus, advanced 3D accelerator and full-HD multi-format\nvideo decoder, SiRFprimaII is able to meet the needs of complicated\napplications for modern multifunction devices that require heavy concurrent\napplications and fluid user experience. Integrated with GPS baseband,\nanalog and PMU, this new platform is designed to provide a cost effective\nsolution for Automotive and Consumer markets.\n\nThis patch adds the basic support for this SoC and EVB board based on device\ntree. It is following the ZYNQ of Xilinx in some degree.\n\nSigned-off-by: Binghua Duan \u003cBinghua.Duan@csr.com\u003e\nSigned-off-by: Rongjun Ying \u003cRongjun.Ying@csr.com\u003e\nSigned-off-by: Zhiwu Song \u003cZhiwu.Song@csr.com\u003e\nSigned-off-by: Yuping Luo \u003cYuping.Luo@csr.com\u003e\nSigned-off-by: Bin Shi \u003cBin.Shi@csr.com\u003e\nSigned-off-by: Huayi Li \u003cHuayi.Li@csr.com\u003e\nSigned-off-by: Barry Song \u003cBaohua.Song@csr.com\u003e\nReviewed-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "b85a3ef4ac65169b65fd2fe9bec7912bbf475ba4", "tree": "4a629040873bf9f0c34c8e7c970617dcce9b30e9", "parents": [ "2c53b436a30867eb6b47dd7bab23ba638d1fb0d2" ], "author": { "name": "John Linn", "email": "john.linn@xilinx.com", "time": "Mon Jun 20 11:47:27 2011 -0600" }, "committer": { "name": "John Linn", "email": "john.linn@xilinx.com", "time": "Mon Jun 20 11:52:30 2011 -0600" }, "message": "ARM: Xilinx: Adding Xilinx board support\n\nThe 1st board support is minimal to get a system up and running\non the Xilinx platform.\n\nThis platform reuses the clock implementation from plat-versatile, and\nit depends entirely on CONFIG_OF support. There is only one board\nsupport file which obtains all device information from a device tree\ndtb file which is passed to the kernel at boot time.\n\nSigned-off-by: John Linn \u003cjohn.linn@xilinx.com\u003e\n" }, { "commit": "586893ebc42943008010b4c210cfc9167df615e5", "tree": "eec3179235978fba9ca6bfae0799d97c8532ee15", "parents": [ "014322dac6ae0048c928c6ca2faf0d53194f9d15", "bd6356bdafc853201168f718f0059fbe11191461" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed May 25 21:47:48 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed May 25 21:47:48 2011 +0100" }, "message": "Merge branch \u0027for-rmk\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/mach-exynos4/mach-nuri.c\n" }, { "commit": "9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0", "tree": "894bb6a3fb409c6ac5f0374f5a1f656918bc35cd", "parents": [ "ec19628d72cff8f80220b7cedba089074ac6a599", "dc7ad3b3d5f1cd0a0d16c05dd3ad3898979d261e" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 23 19:28:04 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 23 19:28:04 2011 +0100" }, "message": "Merge branch \u0027devel-stable\u0027 into for-linus\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/mach-ns9xxx/include/mach/uncompress.h\n" }, { "commit": "ec19628d72cff8f80220b7cedba089074ac6a599", "tree": "c3ec69d6648fdfd3e19563fa341d6585a3d77567", "parents": [ "4b60e5f90dec4ae251386f20464336369e962e9c", "b0ec5cf191eeca7fd885ef2860e9a586d29bff00", "603605abae9ee731bdafb2af83a487d98a568815", "8373dc38ca8d4918210710807256a313cd111f0b", "399bc4863e2a3b4b255ca22189820c81ca34f4e0", "16dc062b42459e6ddd244c2bc8255cac45db47e4", "f1f6ac111d6b1c55a604afbbff966e284b392050" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 23 19:27:40 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 23 19:27:40 2011 +0100" }, "message": "Merge branches \u0027consolidate\u0027, \u0027ep93xx\u0027, \u0027fixes\u0027, \u0027misc\u0027, \u0027mmci\u0027, \u0027remove\u0027 and \u0027spear\u0027 into for-linus\n" }, { "commit": "27ad4bf72a27c80c121b2349174e6b41b2e3afd8", "tree": "864ddd4e58386f22c9fda4457ebc5bb23d790792", "parents": [ "7fc92c6092d7208e53d35cda32a9181aae396adf" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Thu Mar 17 09:40:29 2011 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Thu May 19 13:11:38 2011 +0200" }, "message": "ARM: imx: move mx3 support to mach-imx\n\nFixing a few \"please, no space before tabs\" and \"empty line at end of\nfile\" warnings on the way.\n\nLAKML-Reference: 1299271882-2130-6-git-send-email-u.kleine-koenig@pengutronix.de\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "13cf8df97d075cf61445c689a30c8b0ce70b415f", "tree": "7c9294508d8983a9a11b2ee6e8001050e31e1f69", "parents": [ "f142b6196891660b329408e71573f97475823667" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Thu Apr 07 11:13:25 2011 +0200" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Thu May 19 13:11:28 2011 +0200" }, "message": "ARM: remove support for mxc91231\n\nSince support for mxc91231 was introduced 2009 it only saw patches that\nwere part of (mxc or arm) global cleanups. The only supported machine\nonly had 4 devices (2x UART, sdhc, watchdog).\n\nCc: Dmitriy Taychenachev \u003cdimichxp@gmail.com\u003e\nLAKML-Reference: 1302211482-17926-1-git-send-email-u.kleine-koenig@pengutronix.de\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "a73ddc61e8f14ddc7ab6e6a11dc882ef6a697114", "tree": "12fa69805404b7bc5d048051be484782b3165643", "parents": [ "693d92a1bbc9e42681c42ed190bd42b636ca876f" ], "author": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Wed May 11 16:27:51 2011 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Thu May 12 08:10:53 2011 +0900" }, "message": "ARM: S5P6442: Removing ARCH_S5P6442\n\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "041f10d46f97c87f8ae1cdb4117682214732cc45", "tree": "93a7357301ab6c244b270bbdf531d436e356f867", "parents": [ "f295dc6874bf271253f70cb75a483d4a23911117" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Fri Apr 29 15:06:43 2011 +0200" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 02 19:08:55 2011 +0100" }, "message": "ARM: plat-stmp: remove plat\n\nNow that both users of plat-stmp have been deleted in previous patches,\ndelete the platform, too.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@freescale.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "f295dc6874bf271253f70cb75a483d4a23911117", "tree": "d3f37cbd0c0552cd83bee1d7cf77dc3d19df4ae0", "parents": [ "7635965891761a732a610aa7ad9371de742ef52b" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Fri Apr 29 15:06:42 2011 +0200" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 02 19:08:55 2011 +0100" }, "message": "ARM: mach-stmp378x: remove mach\n\nThis mach has not seen any updates since the initial inclusion besides\ngeneric cleanup. Furthermore:\n\n- The i.MX23 covered in mach-mxs is just a renamed version of the\n STMP378x.\n\n- mach-stmp378x has a lot of reinvented interfaces, leaking all sorts of\n mach-related includes into the drivers. One example is the dmaengine\n which does not use the linux dmaengine-API but some privately exported\n symbols. So drivers cannot be reused. mach-mxs does it better.\n\n- There is only one board defined (which I couldn\u0027t find any trace of\n despite being a development board). It has been converted to\n mach-mxs in a previous patch.\n\nSince the only user of this mach was converted, it means that\nmach-stmp378x can go.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@freescale.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "7635965891761a732a610aa7ad9371de742ef52b", "tree": "e3d10a04ef7f43de126d0d0626b99cd204b7ae71", "parents": [ "cde7c41feaa06cb6bfc748b2fc3c7d809091c2b0" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Fri Apr 29 15:06:41 2011 +0200" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 02 19:08:55 2011 +0100" }, "message": "ARM: mach-stmp37xx: remove mach\n\nThis mach has not seen any updates since the initial inclusion besides\ngeneric cleanup. Furthermore:\n\n- It has a lot of reinvented interfaces, leaking all sorts of\n mach-related includes into the drivers. One example is the dmaengine\n which does not use the linux dmaengine-API but some privately exported\n symbols. So, drivers cannot be reused. mach-mxs is very similar and\n does it better.\n\n- It can be doubted that this worked at all. Check the DMA routines in\n stmp37xx.c for copy/paste bugs. A lot of APBX-related stuff is\n actually writing into registers for APBH.\n\n- There is only one board defined (which I couldn\u0027t find any trace of\n despite being a development board). In this board, only two devices\n have resources, the debug uart and the application uart. Neither of\n those have the needed custom drivers merged (and never will). debug\n uart is amba-pl011 which has an in-kernel driver without the\n mach-specific-stuff. appuart has a driver which was introduced for\n mach-mxs, and this one is reusable for a properly done mach.\n\nSo, this single board registers only unsupported devices and the\ngeneric code looks suspicious and has poor design. Delete this\nstuff. If there is interest, it is wiser to restart using\nmach-mxs.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@freescale.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "16dc062b42459e6ddd244c2bc8255cac45db47e4", "tree": "a5e24cc662bed825ed0c8d294a09c1ecc74376d9", "parents": [ "e8dad69408a9812d6bb42d03e74d2c314534a4fa" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Wed Apr 27 09:45:33 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Apr 28 19:40:42 2011 +0100" }, "message": "ARM: 6888/1: remove ns9xxx port\n\nThe port is actually unmaintained and only received global\ncleanups and a few build fixes since mid 2008.\n\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": "411f5c7a502769ccc0377c5ba36cb0b283847ba8", "tree": "2c3a29671e3f923de48c55f94194849264a7bf53", "parents": [ "6d7ed21d17e640b120b902a314143e5ef4917a70", "9ced9f03d12d7539e86b0bff5bc750153c976c34" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 19:08:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 19:08:06 2011 -0700" }, "message": "Merge branch \u0027devel-stable\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel-stable\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)\n davinci: DM644x EVM: register MUSB device earlier\n davinci: add spi devices on tnetv107x evm\n davinci: add ssp config for tnetv107x evm board\n davinci: add tnetv107x ssp platform device\n spi: add ti-ssp spi master driver\n mfd: add driver for sequencer serial port\n ARM: EXYNOS4: Implement Clock gating for System MMU\n ARM: EXYNOS4: Enhancement of System MMU driver\n ARM: EXYNOS4: Add support for gpio interrupts\n ARM: S5P: Add function to register gpio interrupt bank data\n ARM: S5P: Cleanup S5P gpio interrupt code\n ARM: EXYNOS4: Add missing GPYx banks\n ARM: S3C64XX: Fix section mismatch from cpufreq init\n ARM: EXYNOS4: Add keypad device to the SMDKV310\n ARM: EXYNOS4: Update clocks for keypad\n ARM: EXYNOS4: Update keypad base address\n ARM: EXYNOS4: Add keypad device helpers\n ARM: EXYNOS4: Add support for SATA on ARMLEX4210\n plat-nomadik: make GPIO interrupts work with cpuidle ApSleep\n mach-u300: define a dummy filter function for coh901318\n ...\n\nFix up various conflicts in\n - arch/arm/mach-exynos4/cpufreq.c\n - arch/arm/mach-mxs/gpio.c\n - drivers/net/Kconfig\n - drivers/tty/serial/Kconfig\n - drivers/tty/serial/Makefile\n - drivers/usb/gadget/fsl_mxc_udc.c\n - drivers/video/Kconfig\n" }, { "commit": "63a93699c6a58795b854ff573542a08367684dae", "tree": "057ab4cbde66862c51867dde030be69a2fa7073f", "parents": [ "16d8775700f1815076f879719ce14b33f50a3171", "21bd6d37cf23e643020bf28b41844ff0040c9393" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 19:05:40 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 19:05:40 2011 -0700" }, "message": "Merge branch \u0027remove\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027remove\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm:\n ARM: 6629/2: aaec2000: remove support for mach-aaec2000\n ARM: lh7a40x: remove unmaintained platform support\n\nFix up trivial conflicts in\n - arch/arm/mach-{aaec2000,lh7a40x}/include/mach/memory.h (removed)\n - drivers/usb/gadget/Kconfig (USB_[GADGET_]LH7A40X removed, others added)\n" }, { "commit": "bd1274dc005c2cee41771a7cc616f4709a6e6323", "tree": "fcfe103a499ca9e3d8fa0ecbca5b7d0d274da5ca", "parents": [ "1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd", "3ba6e69ad887f8a814267ed36fd4bfbddf8855a9" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Mar 16 23:35:26 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Mar 16 23:35:26 2011 +0000" }, "message": "Merge branch \u0027v6v7\u0027 into devel\n\nConflicts:\n\tarch/arm/include/asm/cacheflush.h\n\tarch/arm/include/asm/proc-fns.h\n\tarch/arm/mm/Kconfig\n" }, { "commit": "1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd", "tree": "c685060f260410e6704c9dfd457ed8c347141f1d", "parents": [ "2472f3c8d8fc18b25b2cf1574c036e238187c0ff", "10a8c3839810ac9af1aec836d61b92e7a879f5fa" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Mar 16 23:35:25 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Mar 16 23:35:25 2011 +0000" }, "message": "Merge branch \u0027misc\u0027 into devel\n\nConflicts:\n\tarch/arm/Kconfig\n" }, { "commit": "2472f3c8d8fc18b25b2cf1574c036e238187c0ff", "tree": "485458b51ef0b5509376b56e6ff2e1b124f9c048", "parents": [ "d081377dfda42beab13d8b4af876571ce7661174", "31bb68a314e9a2c9fbe054441b18c0608585605e", "5dab26af1bacad9a7189d904fbc8b4fe8e95dd81", "4e8d76373c9fd7a1c1b401fc97ba01c0ecbb888f", "b6338bdc8305b27688a7feb8689e4ccfd42f0292", "f512626f5baf09c1d40d098462a986417f4e9790", "bf0c11183fc3a2acce56d2b53f2a117322bd3c3b", "941aefac4c243cf407d7665d3e64beb32d556acf", "f45b1149911cc4c3ab50e56c8844ad4ec04a4575", "981a95d37126cdf09e1dba3884305c2e25375bfb", "6e266b204b853b960ad038e62f31c1671f930b87", "21f47fbc5b18da4a3db680959aee887612ec9a72" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Mar 16 23:35:17 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Mar 16 23:35:17 2011 +0000" }, "message": "Merge branches \u0027at91\u0027, \u0027ep93xx\u0027, \u0027errata\u0027, \u0027footbridge\u0027, \u0027fncpy\u0027, \u0027gemini\u0027, \u0027irqdata\u0027, \u0027pm\u0027, \u0027sh\u0027, \u0027smp\u0027, \u0027spear\u0027, \u0027ux500\u0027 and \u0027via\u0027 into devel\n" }, { "commit": "6f685c5cdd29649cf8cc8f57c72791159f936e07", "tree": "892575c8f378609771752e12e88d4f2699084c70", "parents": [ "23bfdacf4eb525ff3404161429cedaa281c23e47" ], "author": { "name": "Dave Martin", "email": "dave.martin@linaro.org", "time": "Thu Mar 03 11:41:12 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Mar 10 16:49:06 2011 +0000" }, "message": "ARM: 6781/1: Thumb-2: Work around buggy Thumb-2 short branch relocations in gas\n\nVarious binutils versions can resolve Thumb-2 branches to\nlocally-defined, preemptible global symbols as short-range \"b.n\"\nbranch instructions.\n\nThis is a problem, because there\u0027s no guarantee the final\ndestination of the symbol, or any candidate locations for a\ntrampoline, are within range of the branch. For this reason, the\nkernel does not support fixing up the R_ARM_THM_JUMP11 (102)\nrelocation in modules at all, and it makes little sense to add\nsupport.\n\nThe symptom is that the kernel fails with an \"unsupported\nrelocation\" error when loading some modules.\n\nUntil fixed tools are available, passing\n-fno-optimize-sibling-calls to gcc should prevent gcc generating\ncode which hits this problem, at the cost of a bit of extra runtime\nstack usage in some cases.\n\nThe problem is described in more detail at:\n https://bugs.launchpad.net/binutils-linaro/+bug/725126\n\nOnly Thumb-2 kernels are affected.\n\nThis patch adds a new CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11 config\noption which adds -fno-optimize-sibling-calls to CFLAGS_MODULE\nwhen building a Thumb-2 kernel.\n\nSigned-off-by: Dave Martin \u003cdave.martin@linaro.org\u003e\nAcked-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "a65d29225ed884456f3d34dcefd3a18df24af03b", "tree": "c0f5c1b1e985398913fd7e5622b3d5cc1c2b9380", "parents": [ "2bbd7e9b74271b2d6a14b4840fc44afbea83774d" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jan 08 16:18:51 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 23 17:24:13 2011 +0000" }, "message": "ARM: add \u0027uinstall\u0027 target for installing uboot kernels\n\nWe have \u0027install\u0027 and \u0027zinstall\u0027 for installing Image and zImage\nkernels, so add \u0027uinstall\u0027 to complete the set.\n\nThis allows developers to have a ~/bin/installkernel script which (eg)\ncopies the kernel to the tftp server automatically once the kernel\nhas built, resulting in a better workflow.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "10606aadb046d008c88d1a99b309357ca33d590e", "tree": "d1f49c21bc6d283fb78cad44e16334721714d652", "parents": [ "d11135ca4f6e626e1c8aa78de6d472a11a9e9811" ], "author": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Mon Feb 14 15:05:27 2011 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Tue Feb 22 13:51:15 2011 +0900" }, "message": "ARM: EXYNOS4: Update Kconfig and Makefile for the new ARCH_EXYNOS4\n\nThis patch changes the Kconfig and Makefile for the new ARCH_EXYNOS4.\nIt also updates arch/arm/Kconfig, Makeifile and arch/arm/mm/Kconfig\nto include support for the new ARCH_EXYNOS4.\n\nCc: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "dc810efb0ca5702c9d96782b99282d4b4383e877", "tree": "85237820baf61398b53057207fe8bf5014742841", "parents": [ "167879ae8924540660b187d759956f316dd6e8fe" ], "author": { "name": "Pawel Moll", "email": "pawel.moll@arm.com", "time": "Wed Feb 16 18:54:01 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Feb 21 19:29:25 2011 +0000" }, "message": "ARM: 6740/1: Place correctly notes section in the linker script\n\nCommit 18991197b4b588255ccabf472ebc84db7b66a19c added --build-id\nlinker option when toolchain supports it. ARM one does, but for some\nreason places the section at 0 when linker script doesn\u0027t mention it\nexplicitly.\n\nThe 1e621a8e3752367d4aae78a8ab00a18fb2793f34 worked around the problem\nremoving this section from binary image with explicit objcopy options,\nbut it still exists in vmlinux, confusing tools like debuggers and perf.\n\nThis problem was discussed here:\nhttp://lists.infradead.org/pipermail/linux-arm-kernel/2010-May/015994.html\nhttp://lists.infradead.org/pipermail/linux-arm-kernel/2010-May/015994.html\nbut the proposed changes to the linker script were substantial.\n\nThis patch simply places NOTES (36 bytes long, at least when compiled\nwith CodeSourcery toolchain) between data and bss, which seem to be\nthe right place (and suggested by the sample linker script in\ninclude/asm-generic/vmlinux.lds.h).\n\nIt is enough to place it correctly in vmlinux (so debuggers are happy):\n\nSection Headers:\n [11] .data PROGBITS c07ce000 7ce000 020fc0 00 WA 0 0 32\n [12] .notes NOTE c07eefc0 7eefc0 000024 00 AX 0 0 4\n [13] .bss NOBITS c07ef000 7eefe4 01e628 00 WA 0 0 32\nProgram Headers:\n LOAD 0x008000 0xc0008000 0xc0008000 0x7e6fe4 0x805628 RWE 0x8000\n NOTE 0x7eefc0 0xc07eefc0 0xc07eefc0 0x00024 0x00024 R E 0x4\nSection to Segment mapping:\n Segment Sections...\n 00 \u003c...\u003e .data .notes .bss\n 01 .notes\n\nand to get it exposed as /sys/kernel/notes used by perf tools.\n\nSigned-off-by: Pawel Moll \u003cpawel.moll@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "21bd6d37cf23e643020bf28b41844ff0040c9393", "tree": "2e6ab43de0d77a157491019ba03dc8d6e7579b49", "parents": [ "82e6923e1862428b755ec306b3dbccf926849314" ], "author": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Fri Jan 21 13:21:10 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Feb 11 16:11:01 2011 +0000" }, "message": "ARM: 6629/2: aaec2000: remove support for mach-aaec2000\n\nmach-aaec2000 is no longer actively maintained and is only receiving\nfixups to remain building with other kernel updates.\n\nCc: Bellido Nicolas \u003cml@acolin.be\u003e\nSigned-off-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "e399b1a4e1d205bdc816cb550d2064f2eb1ddc4c", "tree": "cf31e0aeafd972a8ea417dca1ff66c1e0315c907", "parents": [ "000d9c78eb5cd7f18e3d6a381d66e606bc9b8196" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 17 15:08:32 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 02 21:23:26 2011 +0000" }, "message": "ARM: v6k: introduce CPU_V6K option\n\nIntroduce a CPU_V6K configuration option for platforms to select if they\nhave a V6K CPU core. This allows us to identify whether we need to\nsupport ARMv6 CPUs without the V6K SMP extensions at build time.\n\nCurrently CPU_V6K is just an alias for CPU_V6, and all places which\nreference CPU_V6 are replaced by (CPU_V6 || CPU_V6K).\n\nSelect CPU_V6K from platforms which are known to be V6K-only.\n\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nTested-by: Sourav Poddar \u003csourav.poddar@ti.com\u003e\nTested-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "21f47fbc5b18da4a3db680959aee887612ec9a72", "tree": "46dd2d4010c5c258f30e2dfeb1ea6d9d2404a845", "parents": [ "1bae4ce27c9c90344f23c65ea6966c50ffeae2f5" ], "author": { "name": "Alexey Charkov", "email": "alchark@gmail.com", "time": "Thu Dec 23 13:11:21 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 25 15:07:01 2011 +0000" }, "message": "ARM: 6597/1: Add basic architecture support for VIA/WonderMedia 85xx SoC\u0027s\n\nThis adds support for the family of Systems-on-Chip produced initially\nby VIA and now its subsidiary WonderMedia that have recently become\nwidespread in lower-end Chinese ARM-based tablets and netbooks.\n\nSupport is included for both VT8500 and WM8505, selectable by a\nconfiguration switch at kernel build time.\n\nIncluded are basic machine initialization files, register and\ninterrupt definitions, support for the on-chip interrupt controller,\nhigh-precision OS timer, GPIO lines, necessary macros for early debug,\npulse-width-modulated outputs control, as well as platform device\nconfigurations for the specific drivers implemented elsewhere.\n\nSigned-off-by: Alexey Charkov \u003calchark@gmail.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "82e6923e1862428b755ec306b3dbccf926849314", "tree": "e0be095c30c7cbfeff2a2096cf53e9c2f92fed13", "parents": [ "1bae4ce27c9c90344f23c65ea6966c50ffeae2f5" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jan 21 11:04:45 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 24 19:05:19 2011 +0000" }, "message": "ARM: lh7a40x: remove unmaintained platform support\n\nlh7a40x has only been receiving updates for updates to generic code.\nThe last involvement from the maintainer according to the git logs was\nin 2006. As such, it is a maintainence burden with no benefit.\n\nThis gets rid of two defconfigs.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "1fef891761ddcbd7e57ec3961a0fb748003222ac", "tree": "d192f1677521e17f1a943f8df570dd6449aa0da8", "parents": [ "d3d4b60b12369eded0ea0c5dffee0888ec4d80cd", "1d3f33d541312acd34bd2fa780396d111a0f73b1" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 03 10:15:11 2011 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 03 10:15:11 2011 +0100" }, "message": "Merge branch \u0027sgu/mxs-core-v8\u0027 of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38-new\n" }, { "commit": "1d3f33d541312acd34bd2fa780396d111a0f73b1", "tree": "3eac23319f75a9423a4df5145a6a27baa58e8ef7", "parents": [ "4afbbb7c1b20dc10513c522849735a3293243af8" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@freescale.com", "time": "Mon Dec 13 20:55:03 2010 +0800" }, "committer": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Mon Dec 20 17:30:44 2010 +0100" }, "message": "ARM: mxs: Add build configuration for mxs\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@freescale.com\u003e\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\n" }, { "commit": "e48ab1c16ff2af83e6a2a1228504710a5d339d08", "tree": "6f8b911583ecb48ca18a2c724bb99d3d9ab10815", "parents": [ "2a8bd56a382ec0e24249b1adaca4f38bd529e825" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Thu Nov 11 18:06:17 2010 +0100" }, "committer": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Fri Nov 19 21:53:49 2010 +0100" }, "message": "ARM: imx: move mx25 support to mach-imx\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\n" }, { "commit": "f779b7dd3259ec138c7aba793f0602b20262af83", "tree": "7ed94961b196c81fcd413e2b04d1e6945d6d227a", "parents": [ "3c00079b31f910309b30ed5c2fd2b7a2d86bba60", "fe0cdec8bad919fd91cd344123906a55f3857209" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Oct 19 20:12:24 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Oct 19 20:12:24 2010 +0100" }, "message": "Merge branch \u0027for-rmk\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable\n\nConflicts:\n\tarch/arm/mach-at91/include/mach/system.h\n\tarch/arm/mach-imx/mach-cpuimx27.c\n\nAT91 conflict resolution:\nAcked-by: Anders Larsen \u003cal@alarsen.net\u003e\nIMX conflict resolution confirmed by Uwe Kleine-König.\n" }, { "commit": "49b7a491b797305a0dc373e7f7a5d2a87955c819", "tree": "deae43f642752f6bed5b6850fb93dd05f764ebae", "parents": [ "19a2c06548db1fa69c40be5bf3ad2095d6119871" ], "author": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Tue Sep 07 15:47:18 2010 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Mon Oct 18 10:33:34 2010 +0900" }, "message": "ARM: S5P64X0: Update Kconfig and Makefile\n\nThis patch updates the Kconfig and Makefile for the S5P6440 and S5P6450\nmachines. It also updates arch/arm/ Kconfig and Makefile to include for\nsupport ARCH_S5P64X0 with one kernel image.\n\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "a9fda02bfc91a281cd812ae15dabe6bfb9574f90", "tree": "d7be703f341870f15f87a59a63976f650078b4d6", "parents": [ "aa3090005d27f3c7fba915ccea36b97b669fa3ab", "ec706dab290c486837d4a825870ab052bf200279" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Oct 04 22:23:26 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Oct 04 22:23:30 2010 +0100" }, "message": "Merge branch \u0027for_rmk\u0027 of git://git.linaro.org/kernel/linux-linaro-next into devel-stable\n" }, { "commit": "c62d0f2ac18d38265ccf0e821e6afee60a0c89b5", "tree": "41f31ec8607d3c82317a2b38191a43a2f39e6d57", "parents": [ "899611ee7d373e5eeda08e9a8632684e1ebbbf00" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Wed Sep 01 09:37:05 2010 -0400" }, "committer": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Fri Oct 01 22:26:38 2010 -0400" }, "message": "ARM: link board specific files after core files\n\nThis allows for board specific issues to override decisions made in generic\ncode that might not be suitable due to some errata or the like, by making\nthe initcall hooks from those board specific files run after the core ones,\ntherefore avoiding ugly #ifdef\u0027s in core code.\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nTested-by: Dave Martin \u003cdave.martin@linaro.org\u003e\nTested-by: Jason Hui \u003cjason.hui@linaro.org\u003e\n" }, { "commit": "83ef3338a2ae5d5bd9f5f6803b900b8067660054", "tree": "a759da3a601d092889321cf49b9f003726147be1", "parents": [ "509344b8b4d365b7ff3bce97198d83a57b7c3f31" ], "author": { "name": "Hans J. Koch", "email": "hjk@linutronix.de", "time": "Fri Sep 17 18:13:56 2010 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Sep 17 21:55:07 2010 +0200" }, "message": "ARM: Introduce plat-tcc\n\nThis patch introduces support for the tcc platform by creating an\narch/arm/plat-tcc and arch/arm/mach-tcc8k directories and adding\nbasic include files plus Kconfig and Makefile.\n\nSigned-off-by: \"Hans J. Koch\" \u003chjk@linutronix.de\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "bd365591dfb942d1447b8043e21e8ff112630db4", "tree": "0c4336455cf1eef0d46e05ff49e445cc8a57f650", "parents": [ "2f174847b0fdd4eb9f482030a284db24aef7a97f" ], "author": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Sat Aug 14 23:56:21 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Aug 14 23:58:43 2010 +0100" }, "message": "ARM: 6328/1: Build with -fno-dwarf2-cfi-asm\n\nCommit d0679c7 restricted this workaround to powerpc only, but it turns\nout that ARM needs it as well. Fixes\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d16310 .\n\nReported-and-Tested-by: Robert Nelson \u003crobertcnelson@gmail.com\u003e\nAcked-by: Mikael Pettersson \u003cmikpe@it.uu.se\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "0b019a41553a919965bb02d07d54e3e6c57a796d", "tree": "6e329b4159b440d2aac5200a5c07103fe261c096", "parents": [ "5f6878b0d22f9b93f9698f88c335007e2a3c3bbc", "054d5c9238f3c577ad51195c3ee7803613f322cc" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Aug 10 23:17:52 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Aug 10 23:17:52 2010 +0100" }, "message": "Merge branches \u0027master\u0027 and \u0027devel\u0027 into for-linus\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/mm/Kconfig\n" }, { "commit": "2192482ee5ce5d5d4a6cec0c351b2d3a744606eb", "tree": "15ab3c23d05e98829741b03922b51b81fd102b64", "parents": [ "500b9fc922cbec572f4fd1436533bfaed5011262", "a68fefe0d2f364ac3d8497ef37dcad713c261103" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Aug 09 14:07:19 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Aug 09 14:07:19 2010 +0100" }, "message": "Merge branch \u0027for-rmk\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable\n\nConflicts:\n\tarch/arm/Kconfig\n" }, { "commit": "c5f800656bc985b448b1d848d309648826536543", "tree": "efac337e79b73bf24ce639840e41f77bcd46d707", "parents": [ "cdd854bc42b5e6c79bbbc40c6600d995ffe6e747" ], "author": { "name": "Erik Gilling", "email": "konkers@android.com", "time": "Thu Jan 21 16:53:02 2010 -0800" }, "committer": { "name": "Erik Gilling", "email": "konkers@android.com", "time": "Thu Aug 05 14:51:42 2010 -0700" }, "message": "[ARM] tegra: initial tegra support\n\nv2: Fixes from Mike Rapoport\n\t- remove unused header files (mach/dma.h and mach/nand.h)\n\t- remove tegra 1 references from Makefile.boot\n\nv2: fixes from Russell King\n\t- remove mach/io.h include from mach/iomap.h\n\t- fix whitespace in Kconfig\n\nv2: from Colin Cross\n\t- fix invalid immediate in debug-macro.S\n\nv3:\n\t- allow selection of multiple boards\n\nSigned-off-by: Colin Cross \u003cccross@android.com\u003e\nSigned-off-by: Erik Gilling \u003ckonkers@android.com\u003e\n" }, { "commit": "cc0e72b87a4afb520fab09b67e1c16e4ec4aaadb", "tree": "e105572441c714d86c84d611f375dd1c32f372c6", "parents": [ "cfca3a619baeaba3a0037fef5da48108e9c0bb1c" ], "author": { "name": "Changhwan Youn", "email": "chaos.youn@samsung.com", "time": "Fri Jul 16 12:15:38 2010 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Thu Aug 05 18:32:42 2010 +0900" }, "message": "ARM: S5PV310: Add new Kconfig and Makefiles\n\nThis patch adds the Kconfig and Makefile for the new S5PV310 SoC.\nIt also updates arch/arm Kconfig, Makefile and arch/arm/mm/Kconfig\nto include support for the new S5PV310.\n\nSigned-off-by: Changhwan Youn \u003cchaos.youn@samsung.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "7b70c4275f28702b76b273c8534c38f8313812e9", "tree": "1df2229ca02466bd1adda814ac5c37aa0a597db1", "parents": [ "ceb0885d3b01bb2e2f18765770e212914f2864be", "a20df564d15bd28e3df24e1c65b885bd74d23f17" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 14:20:16 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 14:20:16 2010 +0100" }, "message": "Merge branch \u0027devel-stable\u0027 into devel\n\nConflicts:\n\tarch/arm/kernel/entry-armv.S\n\tarch/arm/kernel/setup.c\n\tarch/arm/mm/init.c\n" }, { "commit": "d50f58bbd979e86378dfdec982452041f0e604ef", "tree": "511938033b3346983175c70dd4d0afeb00b59b82", "parents": [ "129961ecaf21c9ee899ad9067d917c1aa172fb7a", "79d3c2c2395a89a70d25f0c77c11afc87efab89b" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:48:37 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:48:37 2010 +0100" }, "message": "Merge branch \u0027for-rmk\u0027 of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable\n" }, { "commit": "129961ecaf21c9ee899ad9067d917c1aa172fb7a", "tree": "49eafdcf4d6ac490ecdd92c36c285817872eaf34", "parents": [ "392c57a2ec811db37ae45adc513704cf92ba3e69", "cccf59abea4e1c36322e365d6e61ff7de1f3ee07" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:48:02 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:48:02 2010 +0100" }, "message": "Merge branch \u0027wells/lpc32xx-arch_v2\u0027 of git://git.lpclinux.com/linux-2.6-lpc into devel-stable\n" }, { "commit": "408059495a372f1a9845672e58608fb6d8ec0c40", "tree": "735cc82830761f1d2c123f6024b315aea0c0bfbf", "parents": [ "680b2862bcc7974c87d666529120a1cfe8fe2f8d" ], "author": { "name": "Kevin Wells", "email": "wellsk40@gmail.com", "time": "Tue Jul 27 08:49:04 2010 -0700" }, "committer": { "name": "Kevin Wells", "email": "wellsk40@gmail.com", "time": "Tue Jul 27 08:49:04 2010 -0700" }, "message": "ARM: Add support for the LPC32XX arch\n\nAdd LPC32XX support in arch/arm/Kconfig and arch/arm/Makefile\n\nSigned-off-by: Kevin Wells \u003cwellsk40@gmail.com\u003e\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\n" }, { "commit": "074694956b547de9a6b85b919c0bb13853b88c2d", "tree": "3abf7837bdb3c03a76f0d4d8b41a6bb1b06797e2", "parents": [ "551823e7e031978b990e952c70ae01f8eba8d2c4" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Mon Jun 14 15:56:58 2010 +0200" }, "committer": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Wed Jun 30 08:59:44 2010 +0200" }, "message": "ARM: imx: move mx1 support to mach-imx\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\n" }, { "commit": "c9c6fe5033191d82e1d819105485c795062107fd", "tree": "87232f9ed53a239651dad39fa736f6b660beb666", "parents": [ "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jun 24 15:41:31 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jun 24 15:41:31 2010 +0100" }, "message": "ARM: Remove support for LinkUp Systems L7200 SDP.\n\nThis hasn\u0027t been actively maintained for a long time, only receiving\nthe occasional build update when things break. I doubt anyone has\none of these on their desks anymore.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "d109167b9c1002770d194644d5580a1f3588f7fc", "tree": "0cbc6fc238b6ce639080a9bf1971c813534d8777", "parents": [ "f1d4cbef18999548ade1007bfb63cc1fa69c385e" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Thu Jun 10 15:11:13 2010 +0200" }, "committer": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Thu Jun 24 15:40:38 2010 +0200" }, "message": "ARM: imx: rename mach dir for mx21 and mx27 to mach-imx\n\nFinally all imx code should end up there, start with mach-mx2. While\ntouching all files rename some files to use a hyphen instead of an\nunderscore.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\n" }, { "commit": "c743f38013aeff58ef6252601e397b5ba281c633", "tree": "b364e1690aff8a0dd97a83d4cb17bcadcdb5bd19", "parents": [ "cc92c28b2db5b406657ecc05235d4ca4e222ae34" ], "author": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Mon May 24 23:55:42 2010 -0400" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Mon Jun 14 21:31:00 2010 -0400" }, "message": "ARM: initial stack protector (-fstack-protector) support\n\nThis is the very basic stuff without the changing canary upon\ntask switch yet. Just the Kconfig option and a constant canary\nvalue initialized at boot time.\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\n" }, { "commit": "d472d1a1c82ade81d2854db2ff4c9694ed66612e", "tree": "66b00d6d13a73ef4aff17bb35c72926d4cd12940", "parents": [ "9bfe99a8f95122f83f3c894b1071b61e2b6d4990", "d01cd639c96cd683a22432afd4c39ea690c87f16" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 24 20:34:20 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 24 23:08:36 2010 +0100" }, "message": "Merge branch \u0027for-rmk/samsung3\u0027 of git://git.fluff.org/bjdooks/linux into devel-stable\n\nConflicts:\n\tarch/arm/Kconfig\n" }, { "commit": "acc84707d3487735fc666fdeab76185d086428c0", "tree": "2ad25308d04b36f1fc2d0d9413f3a4fa9179331e", "parents": [ "2af716ba77d26f3d291fe7c7f5a5108d4945c69f" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Thu May 20 07:51:08 2010 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Thu May 20 15:28:32 2010 +0900" }, "message": "ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework\n\nThis patch moves S5PC100 SoC support to plat-s5p framework. Most\nperiperal support code has been already moved from plat-s5pc1xx to\nmach-s5pc100.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "349e1fba7e63b1067b5915337986060c13d9edd0", "tree": "7450f8355fb7f050066aab3fb94c1073e2080f7a", "parents": [ "fa9dc265ace9774e62f0e31108e5f47911124bda", "504d36e91ac12ccdb0e1193cee7bef9831a1c99e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 11:49:33 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 11:49:33 2010 -0700" }, "message": "Merge branch \u0027for-linus/samsung4\u0027 of git://git.fluff.org/bjdooks/linux\n\n* \u0027for-linus/samsung4\u0027 of git://git.fluff.org/bjdooks/linux: (98 commits)\n Input: s3c24xx_ts - depend on SAMSUNG_DEV_TS and update menu entry\n Input: s3c24xx_ts - Add FEAT for Samsung touchscreen support\n Input: s3c24xx_ts - Implement generic GPIO configuration callback\n ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename configuration\n ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen\n ARM: S3C64XX: Add touchscreen platform device definition\n ARM: SAMSUNG: Move mach/ts.h to plat/ts.h\n ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100\n ARM: S5PC100: Move frame buffer helpers from plat-s5pc1xx to mach-s5pc100\n ARM: S5PC100: gpio.h cleanup\n ARM: S5PC100: Move gpio support from plat-s5pc1xx to mach-s5pc100\n ARM: S5PC100: Use common functions for gpiolib implementation\n drivers: serial: S5PC100 serial driver cleanup\n ARM: S5PC100: Pre-requisite clock patch for plat-s5pc1xx to plat-s5p move\n ARM: SAMSUNG: Copy common I2C0 device helpers to machine directories\n ARM: SAMSUNG: move driver strength gpio configuration helper to common dir\n ARM: S5PV210: Add GPIOlib support\n ARM: SAMSUNGy: fix broken timer irq base\n ARM: SMDK6440: Add audio devices on board\n ARM: S5P6440: Add audio platform devices\n ...\n" }, { "commit": "32457942b90aabb9242b450f02d18d9c8d982916", "tree": "6472b77016f83f2ada7a7e2ca83a9803f313f1a8", "parents": [ "6071399674e813d797d9f458ec8913b86c85398e", "f64bea4318a73e833d0a9b8400cc0f6cee957da3" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:11 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed May 19 18:04:11 2010 +0900" }, "message": "ARM: Merge for-2635/fb-updates1\n\nMerge branch \u0027for-2635/fb-updates1\u0027 into for-linus/samsung2\n" }, { "commit": "ac1d426e825ab5778995f2f6f053ca2e6b45c622", "tree": "75b91356ca39463e0112931aa6790802fb1e07a2", "parents": [ "fda0e18c8a7a3e02747c2b045b4fcd2c920410b9", "a3685f00652af83f12b63e3b4ef48f29581ba48b" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 17 17:24:04 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 17 17:24:04 2010 +0100" }, "message": "Merge branch \u0027devel-stable\u0027 into devel\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/include/asm/system.h\n\tarch/arm/mm/Kconfig\n" }, { "commit": "c39e52a793f5599582dbacf4d8f62634a492f79e", "tree": "7379649b5a722ceb45cc66f049a7571c66054dcd", "parents": [ "762253741942d8ddbaca1c1ee62d7ed57544332b", "8716011315a5b2fa932fa1e7570c34975ed2cb14", "4fec9978822a66b25f5645eb20c115034a18cfd1", "de4338f40e48da3b604219909a1d4aa7aa60870f", "47ab0dee661dbd5aca67abe44a333e471134fbf9", "2a847513cdecd517f7efc06296c539c3a936cf98", "883413341e479d4e9f9c69def4884b4c6e1cef4e", "3e9cc70590287f7cb7e38793bbf968b3362b7612", "4c18e77f718cdda33363132127db4df795eadbd9", "f417cbad7394fdccec850d13d7d5621516d693ce" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 17 11:52:31 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 17 11:53:39 2010 +0100" }, "message": "Merge branches \u0027at91\u0027, \u0027bcmring\u0027, \u0027ep93xx\u0027, \u0027iop\u0027, \u0027misc\u0027, \u0027nomadik\u0027, \u0027omap\u0027, \u0027pxa\u0027, \u0027spear\u0027 and \u0027versatile\u0027 into devel\n\nConflicts:\n\tarch/arm/Makefile\n\tarch/arm/common/Makefile\n\tarch/arm/mm/Kconfig\n" }, { "commit": "a3685f00652af83f12b63e3b4ef48f29581ba48b", "tree": "18ec9eed3deabf3c6b9bec206765a4dd0d8cf9ec", "parents": [ "b12f3cbd7a9a869eae1eb108da02526b132ba80b", "63b1f51b2405573d47bf5b9ab6e7cd5c697d3dcc" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 17 08:49:25 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 17 08:49:25 2010 +0100" }, "message": "Merge branch \u0027for-rmk/2635\u0027 of git://git.fluff.org/bjdooks/linux into devel-stable\n" } ], "next": "c4761b69f4c3bd2f6e62d9cba6d78b5fd4b24203" }