)]}' { "log": [ { "commit": "bc36748153eea3813018fae3e361a941213e9ada", "tree": "74458d04c633f3be7198a3cb42ed36ed7889c837", "parents": [ "890d84fac09b7e3986317c9f6d53a7924ac10161" ], "author": { "name": "Lee Jones", "email": "lee.jones@linaro.org", "time": "Thu May 03 11:23:47 2012 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 01 02:04:46 2012 +0200" }, "message": "ARM: ux500: Provide regulator support for SMSC911x via Device Tree\n\nThis patch adds a fixed regulator for use by the SMSC911x Ethernet\nchip driver into the db8500 Device Tree. It also references other\nregulators required by the same device.\n\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Lee Jones \u003clee.jones@linaro.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "798115958967c8223f3d17e829a891564e8ea4cb", "tree": "f1dcfcffc32047c74854d5788b08c9114f70408f", "parents": [ "b224b9ac8c42afc40cba170187df3d0cdbb13c20" ], "author": { "name": "Fabio Estevam", "email": "festevam@gmail.com", "time": "Tue May 29 15:07:37 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:33 2012 -0700" }, "message": "rtc: rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC\n\nIn order to keep consistency with other rtc drivers,rename CONFIG_RTC_MXC\nto CONFIG_RTC_DRV_MXC.\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nAcked-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\n[akpm@linux-foundation.org: fix missed arch/arm/configs/imx_v6_v7_defconfig]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "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": "84a442b9a16ee69243ce7fce5d6f6f9c3fbdee68", "tree": "332a0c901d8ab2ffb19b8ce14b4b094bf5b08657", "parents": [ "39b6cc668c5ecc66f6f9c9293ffab681cb6f7065", "deb88cc3c69975cbd9875ed9fac259b351f6b64d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:57:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:57:47 2012 -0700" }, "message": "Merge tag \u0027dt2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc device tree conversions (part 2) from Olof Johansson:\n \"These continue the device tree work from part 1, this set is for the\n tegra, mxs and imx platforms, all of which have dependencies on clock\n or pinctrl changes submitted earlier.\"\n\nFix up trivial conflicts due to nearby changes in\ndrivers/{gpio/gpio,i2c/busses/i2c}-mxs.c\n\n* tag \u0027dt2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits)\n ARM: dt: tegra: invert status\u003ddisable vs status\u003dokay\n ARM: dt: tegra: consistent basic property ordering\n ARM: dt: tegra: sort nodes based on bus order\n ARM: dt: tegra: remove duplicate device_type property\n ARM: dt: tegra: consistenly use lower-case for hex constants\n ARM: dt: tegra: format regs properties consistently\n ARM: dt: tegra: gpio comment cleanup\n ARM: dt: tegra: remove unnecessary unit addresses\n ARM: dt: tegra: whitespace cleanup\n ARM: dt: tegra cardhu: fix typo in SDHCI node name\n ARM: dt: tegra: cardhu: register core regulator tps62361\n ARM: dt: tegra30.dtsi: Add SMMU node\n ARM: dt: tegra20.dtsi: Add GART node\n ARM: dt: tegra30.dtsi: Add Memory Controller(MC) nodes\n ARM: dt: tegra20.dtsi: Add Memory Controller(MC) nodes\n ARM: dt: tegra: Add device tree support for AHB\n ARM: dts: enable audio support for imx28-evk\n ARM: dts: enable i2c device for imx28-evk\n i2c: mxs: add device tree probe support\n ARM: dts: enable mmc for imx28-evk\n ...\n" }, { "commit": "27953437059c64d14086196eb96f43c78caa9db3", "tree": "0cfd5fb21262a6db3de0c64462847b4c0c43e9df", "parents": [ "2c757fd5d1a92086f225a75a8fac7cab242d11b0", "3c0dec5f58b3c7b3627715126d1bf9b030a076f0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:42:29 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:42:29 2012 -0700" }, "message": "Merge tag \u0027clock\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc clock driver changes from Olof Johansson:\n \"The new clock subsystem was merged in linux-3.4 without any users,\n this now moves the first three platforms over to it: imx, mxs and\n spear.\n\n The series also contains the changes for the clock subsystem itself,\n since Mike preferred to have it together with the platforms that\n require these changes, in order to avoid interdependencies and\n conflicts.\"\n\nFix up trivial conflicts in arch/arm/mach-kirkwood/common.c (code\nremoved in one branch, added OF support in another) and\ndrivers/dma/imx-sdma.c (independent changes next to each other).\n\n* tag \u0027clock\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (97 commits)\n clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().\n clk: Provide dummy clk_unregister()\n SPEAr: Update defconfigs\n SPEAr: Add SMI NOR partition info in dts files\n SPEAr: Switch to common clock framework\n SPEAr: Call clk_prepare() before calling clk_enable\n SPEAr: clk: Add General Purpose Timer Synthesizer clock\n SPEAr: clk: Add Fractional Synthesizer clock\n SPEAr: clk: Add Auxiliary Synthesizer clock\n SPEAr: clk: Add VCO-PLL Synthesizer clock\n SPEAr: Add DT bindings for SPEAr\u0027s timer\n ARM i.MX: remove now unused clock files\n ARM: i.MX6: implement clocks using common clock framework\n ARM i.MX35: implement clocks using common clock framework\n ARM i.MX5: implement clocks using common clock framework\n ARM: Kirkwood: Replace clock gating\n ARM: Orion: Audio: Add clk/clkdev support\n ARM: Orion: PCIE: Add support for clk\n ARM: Orion: XOR: Add support for clk\n ARM: Orion: CESA: Add support for clk\n ...\n" }, { "commit": "0877aa3908aaeeae8fc2850691668c4315d3db56", "tree": "bdb4ee1c1939dfb7a3d2ca10db4b1bbd6eac26e9", "parents": [ "786f02b719f2285e2c0350b6a04dab4a1a0871a1", "4a230408e83698a3d7ff0a9988a58675c2c92cb9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:19:31 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:19:31 2012 -0700" }, "message": "Merge tag \u0027defconfig\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc defconfig updates from Olof Johansson:\n \"For the first time, we have one branch that collects just updates to\n defconfig files, mostly for adapting to changes in other subsystems.\"\n\n* tag \u0027defconfig\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: PRIMA2: add prima2_defconfig for CSR SiRFprimaII\n ARM: tegra: update defconfig\n ARM: tegra: update defconfig\n ARM: imx_v6_v7_defconfig: Add SPI NOR support\n ARM: imx_v4_v5_defconfig: Let CONFIG_MACH_IMX27_DT be built by default\n" }, { "commit": "2ff2b289a695807e291e1ed9f639d8a3ba5f4254", "tree": "e4b7f44e5cc1582ba2be8aeba221f4841f4c86a6", "parents": [ "88d6ae8dc33af12fe1c7941b1fae2767374046fd", "73787190d04a34e6da745da893b3ae8bedde418f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 18:18:55 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 18:18:55 2012 -0700" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf changes from Ingo Molnar:\n \"Lots of changes:\n\n - (much) improved assembly annotation support in perf report, with\n jump visualization, searching, navigation, visual output\n improvements and more.\n\n - kernel support for AMD IBS PMU hardware features. Notably \u0027perf\n record -e cycles:p\u0027 and \u0027perf top -e cycles:p\u0027 should work without\n skid now, like PEBS does on the Intel side, because it takes\n advantage of IBS transparently.\n\n - the libtracevents library: it is the first step towards unifying\n tracing tooling and perf, and it also gives a tracing library for\n external tools like powertop to rely on.\n\n - infrastructure: various improvements and refactoring of the UI\n modules and related code\n\n - infrastructure: cleanup and simplification of the profiling\n targets code (--uid, --pid, --tid, --cpu, --all-cpus, etc.)\n\n - tons of robustness fixes all around\n\n - various ftrace updates: speedups, cleanups, robustness\n improvements.\n\n - typing \u0027make\u0027 in tools/ will now give you a menu of projects to\n build and a short help text to explain what each does.\n\n - ... and lots of other changes I forgot to list.\n\n The perf record make bzImage + perf report regression you reported\n should be fixed.\"\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (166 commits)\n tracing: Remove kernel_lock annotations\n tracing: Fix initial buffer_size_kb state\n ring-buffer: Merge separate resize loops\n perf evsel: Create events initially disabled -- again\n perf tools: Split term type into value type and term type\n perf hists: Fix callchain ip printf format\n perf target: Add uses_mmap field\n ftrace: Remove selecting FRAME_POINTER with FUNCTION_TRACER\n ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code()\n ftrace: Make ftrace_modify_all_code() global for archs to use\n ftrace: Return record ip addr for ftrace_location()\n ftrace: Consolidate ftrace_location() and ftrace_text_reserved()\n ftrace: Speed up search by skipping pages by address\n ftrace: Remove extra helper functions\n ftrace: Sort all function addresses, not just per page\n tracing: change CPU ring buffer state from tracing_cpumask\n tracing: Check return value of tracing_dentry_percpu()\n ring-buffer: Reset head page before running self test\n ring-buffer: Add integrity check at end of iter read\n ring-buffer: Make addition of pages in ring buffer atomic\n ...\n" }, { "commit": "f6a26ae7699416d86bea8cb68ce413571e9cab3c", "tree": "e91b7a7c7513151fe583721f7435cc9f5cdc4f42", "parents": [ "cdd3a354a05b0c33fe33ab11a0fb0838396cad19", "48a5765e5104f1afd22c75c5030af3a6cf24b4c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 13:32:53 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 13:32:53 2012 -0700" }, "message": "Merge tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc board specific changes from Olof Johansson:\n \"While we generally attempt to get rid of board specific files and\n replace them with device tree based descriptions, a lot of platforms\n have not come that far:\n\n In shmobile, we add two new board files because their recently started\n effort to add DT support has not proceeded enough to use it for all of\n the important hardware.\n\n In Kirkwood, we are adding support for new boards with a combination\n of DT and board file contents in multiple cases.\n\n pxa/mmp and imx are extending support for existing board files but not\n adding new ones.\"\n\nFix up trivial conflicts in arch/arm/mach-{mmp/ttc_dkb.c,shmobile/{Kconfig,Makefile}}\n\n* tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)\n ARM: shmobile: fix smp build\n ARM: kirkwood: Add support for RaidSonic IB-NAS6210/6220 using devicetree\n kirkwood: Add iconnect support\n orion/kirkwood: create a generic function for gpio led blinking\n kirkwood/orion: fix orion_gpio_set_blink\n ARM: kirkwood: Define DNS-320/DNS-325 NAND in fdt\n kirkwood: Allow nand to be configured via. devicetree\n mtd: Add orion_nand devicetree bindings\n ARM: kirkwood: Basic support for DNS-320 and DNS-325\n ARM: mach-shmobile: Use DT_MACHINE for armadillo 800 eva\n ARM: mach-shmobile: Use DT_MACHINE for KZM9G\n ARM: pxa: hx4700: Add Synaptics NavPoint touchpad\n ARM: pxa: Use REGULATOR_SUPPLY macro\n ARM: mach-shmobile: kzm9g: enable SMP boot\n ARM: mach-shmobile: kzm9g: defconfig update\n ARM: mach-shmobile: kzm9g: add PCF8757 gpio-key\n ARM: mach-shmobile: kzm9g: add SDHI support\n ARM: mach-shmobile: kzm9g: add MMCIF support\n ARM: mach-shmobile: kzm9g: correct screen direction\n ARM: mach-shmobile: sh73a0.h: add GPIO_NR\n ...\n" }, { "commit": "813a95e5b4fa936bbde10ef89188932745dcd7f4", "tree": "571ca345861ffb89b45fabe26fcab4e133c8537b", "parents": [ "9f639269ed1522c7d69c54cc8b80ab8ee53fcb10", "f3f08dcb9965f42378851ce888fb7539607712e6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:39:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:39:42 2012 -0700" }, "message": "Merge tag \u0027pinctrl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm soc-specific pinctrl changes from Olof Johansson:\n \"With this, five platforms are moving to the relatively new pinctrl\n subsystem for their pin management, replacing the older soc specific\n in-kernel interfaces with common code.\n\n There is quite a bit of net addition of code for each platform being\n added to the pinctrl subsystem. But the payback comes later when\n adding new boards can be done by only providing new device trees\n instead.\"\n\nFix up trivial conflicts in arch/arm/mach-ux500/{Makefile,board-mop500.c}\n\n* tag \u0027pinctrl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (61 commits)\n mtd: nand: gpmi: fix compile error caused by pinctrl call\n ARM: PRIMA2: select PINCTRL and PINCTRL_SIRF in Kconfig\n ARM: nomadik: enable PINCTRL_NOMADIK where needed\n ARM: mxs: enable pinctrl support\n video: mxsfb: adopt pinctrl support\n ASoC: mxs-saif: adopt pinctrl support\n i2c: mxs: adopt pinctrl support\n mtd: nand: gpmi: adopt pinctrl support\n mmc: mxs-mmc: adopt pinctrl support\n serial: mxs-auart: adopt pinctrl support\n serial: amba-pl011: adopt pinctrl support\n spi/imx: adopt pinctrl support\n i2c: imx: adopt pinctrl support\n can: flexcan: adopt pinctrl support\n net: fec: adopt pinctrl support\n ARM: ux500: switch MSP to using pinctrl for pins\n ARM: ux500: alter MSP registration to return a device pointer\n ARM: ux500: switch to using pinctrl for uart0\n ARM: ux500: delete custom pin control system\n ARM: ux500: switch over to Nomadik pinctrl driver\n ...\n" }, { "commit": "b324c67d4800e59171f48d9ddab6cbfb59110482", "tree": "a16509a710e76fa24c01514b60aed06b7db13716", "parents": [ "8dca6010d44cc722a94dc6da96560f9083dac782", "396d81cd0fe12ce5d1f6d159f093f9315d2837bc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:30:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:30:52 2012 -0700" }, "message": "Merge tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull device tree conversions for arm-soc, part 1, from Olof Johansson:\n \"The spear3xx, lpc32xx, shmobile and mmp platforms are joining the game\n of booting using device trees, which is a great step forward for them.\n at91 and spear have pretty much completed this process with a huge\n amount of work being put into at91. The other platforms are\n continuing the process.\n\n We finally start to see the payback on this investment, as new\n machines are getting supported purely by adding a .dts source file\n that can be completely independent of the kernel source.\"\n\nFix up trivial conflict in arch/arm/Kconfig\n\n* tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits)\n ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files\n arm/dts: omap4-panda: Add LEDs support\n arm/dts: omap4-sdp: Add LEDs support\n arm/dts: twl4030: Add twl4030-gpio node\n OMAP4: devices: Do not create mcpdm device if the dtb has been provided\n OMAP4: devices: Do not create dmic device if the dtb has been provided\n Documentation: update docs for mmp dt\n ARM: dts: refresh dts file for arch mmp\n ARM: mmp: support pxa910 with device tree\n ARM: mmp: support mmp2 with device tree\n gpio: pxa: parse gpio from DTS file\n ARM: mmp: support DT in timer\n ARM: mmp: support DT in irq\n ARM: mmp: append CONFIG_MACH_MMP2_DT\n ARM: mmp: fix build issue on mmp with device tree\n ARM: ux500: Enable PRCMU Timer 4 (clocksource) for Device Tree\n ARM: ux500: Disable SMSC911x platform code registration when DT is enabled\n ARM: ux500: Fork cpu-db8500 platform_devs for sequential DT enablement\n ARM: ux500: Do not attempt to register non-existent i2c devices on Snowball\n ARM: SPEAr3xx: Correct keyboard data passed from DT\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": "16ee6576e25b83806d26eb771138249fcfb5eddc", "tree": "7c717b80f28b5c59ba673dc00f2ca9bd0fc068d4", "parents": [ "16fa7e8200fb9066b77a3f27cbed8e4a9fc71998", "9b63776fa3ca96c4ecda76f6fa947b7b0add66ac" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Fri May 18 13:13:33 2012 -0300" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Fri May 18 13:13:33 2012 -0300" }, "message": "Merge remote-tracking branch \u0027tip/perf/urgent\u0027 into perf/core\n\nMerge reason: We are going to queue up a dependent patch:\n\n\"perf tools: Move parse event automated tests to separated object\"\n\nThat depends on:\n\ncommit e7c72d8\nperf tools: Add \u0027G\u0027 and \u0027H\u0027 modifiers to event parsing\n\nConflicts:\n\ttools/perf/builtin-stat.c\n\nConflicted with the recent \u0027perf_target\u0027 patches when checking the\nresult of perf_evsel open routines to see if a retry is needed to cope\nwith older kernels where the exclude guest/host perf_event_attr bits\nwere not used.\n\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "4a230408e83698a3d7ff0a9988a58675c2c92cb9", "tree": "5892562618d09a22a69bdd28ca33d1646514edd5", "parents": [ "f05b3563f88b357f8ceedf0cca2b10ae9a4a9dca" ], "author": { "name": "Barry Song", "email": "Baohua.Song@csr.com", "time": "Tue May 15 11:11:18 2012 +0800" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue May 15 17:00:52 2012 +0200" }, "message": "ARM: PRIMA2: add prima2_defconfig for CSR SiRFprimaII\n\nSigned-off-by: Barry Song \u003cBaohua.Song@csr.com\u003e\nCc: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "0fa7be407dc101afe2d3dc99ded99de34c967a52", "tree": "457d3a7938b073d31b1e2c23ec75abfda0b4eaac", "parents": [ "7af07ad902cce88ebbd2ce0e681d0c541e8f95fa" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue May 15 11:24:34 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue May 15 14:42:57 2012 +0200" }, "message": "ARM: nomadik: enable PINCTRL_NOMADIK where needed\n\nThe nomadik gpio code has been converted to pinctrl, but the nomadik platform\nstill expects the old code to be present. Change it to use the new one instead.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nReviewed-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "be944f1e79063e4f27b46c74f10c86b2387afa9f", "tree": "b967deea15c20b01e13c6a3879c0c377ebca5a48", "parents": [ "98a5f124b69c259b0698a3f8e8720c87df3b15ad", "4fc5e65cdbf736a5311b07aa54a916ccaa91ab5f" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue May 15 10:33:20 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue May 15 10:33:20 2012 +0200" }, "message": "Merge branch \u0027board-new\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/boards\n\n\"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e writes:\n\n Renesas ARM-based platforms: new boards support for v3.5\n\n * Support for the KZM-A9-GT board from Kuninori Morimoto and Magnus Damm.\n * Support for the armadillo800eva board from Kuninori Morimoto and Magnus Damm.\n\n This is based on the Renesas core SoC code updates I\u0027ve sent a separate pull\n request for.\n\n* \u0027board-new\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas: (29 commits)\n ARM: mach-shmobile: Use DT_MACHINE for armadillo 800 eva\n ARM: mach-shmobile: Use DT_MACHINE for KZM9G\n ARM: mach-shmobile: kzm9g: enable SMP boot\n ARM: mach-shmobile: kzm9g: defconfig update\n ARM: mach-shmobile: kzm9g: add PCF8757 gpio-key\n ARM: mach-shmobile: kzm9g: add SDHI support\n ARM: mach-shmobile: kzm9g: add MMCIF support\n ARM: mach-shmobile: kzm9g: correct screen direction\n ARM: mach-shmobile: sh73a0.h: add GPIO_NR\n ARM: mach-shmobile: pfc-sh73a0: fixup MSEL2CR MSEL18 for I2C-3\n ARM: mach-shmobile: kzm9g: add ST1232 Touchscreen support\n ARM: mach-shmobile: kzm9g: add LCDC support\n ARM: mach-shmobile: kzm9g: add external USB Host support\n ARM: mach-shmobile: kzm9g: add SMSC 9221 support\n ARM: mach-shmobile: kzm9g: add defconfig\n ARM: mach-shmobile: add KZM-A9-GT board support\n ARM: mach-shmobile: armadillo800eva: defconfig update\n ARM: mach-shmobile: clock-r8a7740: add sh-eth clock\n ARM: mach-shmobile: r8a7740: reserve DMA memory for the frame buffer\n ARM: mach-shmobile: armadillo800eva: add MMCIF support\n ...\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "86e43a7aff23ce828273cbef6b0d2b0abe095ac8", "tree": "e49b55bd229fe8d77831ef11e218ed7dda3e991b", "parents": [ "6ec4ed82e9cf2ee5c83fd529af69b2c63b004809", "ace1297f7222ec5d6a33f41e792a21e999551924" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 21:35:09 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 21:35:09 2012 +0200" }, "message": "Merge branch \u0027dt\u0027 of git://github.com/hzhuang1/linux into next/dt\n\n* \u0027dt\u0027 of git://github.com/hzhuang1/linux:\n Documentation: update docs for mmp dt\n ARM: dts: refresh dts file for arch mmp\n ARM: mmp: support pxa910 with device tree\n ARM: mmp: support mmp2 with device tree\n gpio: pxa: parse gpio from DTS file\n ARM: mmp: support DT in timer\n ARM: mmp: support DT in irq\n ARM: mmp: append CONFIG_MACH_MMP2_DT\n ARM: mmp: fix build issue on mmp with device tree\n\nIncludes an update to v3-4-rc5\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "f05b3563f88b357f8ceedf0cca2b10ae9a4a9dca", "tree": "0d6a59c7d9654db615fe417c7920a4b6ec40f320", "parents": [ "fca2447c7d09f1c0852e556a3884209879a6fa7c", "06d96e1e6dbdcc88d20b21cc54ee8388c074f47f" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 20:55:12 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 20:55:12 2012 +0200" }, "message": "Merge branch \u0027for-3.5/defconfig2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/defconfig\n\n* \u0027for-3.5/defconfig2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:\n ARM: tegra: update defconfig\n" }, { "commit": "fcd8d84a585f3578a9ebdd27e757495a27415322", "tree": "58f37676ad56d322e47d0fa7343afb85445f7649", "parents": [ "eae0185a9677d3ff0c1781ee196f2ef42deb0ea1", "66a2886d867343eff6bf2646bea2c923d0cbf620", "4f5a9fd341e8ffd825ecf56155df6fe6c3d732b1" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 17:43:35 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 17:43:59 2012 +0200" }, "message": "Merge branches \u0027spear/clock\u0027 and \u0027imx/clock\u0027 into next/clock\n\nUpdated to resolve dependencies.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "090a80cba39f2763a488b6f7c65e38922d5aa17a", "tree": "ba3797eeca74c42be95bc592ed2db1be99e329d2", "parents": [ "36be50515fe2aef61533b516fa2576a2c7fe7664", "eb3f995d7e73fd78b8fcdc55cfbf01a74a09a6e8" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 15:59:18 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 17:35:50 2012 +0200" }, "message": "Merge branch \u0027spear/13xx\u0027 into next/soc2\n\n* spear/13xx:\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 SPEAr13xx: Add source files\n SPEAr13xx: Add header files\n\nDepends on clock, pinctrl and dt branches to go first.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "d57bde8d73e809c935cbe68fa950e430d0a6201c", "tree": "db07b126c1c1c7515c46bb3c706e8fe7f354fde5", "parents": [ "0d8e08f5a3b8cda3785e5bc854d89ebba60e9994" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Wed Apr 18 08:31:46 2012 +0530" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 17:34:10 2012 +0200" }, "message": "SPEAr13xx: Add defconfig\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\n" }, { "commit": "66a2886d867343eff6bf2646bea2c923d0cbf620", "tree": "ad44dcca4fa410ab2c16b4964f6c19571421b4df", "parents": [ "d2819f80d465672b09c2f4cb52303b7f951c4d0f", "f613e220aebfafb653f7ce264950c15c99e27f2a" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 17:31:45 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 17:31:45 2012 +0200" }, "message": "Merge branch \u0027spear/dt\u0027 into spear/clock\n\nConflicts:\n\tarch/arm/mach-spear3xx/clock.c\n\tarch/arm/mach-spear3xx/include/mach/generic.h\n\tarch/arm/mach-spear3xx/include/mach/misc_regs.h\n\tarch/arm/mach-spear3xx/spear320.c\n\tarch/arm/mach-spear6xx/clock.c\n\tarch/arm/mach-spear6xx/include/mach/misc_regs.h\n\nResolve even more merge conflicts.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "d2819f80d465672b09c2f4cb52303b7f951c4d0f", "tree": "aa0262703e86b97ad1460c722e78d7233e24e3bb", "parents": [ "5df33a62c4a028d6fc7f2dcc159827d09b7334b8", "366695ff706669d40459174b1cbb78fca42f4e06" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 15:33:42 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 15:33:42 2012 +0200" }, "message": "Merge branch \u0027spear/pinctrl\u0027 into spear/clock\n\nConflicts:\n\tarch/arm/mach-spear3xx/Makefile\n\tarch/arm/mach-spear3xx/clock.c\n\tarch/arm/mach-spear3xx/include/mach/generic.h\n\tarch/arm/mach-spear6xx/clock.c\n\tarch/arm/plat-spear/Makefile\n\tdrivers/pinctrl/core.c\n\nThis resolves some annoying merge conflicts.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "a515be1ca7df947db0f6018a174f49507affcdbc", "tree": "8f5be875e2902bee701a6840ba1fbb19e8d0384a", "parents": [ "9183857d503f915ee05abb6e03cea7253dcbace6", "fecf84c14fa755b0e30ba64a290db658a06c76fb" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat May 12 22:36:02 2012 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat May 12 22:36:02 2012 +0200" }, "message": "Merge branch \u0027renesas-kzm9g\u0027 into renesas-board-new\n\n* renesas-kzm9g:\n ARM: mach-shmobile: kzm9g: enable SMP boot\n ARM: mach-shmobile: kzm9g: defconfig update\n ARM: mach-shmobile: kzm9g: add PCF8757 gpio-key\n ARM: mach-shmobile: kzm9g: add SDHI support\n ARM: mach-shmobile: kzm9g: add MMCIF support\n ARM: mach-shmobile: kzm9g: correct screen direction\n ARM: mach-shmobile: sh73a0.h: add GPIO_NR\n ARM: mach-shmobile: pfc-sh73a0: fixup MSEL2CR MSEL18 for I2C-3\n ARM: mach-shmobile: kzm9g: add ST1232 Touchscreen support\n ARM: mach-shmobile: kzm9g: add LCDC support\n ARM: mach-shmobile: kzm9g: add external USB Host support\n ARM: mach-shmobile: kzm9g: add SMSC 9221 support\n ARM: mach-shmobile: kzm9g: add defconfig\n ARM: mach-shmobile: add KZM-A9-GT board support\n\nConflicts:\n\tarch/arm/mach-shmobile/Makefile\n" }, { "commit": "fecf84c14fa755b0e30ba64a290db658a06c76fb", "tree": "6f49de3640d94615f057e5aa4961050b791ffef6", "parents": [ "cc2504524b5b14dc03682dc1f04fb1644f692767" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Thu May 10 00:10:29 2012 -0700" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat May 12 22:34:18 2012 +0200" }, "message": "ARM: mach-shmobile: kzm9g: enable SMP boot\n\nUpdate the KZM9G defconfig and the code in platsmp.c to support SMP on\nthe sh73a0 based KZM9G board. Also fix up the earlyprintk setting that\nwas previously incorrect.\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nAcked-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "cc2504524b5b14dc03682dc1f04fb1644f692767", "tree": "8fb2228e2bda5d1d105b58dda93eac9143269efa", "parents": [ "1e35464125a71cb6a46a20862dcbcd196e779921" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Wed Apr 25 20:58:06 2012 -0700" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat May 12 22:34:18 2012 +0200" }, "message": "ARM: mach-shmobile: kzm9g: defconfig update\n\nThis patch enable GPIO-KEY/FSI,\nand remove debug settings,\nand be cleanuped by c2330e286f68f1c408b4aa6515ba49d57f05beae script\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nAcked-by: Simon Horman \u003chorms@verge.net.au\u003e\nAcked-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "6d3c9135cc4da91ea6cebcc1aefc33d13a50957e", "tree": "642aa405e31490e8de8ce8e5a63ab0824545ae17", "parents": [ "9b93e244fa056fadbe9f108c057c027b5cfbddf2" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Tue Apr 10 20:57:45 2012 -0700" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat May 12 22:34:14 2012 +0200" }, "message": "ARM: mach-shmobile: kzm9g: add defconfig\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nTested-by: Simon Horman \u003chorms@verge.net.au\u003e\nAcked-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "9183857d503f915ee05abb6e03cea7253dcbace6", "tree": "ff2f268202a7c154d23fbb4438609f1c95dce2a5", "parents": [ "9c18f238c1ec36b9912b5b36ae24e0c221179044" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Wed Apr 25 20:57:13 2012 -0700" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat May 12 22:33:07 2012 +0200" }, "message": "ARM: mach-shmobile: armadillo800eva: defconfig update\n\nThis patch enable USBFunc/SHDI/MMCIF,\nremove debug settings,\nand cleanuped by c2330e286f68f1c408b4aa6515ba49d57f05beae script\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nAcked-by: Simon Horman \u003chorms@verge.net.au\u003e\nAcked-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "edc4910171f332466fa8f164de3d2395d80163db", "tree": "4e34ecff3daf53b09051ef2d42858451953da5fb", "parents": [ "4d22e564ca7bb5c7340c782aedd93bed99f3fb41" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Fri Apr 06 01:29:36 2012 -0700" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat May 12 22:33:04 2012 +0200" }, "message": "ARM: mach-shmobile: armadillo800eva: add defconfig\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nTested-by: Simon Horman \u003chorms@verge.net.au\u003e\nAcked-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "f613e220aebfafb653f7ce264950c15c99e27f2a", "tree": "85896228e59fd4482741aa94183194ee9da45497", "parents": [ "30a0d03776ff2d7ee5ec72d515d8e3cc6d2f0c62" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Tue May 01 18:16:50 2012 +0530" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat May 12 21:55:43 2012 +0200" }, "message": "SPEAr: Update defconfigs\n\nThis patch updates following configuration:\n- Update MTD specific configurations\n- Enables JFFS2 FS support\n- Updates 6xx defconfig, with recent changes done by Arnd in 6xx Kconfig\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Stefan Roese \u003csr@denx.de\u003e\n" }, { "commit": "4a0dfe69fe489b06ae5bad26ae67ae8aefaca3aa", "tree": "cdac4232b95103402e8328815be80105620d41f2", "parents": [ "7488185d0777ef84be7b365b08037fc7213010f6", "a0f5e3631b07cabf624e7d818df76d47d9d21017" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri May 11 22:59:11 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri May 11 22:59:11 2012 -0700" }, "message": "Merge branch \u0027imx/pinctrl/for-3.5\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6 into next/pinctrl\n\n* \u0027imx/pinctrl/for-3.5\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6: (290 commits)\n ARM: mxs: enable pinctrl support\n video: mxsfb: adopt pinctrl support\n ASoC: mxs-saif: adopt pinctrl support\n i2c: mxs: adopt pinctrl support\n mtd: nand: gpmi: adopt pinctrl support\n mmc: mxs-mmc: adopt pinctrl support\n serial: mxs-auart: adopt pinctrl support\n serial: amba-pl011: adopt pinctrl support\n spi/imx: adopt pinctrl support\n i2c: imx: adopt pinctrl support\n can: flexcan: adopt pinctrl support\n net: fec: adopt pinctrl support\n tty: serial: imx: adopt pinctrl support\n mmc: sdhci-imx-esdhc: adopt pinctrl support\n ARM: imx6q: switch to use pinctrl subsystem\n ARM: mxs: enable pinctrl dummy states\n ARM: imx: enable pinctrl dummy states\n +3.4-rc5 update\n" }, { "commit": "6c4d4efb9d19017f0eef3893912f3dec513ef8e9", "tree": "f395e30e79b1f367f249054ccfcce81de01f58f0", "parents": [ "2954ff395bcf69cb31dbe500bec20ce0944ea19e" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Fri May 04 21:42:41 2012 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Sat May 12 13:32:17 2012 +0800" }, "message": "ARM: mxs: always build in device tree support\n\nAs the ultimate for mxs platform is to convert over to device tree,\nlet\u0027s start always building in device tree support for the platform.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Marek Vasut \u003cmarex@denx.de\u003e\n" }, { "commit": "06d96e1e6dbdcc88d20b21cc54ee8388c074f47f", "tree": "778289b3ac297ba2d0ab11e6fcbff8447abe4214", "parents": [ "c6b556a53970c262571b2cf60661a33ddeb1a651" ], "author": { "name": "Laxman Dewangan", "email": "ldewangan@nvidia.com", "time": "Thu May 10 20:38:44 2012 +0000" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Fri May 11 14:53:24 2012 -0600" }, "message": "ARM: tegra: update defconfig\n\nNew options enabled:\n* REGULATOR_TPS62360: for Cardhu\u0027s CPU core\n* MEMORY: dependency for TEGRA*_MC\n\nSigned-off-by: Laxman Dewangan \u003cldewangan@nvidia.com\u003e # (parts)\nSigned-off-by: Hiroshi DOYU \u003chdoyu@nvidia.com\u003e # (parts)\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\n" }, { "commit": "ff658f46d4641ac023b0d807d7e946822c925829", "tree": "8a992e3beabd003f171ea067ce523160d4dd64ec", "parents": [ "afeb36f128e387f8ad2cd7cd94020bae984ea9b4", "8500746fab2fd69843425fa82192a4e377905336" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu May 10 23:38:20 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu May 10 23:38:32 2012 -0700" }, "message": "Merge tag \u0027omap-board-for-v3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards\n\nBoard specific changes for omap.\n\nNote that these are based on omap-pm-regulator-for-v3.5 as\nboth branches are adding twl regulators.\n\nBy Paul Gortmaker (8) and others\nvia Linus Torvalds (38) and others\n* tag \u0027omap-board-for-v3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:\n OMAP: omap4panda: Use common configuration for V1V8, V2V1 supplies\n OMAP: 4430SDP: Use common configuration for V1V8, V2V1 supplies\n OMAP4: twl-common: Add twl6030 V1V8, V2V1 SMPS common configuration\n ARM: OMAP: Mark Beagleboard-xM MMC bus as 4-bit\n Add MSUB support for the LogicPD OMAP3530 DevKits\n ARM: OMAP: rx51: Platform support for lis3lv02d accelerometer\n ARM: OMAP2+: craneboard: register emac device\n ARM: OMAP4: board-omap4panda: Register platform device for HDMI audio codec\n ARM: OMAP4: board-4430sdp: Register platform device for HDMI audio codec\n ARM: OMAP: devices: Register platform devices for HDMI audio\n ARM: OMAP3: igep0020: Add support for Micron NAND Flash storage memory\n ARM: OMAP2+: nand: Make board_onenand_init() visible to board code\n ARM: OMAP3: cm-t35: add support for power off\n ARM: OMAP: WiLink platform data for the PandaBoard\n ARM: OMAP2PLUS: Enable HIGHMEM\n ARM: OMAP: omap2plus_defconfig: Enable ehci-omap and sms95xx support\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "fca2447c7d09f1c0852e556a3884209879a6fa7c", "tree": "79c056f4bf455df745689ec5d0d83ae4149b450b", "parents": [ "473a37e86350c2b502044db0d22bdf36fd5d3302", "c6b556a53970c262571b2cf60661a33ddeb1a651" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 09 23:53:54 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 09 23:53:54 2012 -0700" }, "message": "Merge branch \u0027for-3.5/defconfig\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/defconfig\n\nBy Stephen Warren\nvia Stephen Warren\n* \u0027for-3.5/defconfig\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:\n ARM: tegra: update defconfig\n" }, { "commit": "5d4e9971c8adbb87bbe7a32a1864e0f1c91ee380", "tree": "0033dd0286f95497b7948ebb8d16df6b499ddc0e", "parents": [ "a8822e2d570bc265c9fa0347710fbcc7bef8b327" ], "author": { "name": "Govindraj.R", "email": "govindraj.raja@ti.com", "time": "Wed May 09 14:19:13 2012 -0700" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Wed May 09 14:19:13 2012 -0700" }, "message": "ARM: OMAP: omap2plus_defconfig: Enable ehci-omap and sms95xx support\n\nBoards like beagle and panda use ehci based smsc95xx lan chips\none has to manually enable these supports to get nfs working\non these boards. So keep these support enable by default.\n\nSigned-off-by: Govindraj.R \u003cgovindraj.raja@ti.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "d5a2a1ba838f60d92bf67c5eef533e95453752cb", "tree": "f6436b5e2b430197f37e49ffff23e91ef694b303", "parents": [ "e1851240a891a305946814587497f121b900b4be", "d48b97b403d23f6df0b990cee652bdf9a52337a3" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 09 02:31:01 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 09 02:31:01 2012 -0700" }, "message": "Merge tag \u0027v3.4-rc6\u0027 into next/cleanup\n\nLinux 3.4-rc6\n\nResolve conflict where an u5500 file had a bugfix go in, but was\ndeleted in the branch staged for next merge window.\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "47fad7c6f8d9f64780793cc67d8280259538c31c", "tree": "33c79cb7389ce309bc2d019512c16f12925c7f95", "parents": [ "e86bde3caea693b2e615e7b3664e6273160bf864", "26690863e2c1fa4fee5f6137b219f4b8a1a02287" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue May 01 00:08:35 2012 +0200" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 09 02:15:45 2012 -0700" }, "message": "Merge tag \u0027at91-for-next-dt\u0027 of git://github.com/at91linux/linux-at91 into next/dt\n\n\"Jean-Christophe PLAGNIOL-VILLARD\" \u003cplagnioj@jcrosoft.com\u003e writes:\n\n ARM: AT91 more DT material\n\n New SoC conversion and boards support\n\n SoC convertion to DT:\n - at91sam9260\n - at91sam9263\n\n boards:\n - Atmel at91sam9g20ek/9263ek\n - Calao TNY-A9260/A9263/A9G20\n - Calao USB-A9260/A9263\n - Ethernnut 5\n - Kizbox\n\n* tag \u0027at91-for-next-dt\u0027 of git://github.com/at91linux/linux-at91: (32 commits)\n Ethernut 5 board support\n ARM: at91: add kizbox board dt support.\n ARM: at91: DT: add Calao TNY A9263 board support\n ARM: at91: DT: add Calao USB A9263 board support\n ARM: at91: add at91sam9263ek DT support\n ARM: at91: add at91sam9263 DT support\n ARM: at91: standard device init only if DT is not populated.\n ARM: at91: DT: add Calao USB A9260 DT support\n ARM: at91: Calao USB A926x factorize common binding in usb_a9260_common\n ARM: at91: USB A926x update nand partition\n ARM: at91: add at91sam9g20ek boards dt support\n arm: at91: add Calao TNY-A9260 and TNY-A9G20 board support\n ARM: at91: add at91sam9260 DT support\n ARM: at91: add defconfig for device tree\n ARM: at91/dt: do not specify the board any more\n ARN: at91: introduce SOC_AT91xxx define to allow to compile SoC core support\n ARM: at91: add SOC_AT91SAM9 kconfig option to factorise select\n ARM: at91: pm select memory controler at runtime\n ARM: at91: move at91_init_leds to board init\n ARM: at91: do not pin mux the UARTs in init_early\n ...\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n[olof: rebuilt branch due to drop of an early merge]\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "22251a9b72c46758254caf3250e6d80ea2b088c8", "tree": "6ddda34305080e3195cc5fe11d1d39d65dc69cb6", "parents": [ "48bfdb216ed7a2a75aa2909869f3266b3736f88a", "89982a181b0783335d79e6e5264a23009aa7c6e9" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Apr 22 23:26:08 2012 +0200" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 09 02:15:09 2012 -0700" }, "message": "Merge branch \u0027lpc32xx/dt\u0027 of git://git.antcom.de/linux-2.6 into next/dt\n\nRoland Stigge \u003cstigge@antcom.de\u003e writes:\n this is a rearrangement of all mach-lpc32xx specific patches for device\n tree conversion. Please note that:\n\n * It builds upon the i2c-pnx changes (see previous pull request, branch\n lpc32xx/i2c)\n * Dave Miller gave permission to merge the lpc_eth.c change via arm-soc\n (patch 1/8)\n\n The rest of the patches is mach-lpc32xx only.\n\n* \u0027lpc32xx/dt\u0027 of git://git.antcom.de/linux-2.6:\n ARM: LPC32xx: Defconfig update\n ARM: LPC32xx: Move common code to common.c\n ARM: LPC32xx: Device tree support\n ARM: LPC32xx: DTS files for device tree conversion\n ARM: LPC32xx: Remove obsolete platform Kconfig\n ARM: LPC32xx: clock.c registration adjustment\n ARM: LPC32xx: clock.c cleanup\n net: Add device tree support to LPC32xx\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n[olof: rebuilt branch due to drop of an early merge]\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "48bfdb216ed7a2a75aa2909869f3266b3736f88a", "tree": "2c81b923d38b4c0c914815246b1bd9f66f8de453", "parents": [ "19f36bfa0021617ce07a79e186673d2da2258b60", "b41a216dafe4dd23c95cb4203de288f773a097a6" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Apr 22 23:19:01 2012 +0200" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 09 02:14:52 2012 -0700" }, "message": "Merge branch \u0027depends/i2c/lpc32xx\u0027 into next/dt\n\nAs a prerequisite for merging the lpc32xx DT changes, this\npulls in the depends/i2c/lpc32xx branch that contains\nchanges to the pnx-i2c driver, which are already in the\ni2c tree. The branch is available also on\n\n git://git.antcom.de/linux-2.6.git lpc32xx/i2c\n\nRoland Stigge \u003cstigge@antcom.de\u003e writes:\n\n this is the series of the 4 patches adding device tree support to i2c-pnx\n (used by LPC32xx) that Wolfram Sang already applied to the i2c subsystem.\n Since both drivers/i2c/ and mach-lpc32xx are touched here, there will\n probably be conflicts that you need to be aware of.\n\n I\u0027m posting this again for arm-soc since the actual mach-lpc32xx specific\n DT conversion builds upon those changes (see next pull request), especially\n in arch/arm/mach-lpc32xx/common.c.\n\n Wolfram already gave permission to merge this via arm-soc, but please\n coordinate and tell me if I can help resolving this.\n\nFurther, this implicitly updates the next/dt branch to v3.4-rc4, which\ncauses a trivial conflict from a change in one branch in code that\ngets removed in another.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n[olof: rebuilt branch due to drop of an early merge]\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\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": "ced62c33fc434b9d44118c9f35803af8088cc3fe", "tree": "34d1145899e0e5853c4d5b45162f86bbe46941ea", "parents": [ "3ff80abce7d0d3c1eacda53e73c94a57ade2e0a5", "6838e601e6dc63440fd4315c1c2f3a2ef4ccdd6e" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 02 17:07:03 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 02 17:07:03 2012 +0200" }, "message": "Merge tag \u0027imx-cleanup\u0027 of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup\n\nFrom: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n\nARM: i.MX cleanups for 3.5\n\n* tag \u0027imx-cleanup\u0027 of git://git.pengutronix.de/git/imx/linux-2.6: (5 commits)\n ARM: mx53: fix pad definitions for MX53_PAD_EIM_D28__I2C1_SDA and MX53_PAD_GPIO_8__CAN1_RXCAN\n ARM: imx/eukrea_mbimx27-baseboard: fix typo in error message\n ARM: i.MX51 iomux: add missed definitions for SION-bit and mode for some pads\n arm: imx: add missing select IMX_HAVE_PLATFORM for MACH_MX35_3DS in Kconfig\n arm: imx: make various struct sys_timer static\n\nIncludes an update to 3.4-rc4\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "ca731a5da08926f669360342bcad50353fbe141a", "tree": "670a546ca3accd4647d46a6b5c90a6b067fb7a0a", "parents": [ "989b7135666c464d90e296752802b2f37d168588", "c0af14d3212a54c6a11759cd6b78e755c68714a1" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Apr 30 23:49:49 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Apr 30 23:53:58 2012 +0200" }, "message": "Merge branch \u0027ux500-gpio-pins-for-arm-soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/gpio\n\nLinus Walleij \u003clinus.walleij@linaro.org\u003e writes:\n\n This is a pull request for the GPIO and pin control stuff\n accumulated in the ST-Ericsson tree. Here we have:\n\n - Improvements and fixes and a custom pin config API from\n Rabin Vincent\n\n - Device Tree bindings from Lee Jones\n\n - Some accumulated patches by yours truly.\n\n - A MSP platform data init patch from Ola Lilja that is merged\n here due to dependency on pin config work. It is to be\n used with work being worked on in parallel in the ALSA\n SoC subsystem.\n\n If you wonder about the custom pin config implementation this\n is to be used as a transition base as I am rewriting the\n driver to use pinctrl. Expect a final pull request on top\n of this one that will move the ux500 over to pinctrl.\n\n* \u0027ux500-gpio-pins-for-arm-soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:\n ARM: ux500: Add support for MSP I2S-devices\n drivers/gpio: gpio-nomadik: Add support for irqdomains\n drivers/gpio: gpio-nomadik: Apply Device Tree bindings\n ARM: ux500: update pin handling\n ARM: ux500: implement pin API\n ARM: ux500: remove a bunch of internal pull-ups\n plat-nomadik: new sleep mode pincfg macros\n gpio/nomadik: use ioremap() instead of static mappings\n gpio/nomadik: support low EMI mode\n gpio/nomadik: fix spurious interrupts with SKE\n gpio/nomadik: cache [rf]w?imsc\n gpio/nomadik: don\u0027t set SLPM to 1 for non-wakeup pins\n\nAlso includes an update to v3.4-rc4.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "c6b556a53970c262571b2cf60661a33ddeb1a651", "tree": "5d8f155968073a9979d84b024712e2116e354843", "parents": [ "e816b57a337ea3b755de72bec38c10c864f23015" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Apr 11 10:37:02 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Fri Apr 27 12:21:17 2012 -0600" }, "message": "ARM: tegra: update defconfig\n\nNew options enabled:\n* RUNTIME_PM\n* ISL29028 (light and proximity)\n* INPUT_MPU3050 (gyro)\n* BATTERY_SBS\n* EM3027 RTC\n* INPUT_MISC (dependency)\n* POWER_SUPPLY (dependency)\n\nThe IIO option seems to have been moved recently too.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\n" }, { "commit": "6e76538b9ef2b2a14ad9b57d65dc35d151765917", "tree": "abb95e720792583a5656137650eb0549c8967c10", "parents": [ "dadb3660a3ad162ac6e76be7262c72f48177f1aa", "9b4d1cbb1391ae603c20cbf8c0beb66e38397196" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Apr 27 09:40:06 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Apr 27 09:40:06 2012 -0700" }, "message": "Merge branch \u0027v3.4-samsung-fixes-3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes\n\n* \u0027v3.4-samsung-fixes-3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:\n ARM: SAMSUNG: add missing MMC_CAP2_BROKEN_VOLTAGE capability\n ARM: EXYNOS: Fix compilation error when CONFIG_OF is not defined\n ARM: EXYNOS: Fix resource on dev-dwmci.c\n ARM: S3C24XX: Fix build warning for S3C2410_PM\n ARM: mini2440_defconfig: Fix build error\n ARM: EXYNOS: Fix incorrect initialization of GIC\n ARM: EXYNOS: use \u0027exynos4-sdhci\u0027 as device name for sdhci controllers\n" }, { "commit": "d86a3480543941344625d1c71aa70510d01f7b11", "tree": "1963fc8d152077fa22b529cee3d326c7c7b26ba2", "parents": [ "4e42ff9b1a1727cde9548cacf0bdd790cac3f903" ], "author": { "name": "Fabio Estevam", "email": "festevam@gmail.com", "time": "Fri Apr 27 01:05:02 2012 -0300" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Fri Apr 27 12:17:50 2012 +0200" }, "message": "ARM: imx_v6_v7_defconfig: Add SPI NOR support\n\nAdd SPI NOR support in defconfig.\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "4e42ff9b1a1727cde9548cacf0bdd790cac3f903", "tree": "4f3ad704819db99e4554788d87dee77a1fad838b", "parents": [ "66f75a5d028beaf67c931435fdc3e7823125730c" ], "author": { "name": "Fabio Estevam", "email": "festevam@gmail.com", "time": "Wed Apr 11 22:12:12 2012 -0300" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Fri Apr 27 12:17:30 2012 +0200" }, "message": "ARM: imx_v4_v5_defconfig: Let CONFIG_MACH_IMX27_DT be built by default\n\nLet CONFIG_MACH_IMX27_DT be built by default.\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "392d65a9adbe2f09707d2de27110dafb9c8dc08b", "tree": "413412af5991cbc6489ecaca5e615bedbd3d0b41", "parents": [ "33b07b8be7f0e1e8e4184e3473d71f174e4b0641" ], "author": { "name": "Robert Richter", "email": "robert.richter@amd.com", "time": "Thu Apr 05 18:24:44 2012 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Thu Apr 26 13:52:52 2012 +0200" }, "message": "perf: Remove PERF_COUNTERS config option\n\nRenaming remaining PERF_COUNTERS options into PERF_EVENTS.\n\nThink we can get rid of PERF_COUNTERS now.\n\nSigned-off-by: Robert Richter \u003crobert.richter@amd.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/1333643084-26776-5-git-send-email-robert.richter@amd.com\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "fd273d4415027f9b519d5a94e4fc030f278f2ad3", "tree": "5c45f3b95817b82bff534e4b1f094c0147a23393", "parents": [ "66f75a5d028beaf67c931435fdc3e7823125730c", "435ca24116bc5365a10fa0be1bf1c1e4c5680157" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Apr 25 11:04:14 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Apr 25 11:04:14 2012 -0700" }, "message": "Merge tag \u0027imx-features-board-20120411-2\u0027 of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards\n\n* tag \u0027imx-features-board-20120411-2\u0027 of git://git.pengutronix.de/git/imx/linux-2.6:\n ARM i.MX: Visstrim_M10: Add board version detection.\n ARM: imx_v4_v5_defconfig: enable adc and touch driver of mc13783\n ARM: i.MX: i.MX35-PDK: Add regulator support\n" }, { "commit": "18ea1fcd7ef19e496c523d814d52261cc4777f51", "tree": "e4866734597547455d1ed956861a74df4aebad3a", "parents": [ "5699b0ca05f781d496d20ba87f916bd9eec7ea6a" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Apr 21 06:57:29 2012 -0700" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Tue Apr 24 13:49:59 2012 -0700" }, "message": "ARM: mini2440_defconfig: Fix build error\n\nThis is needed to fix mini2440_defconfig after the platform\nfiles have been moved around.\n\narm-none-linux-gnueabi-ld: no machine record defined\narm-none-linux-gnueabi-ld: no machine record defined\narm-none-linux-gnueabi-ld: no machine record defined\nmake: *** [.tmp_vmlinux1] Error 1\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "f3215b427bec2add8b5c776e8f50c3ba35b0e8f1", "tree": "b477413742ceeb72f7fb01353163743c1ae2e072", "parents": [ "0b7ee71794b043de8a02d8887b69a57e4003106a" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Wed Mar 21 09:18:03 2012 +0530" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Apr 22 22:41:35 2012 +0200" }, "message": "SPEAr: Update defconfigs\n\nRecently device tree support is added for SPEAr3xx \u0026 SPEAr6xx and we must\nupgrade defconfig for that to get compiled. This patches does it.\n\nThere are few more rearrangements done in defconfig automatically, when i run\nmake savedefconfig.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\n" }, { "commit": "6540afeae0c66c99c24d43446dab90836170a4e6", "tree": "9d4ed5065c9ad95ad8bc4a26a6f5924e83019acd", "parents": [ "17d2f847e6aa1181024cb881fdc6cbad18f11b04", "39ecc143b4c1f3d42e8300e7f5274681b99f95c2" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Apr 22 22:22:34 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Apr 22 22:28:48 2012 +0200" }, "message": "Merge tag \u0027at91-3.5-cleanup\u0027 of git://github.com/at91linux/linux-at91 into next/cleanup\n\nNicolas Ferre \u003cnicolas.ferre@atmel.com\u003e writes:\n First batch of AT91 cleanup for 3.5 kernel.\n - The biggest improvement of this series is the ability to compile several\n AT91 SoCs in one kernel image.\n For now on it\u0027s limited to the DT-enabled boards but we can compile all\n the core together.\n - The Kconfig series is stacked before other patches as it is simple and\n non-intrusive. Its goal is to remove too restrictive dependencies on\n SoC names. This will allow to add support for newer SoC seamlessly.\n - Some very \"cosmetic\" Kconfig changes are also added (entry names,\n comments, etc.).\n\n* tag \u0027at91-3.5-cleanup\u0027 of git://github.com/at91linux/linux-at91: (19 commits)\n ARM: at91: add defconfig for device tree\n ARM: at91/dt: do not specify the board any more\n ARN: at91: introduce SOC_AT91xxx define to allow to compile SoC core support\n ARM: at91: add SOC_AT91SAM9 kconfig option to factorise select\n ARM: at91: pm select memory controler at runtime\n ARM: at91: move at91_init_leds to board init\n ARM: at91: do not pin mux the UARTs in init_early\n ARM: at91: drop at91_set_serial_console\n ARM: at91: uncompress: autodetect the uart to use\n ARM: at91: uncompress Store UART address in a variable\n hwrng: Kconfig: remove dependency for atmel-rng driver\n Input: Kconfig: remove dependency for atmel_tsadcc driver\n rtc: Kconfig: remove dependency for AT91 rtc driver\n ARM: at91/Kconfig: website link for AT91SAM9G20-EK\n ARM: at91/Kconfig: add AT91SAM9x5 family to AT91_EARLY_DBGU0 entry\n ARM: at91/Kconfig: add clarifications to AT91SAM9M10G45-EK entry\n ARM: at91/Kconfig: add comment to at91sam9x5 family entry\n ARM: at91/Kconfig: change at91sam9g45 entry\n ARM: at91: change AT91 Kconfig entry comment\n\nAlso updates the cleanup branch to v3.4-rc3.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "89982a181b0783335d79e6e5264a23009aa7c6e9", "tree": "38f3b8e91e4a1893fa8602963cdd3f3dac4a12a9", "parents": [ "be20dbc87879582e121e0525adcada13b3a8f476" ], "author": { "name": "Roland Stigge", "email": "stigge@antcom.de", "time": "Sun Apr 22 12:01:20 2012 +0200" }, "committer": { "name": "Roland Stigge", "email": "stigge@antcom.de", "time": "Sun Apr 22 12:01:20 2012 +0200" }, "message": "ARM: LPC32xx: Defconfig update\n\nThis patch updates the defconfig for the LPC32xx SoC after device tree\nconversion:\n\n* Adjustment to DT conversion, added new driver support\n* Added IPv6\n* Increased kernel log buffer\n\nSigned-off-by: Roland Stigge \u003cstigge@antcom.de\u003e\n" }, { "commit": "ea53671a70cc983419247e2f216fbf48eeaa9fa5", "tree": "e978a222b3bd8bcfa59f0c81a5982147b202b65e", "parents": [ "b462fca45dc1823105e7ada58085fa890f531b67", "f27962ac68a9b4cf17958522ecd7c10ce2375ee1" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Apr 18 21:28:16 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Apr 18 21:28:16 2012 -0700" }, "message": "Merge branch \u0027fixes-for-arm-soc-20120416\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes\n\n* \u0027fixes-for-arm-soc-20120416\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:\n ARM: ux500: update defconfig\n ARM: ux500: Fix unmet direct dependency\n ARM: ux500: wake secondary cpu via resched\n" }, { "commit": "9fd4a50a12d699207c6a65558dfa674a3fd3f150", "tree": "dc3363adebcc21fceb5beb2b6a5d02c4738d2d06", "parents": [ "e816b57a337ea3b755de72bec38c10c864f23015" ], "author": { "name": "Fabio Estevam", "email": "festevam@gmail.com", "time": "Wed Apr 11 20:24:39 2012 -0300" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Apr 18 11:52:23 2012 +0200" }, "message": "ARM: imx_v4_v5_defconfig: Add support for CONFIG_REGULATOR_FIXED_VOLTAGE\n\nAdd support for CONFIG_REGULATOR_FIXED_VOLTAGE.\n\nWithout this option the mx27_3ds cannot have the external Ethernet functional\ndue to the need of smsc regulators.\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "39ecc143b4c1f3d42e8300e7f5274681b99f95c2", "tree": "1dd892bc2149d036d8a2674145962eb03c864a75", "parents": [ "7c8a98c8c0475f0659beb9798f6ddebc2c840079" ], "author": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Sun Apr 08 17:40:06 2012 +0200" }, "committer": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Tue Apr 17 14:47:22 2012 +0200" }, "message": "ARM: at91: add defconfig for device tree\n\nThis will enable all current SoC support on DT (9260, 9g20, 9g45 family\nand 9x5 family).\n\nSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\n" }, { "commit": "1e3ce2b8545390a2aee8dbfcd49ca4161b636000", "tree": "c8bfe5aec8b5d0f88459cc83c9f3076092d2c6da", "parents": [ "1441bd325bbbcd38d190b2444481b23cdf70069a" ], "author": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Fri Apr 06 11:51:50 2012 +0800" }, "committer": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Tue Apr 17 14:47:21 2012 +0200" }, "message": "ARN: at91: introduce SOC_AT91xxx define to allow to compile SoC core support\n\nWe can now compile all SoC core support together and DT boards.\nWe still can not compile together the non DT board.\nSo We keep the ARCH_AT91xxx for the non DT board and for backward defconfig\ncompatibility. This will enable the plaform_device ressources.\n\nSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\n" }, { "commit": "19a3dab69747e1bace7987da5cd527fe998d7012", "tree": "f52718eaa1b83d2841af313c810c0fb176a36e72", "parents": [ "c8349fb437d37b7e0919ffaac3f8dca301f2f625" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Sat Jan 28 22:05:05 2012 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Apr 16 09:49:30 2012 +0200" }, "message": "ARM: imx_v4_v5_defconfig: enable adc and touch driver of mc13783\n\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": "f27962ac68a9b4cf17958522ecd7c10ce2375ee1", "tree": "3118019f20c1a25330136d166b101fa18a554ede", "parents": [ "97b3b7a0d0703df04e8c6d05c9b6c2fa8868db10" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Fri Apr 13 10:18:36 2012 +0200" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Mon Apr 16 09:00:53 2012 +0200" }, "message": "ARM: ux500: update defconfig\n\nSome new drivers and changed Kconfig dependencies for the v3.4\nkernel affecting the U8500 defconfig:\n\n- The SOC config options are now brought in by default\n- No need to explicitly select misc devices anymore\n- I2C is selected by default\n- We now have support for charging from the AB8500 so compile\n in this\n- The regulator framework needs to be explictly selected\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\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": "09893ee84591b0417a9186a7e7cf1503ccf99ac2", "tree": "da8b044ad157b82203df04ae48cb60f4737cc390", "parents": [ "4bb2d1009f671815870e8f78e826e4f9071392a7", "7d1206bc2859c6e9f46e35ae697c138e7d7858a7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 12:34:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 12:34:33 2012 -0700" }, "message": "Merge tag \u0027dt2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: More device tree support updates\" from Olof Johansson:\n \"This branch contains a number of updates for device tree support on\n several ARM platforms, in particular:\n\n * AT91 continues the device tree conversion adding support for a\n number of on-chip drivers and other functionality\n * ux500 adds probing of some of the core SoC blocks through device\n tree\n * Initial device tree support for ST SPEAr600 platforms\n * kirkwood continues the conversion to device-tree probing\"\n\nManually merge arch/arm/mach-ux500/Kconfig due to MACH_U8500 rename, and\ndrivers/usb/gadget/at91_udc.c due to header file include cleanups.\n\nAlso do an \"evil merge\" for the MACH_U8500 config option rename that the\naffected RMI4 touchscreen driver in staging. It\u0027s called MACH_MOP500\nnow, and it was missed during previous merges.\n\n* tag \u0027dt2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)\n ARM: SPEAr600: Add device-tree support to SPEAr600 boards\n ARM: ux500: Provide local timer support for Device Tree\n ARM: ux500: Enable PL022 SSP Controller in Device Tree\n ARM: ux500: Enable PL310 Level 2 Cache Controller in Device Tree\n ARM: ux500: Enable PL011 AMBA UART Controller for Device Tree\n ARM: ux500: Enable Cortex-A9 GIC (Generic Interrupt Controller) in Device Tree\n ARM: ux500: db8500: list most devices in the snowball device tree\n ARM: ux500: split dts file for snowball into generic part\n ARM: ux500: combine the board init functions for DT boot\n ARM: ux500: Initial Device Tree support for Snowball\n ARM: ux500: CONFIG: Enable Device Tree support for future endeavours\n ARM: kirkwood: use devicetree for rtc-mv\n ARM: kirkwood: rtc-mv devicetree bindings\n ARM: kirkwood: fdt: define uart[01] as disabled, enable uart0\n ARM: kirkwood: fdt: facilitate new boards during fdt migration\n ARM: kirkwood: fdt: absorb kirkwood_init()\n ARM: kirkwood: fdt: use mrvl ticker symbol\n ARM: orion: wdt: use resource vice direct access\n ARM: Kirkwood: Remove tclk from kirkwood_asoc_platform_data.\n ARM: orion: spi: remove enable_clock_fix which is not used\n ...\n" }, { "commit": "34800598b2eebe061445216473b1e4c2ff5cba99", "tree": "a6d0eb6fe45d9480888d7ddb34840e172ed80e56", "parents": [ "46b407ca4a6149c8d27fcec1881d4f184bec7c77", "511f1cb6d426938fabf9c6d69ce4861b66ffd919" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:41:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:41:24 2012 -0700" }, "message": "Merge tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: driver specific updates\" from Arnd Bergmann:\n \"These are all specific to some driver. They are typically the\n platform side of a change in the drivers directory, such as adding a\n new driver or extending the interface to the platform. In cases where\n there is no maintainer for the driver, or the maintainer prefers to\n have the platform changes in the same branch as the driver changes,\n the patches to the drivers are included as well.\n\n A much smaller set of driver updates that depend on other branches\n getting merged first will be sent later.\n\n The new export of tegra_chip_uid conflicts with other changes in\n fuse.c. In rtc-sa1100.c, the global removal of IRQF_DISABLED\n conflicts with the cleanup of the interrupt handling of that driver.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\nFixed up aforementioned trivial conflicts.\n\n* tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)\n ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci\n mmc: sdhci-s3c: add platform data for the second capability\n ARM: SAMSUNG: support the second capability for samsung-soc\n ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC\n ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1\n ARM: EXYNOS: Enable MDMA driver\n regulator: Remove bq24022 regulator driver\n rtc: sa1100: add OF support\n pxa: magician/hx4700: Convert to gpio-regulator from bq24022\n ARM: OMAP3+: SmartReflex: fix error handling\n ARM: OMAP3+: SmartReflex: fix the use of debugfs_create_* API\n ARM: OMAP3+: SmartReflex: micro-optimization for sanity check\n ARM: OMAP3+: SmartReflex: misc cleanups\n ARM: OMAP3+: SmartReflex: move late_initcall() closer to its argument\n ARM: OMAP3+: SmartReflex: add missing platform_set_drvdata()\n ARM: OMAP3+: hwmod: add SmartReflex IRQs\n ARM: OMAP3+: SmartReflex: clear ERRCONFIG_VPBOUNDINTST only on a need\n ARM: OMAP3+: SmartReflex: Fix status masking in ERRCONFIG register\n ARM: OMAP3+: SmartReflex: Add a shutdown hook\n ARM: OMAP3+: SmartReflex Class3: disable errorgen before disable VP\n ...\n\nConflicts:\n\tarch/arm/mach-tegra/Makefile\n\tarch/arm/mach-tegra/fuse.c\n\tdrivers/rtc/rtc-sa1100.c\n" }, { "commit": "1bfecd935849a45b6b47d9f011e1c278ff880512", "tree": "23c08a9c103c92e5a4a4cd3311823426c9d2bdf9", "parents": [ "281b05392fc2cb26209b4d85abaf4889ab1991f3", "a754a87ce8b17024358c1be8ee0232ef09a7055f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:27:28 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:27:28 2012 -0700" }, "message": "Merge tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: board specific updates\" from Arnd Bergmann/Olof Johansson:\n \"These changes are all specific to one board only. We\u0027re trying to\n keep the number of board files low, but generally board level updates\n are ok on platforms that are working on moving towards DT based\n probing, which will eventually lead to removing them.\n\n The board-ams-delta.c board file gets a conflict between the removal\n of ams_delta_config and the addition of a lot of other data. The\n Kconfig file has two changes in the same line, and in exynos, the\n power domain cleanup conflicts with the addition of the image sensor\n device.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n [olof: Amended a fix for a mismerge to board-omap4panda.c]\n Signed-off-by: Olof Johansson \u003colof@lixom.net\u003e\"\n\nFixed up some fairly trivial conflicts manually.\n\n* tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (82 commits)\n i.MX35-PDK: Add Camera support\n ARM : mx35: 3ds-board: add framebuffer device\n pxa/hx4700: Remove pcmcia platform_device structure\n ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35%\n ARM: pxa/hx4700: Remove unwanted request for GPIO105\n ARM: EXYNOS: support Exynos4210-bus Devfreq driver on Nuri board\n ARM: EXYNOS: Register JPEG on nuri\n ARM: EXYNOS: Register JPEG on universal_c210\n ARM: S5PV210: Enable JPEG on SMDKV210\n ARM: S5PV210: Add JPEG board definition\n ARM: EXYNOS: Enable JPEG on Origen\n ARM: EXYNOS: Enable JPEG on SMDKV310\n ARM: EXYNOS: Add __init attribute to universal_camera_init()\n ARM: EXYNOS: Add __init attribute to nuri_camera_init()\n ARM: S5PV210: Enable FIMC on SMDKC110\n ARM: S5PV210: Enable FIMC on SMDKV210\n ARM: S5PV210: Enable MFC on SMDKC110\n ARM: S5PV210: Enable MFC on SMDKV210\n ARM: EXYNOS: Enable G2D on SMDKV310\n ARM: tegra: update defconfig\n ...\n" }, { "commit": "281b05392fc2cb26209b4d85abaf4889ab1991f3", "tree": "bbf5000ce7bd739b1ca85e9918741e285d267c7c", "parents": [ "48d554418d3bfbba5e9dc1ebdf352f1b1f3ff4ee", "bde755679a3ba5af0d16231f8532e8373c5e2ecc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:14:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:14:44 2012 -0700" }, "message": "Merge tag \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: SoC specific updates\" from Arnd Bergmann:\n \"These changes are all specific to an soc family or the code for one\n soc. Lots of work for Tegra3 this time, but also a lot of other\n platforms. There will be another (smaller) set of soc patches later\n in the merge window for stuff that has dependencies on external trees\n or that was sent just before the merge window opened.\n\n The asoc tree added a few devices to the i.mx platform, which conflict\n with other devices added in the same place here.\n\n The tegra Makefile conflicts between a number of branches, mostly\n because of changes regarding localtimer.c, which was removed in the\n end.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\nFix up some trivial conflicts, including the mentioned Tegra Makefile.\n\n* tag \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (51 commits)\n ARM: EXYNOS: fix cycle count for periodic mode of clock event timers\n ARM: EXYNOS: add support JPEG\n ARM: EXYNOS: Add DMC1, allow PPMU access for DMC\n ARM: SAMSUNG: Correct MIPI-CSIS io memory resource definition\n ARM: SAMSUNG: fix __init attribute on regarding s3c_set_platdata()\n ARM: SAMSUNG: Add __init attribute to samsung_bl_set()\n ARM: S5PV210: Add usb otg phy control\n ARM: S3C64XX: Add usb otg phy control\n ARM: EXYNOS: Enable l2 configuration through device tree\n ARM: EXYNOS: remove useless code to save/restore L2\n ARM: EXYNOS: save L2 settings during bootup\n ARM: S5P: add L2 early resume code\n ARM: EXYNOS: Add support AFTR mode on EXYNOS4210\n ARM: mx35: Setup the AIPS registers\n ARM: mx5: Use common function for configuring AIPS\n ARM: mx3: Setup AIPS registers\n ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFI\n ARM: defconfig: imx_v6_v7: build in REGULATOR_FIXED_VOLTAGE\n ARM: imx: update imx_v6_v7_defconfig\n ARM: tegra: Demote EMC clock inconsistency BUG to WARN\n ...\n" }, { "commit": "d61b7a572b292e2be409e13b4b3adf475f18fb29", "tree": "e9d30390860147136c05e66abf1edda1bc5b0562", "parents": [ "18d9946bc7e2252fe3c0f2f609ac383c627edefd", "f4e2467bad53023589cbff18dd1ab6e0aa3f004c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:03:32 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:03:32 2012 -0700" }, "message": "Merge tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: global cleanups\" from Arnd Bergmann:\n \"Quite a bit of code gets removed, and some stuff moved around, mostly\n the old samsung s3c24xx stuff. There should be no functional changes\n in this series otherwise. Some cleanups have dependencies on other\n arm-soc branches and will be sent in the second round.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\nFixed up trivial conflicts mainly due to #include\u0027s being changes on\nboth sides.\n\n* tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (121 commits)\n ep93xx: Remove unnecessary includes of ep93xx-regs.h\n ep93xx: Move EP93XX_SYSCON defines to SoC private header\n ep93xx: Move crunch code to mach-ep93xx directory\n ep93xx: Make syscon access functions private to SoC\n ep93xx: Configure GPIO ports in core code\n ep93xx: Move peripheral defines to local SoC header\n ep93xx: Convert the watchdog driver into a platform device.\n ep93xx: Use ioremap for backlight driver\n ep93xx: Move GPIO defines to gpio-ep93xx.h\n ep93xx: Don\u0027t use system controller defines in audio drivers\n ep93xx: Move PHYS_BASE defines to local SoC header file\n ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver\n ARM: EXYNOS: add clock registers for exynos4x12-cpufreq\n PM / devfreq: update the name of EXYNOS clock registers that were omitted\n PM / devfreq: update the name of EXYNOS clock register\n ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock\n ARM: EXYNOS: use static declaration on regarding clock\n ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs\n ARM: OMAP2+: Fix build error after merge\n ARM: S3C24XX: remove call to s3c24xx_setup_clocks\n ...\n" }, { "commit": "f907ab06bb021bcb91d39c8d1b36536ebdb318fa", "tree": "6020618997a6ea1b5f5b59c89df35344023f7c82", "parents": [ "7cc026f21e2acdcea8640df5da470c6fdca92911", "489e7bece7f6859a7df484a4dce08fa51fb0d876" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Mar 20 22:42:24 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Mar 20 22:42:24 2012 +0000" }, "message": "Merge branch \u0027next/fixes-non-critical\u0027 into next/drivers\n\nConflicts:\n\tarch/arm/mach-lpc32xx/clock.c\n\tarch/arm/mach-pxa/pxa25x.c\n\tarch/arm/mach-pxa/pxa27x.c\n\nThe conflicts with pxa are non-obvious, we have multiple branches\nadding and removing the same clock settings. According to\nHaojian Zhuang, removing the sa1100 rtc dummy clock is the correct\nfix here.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "7cc026f21e2acdcea8640df5da470c6fdca92911", "tree": "6f3caa790f02378868876ad3d78203680e9372e7", "parents": [ "6307e418251240c2d18b3d69b96e50176c51a113", "b1f91a9ce335eb4e0fef17c10f39a438ac3fce9b" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Mar 20 22:40:37 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Mar 20 22:40:37 2012 +0000" }, "message": "Merge branch \u0027imx/defconfig\u0027 into next/drivers\n\nConflicts:\n\tarch/arm/configs/imx_v6_v7_defconfig\n\nResolves one conflict with an earlier branch\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "d4ef467aea0fdcd5e75a4bbfaf97e579bbe532f3", "tree": "5b91923fb5031c6963a60ee33ee7671d178f26b2", "parents": [ "4acf18232f80c29906356f0f35b2d5f800b5953d", "71de5c46e0600b72df58269e80da343e354ddbd7" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Mar 16 19:51:30 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Mar 16 19:51:30 2012 +0000" }, "message": "Merge branch \u0027ux500/dt\u0027 into next/dt2\n\n* ux500/dt:\n ARM: ux500: Provide local timer support for Device Tree\n ARM: ux500: Enable PL022 SSP Controller in Device Tree\n ARM: ux500: Enable PL310 Level 2 Cache Controller in Device Tree\n ARM: ux500: Enable PL011 AMBA UART Controller for Device Tree\n ARM: ux500: Enable Cortex-A9 GIC (Generic Interrupt Controller) in Device Tree\n ARM: ux500: db8500: list most devices in the snowball device tree\n ARM: ux500: split dts file for snowball into generic part\n ARM: ux500: combine the board init functions for DT boot\n ARM: ux500: Initial Device Tree support for Snowball\n ARM: ux500: CONFIG: Enable Device Tree support for future endeavours\n ARM: ux500: fix compilation after local timer rework\n\n(adds dependency on localtimer branch, irqdomain branch and ux500/soc\nbranch)\n\nConflicts:\n\tarch/arm/mach-ux500/devices-common.c\n\nThis adds patches from Lee Jones, Niklas Hernaeus and myself to provide\ninitial device tree support on the ux500 platform. The pull request from\nLee contained some other changes, so I rebased the patches on top of\nthe branches that are actually dependencies for this.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "e27fc6cf84a401e62144a522695f114c9bdbebb7", "tree": "c54b7e51116e6f5479338f5c8ef0307ba06084f1", "parents": [ "ab2f75ce55ef6f903348026271e30796f016851f" ], "author": { "name": "Lee Jones", "email": "lee.jones@linaro.org", "time": "Fri Mar 02 21:51:38 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Mar 16 19:46:11 2012 +0000" }, "message": "ARM: ux500: CONFIG: Enable Device Tree support for future endeavours\n\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Lee Jones \u003clee.jones@linaro.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "b71e1b75d6e22bfed94a2a8879d7f7a30b3e3dde", "tree": "5c018c1d0a04576e3f35795900aa7cfda1b4a7cb", "parents": [ "3b3f8280399c67c592e973193bf3f36a8cab75a0" ], "author": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Sun Feb 05 18:31:00 2012 +0800" }, "committer": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Thu Mar 15 23:29:39 2012 +0800" }, "message": "ARM: at91: usb_a9g20 add DT i2c support\n\nUse i2c-gpio and enable rv3029 RTC.\n\nEnable the rtc in the sam9g20 defconfig.\n\nSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\n" }, { "commit": "990b07d952bff7116ba79e3c4ceeae5dd8d5ec3d", "tree": "b0f6c896749f5beca20d74e72e4761aaa9e8ad2b", "parents": [ "3a70b7e05f62d4e1bfd5744368ea1fd855b6e03c", "8a16a701ad787b6db2949766341c5ad1b551de9f" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Mar 08 09:33:44 2012 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Mar 08 09:33:44 2012 -0800" }, "message": "Merge branch \u0027regulator\u0027 of git://github.com/hzhuang1/linux into next/drivers\n\n* \u0027regulator\u0027 of git://github.com/hzhuang1/linux: (2 commits)\n regulator: Remove bq24022 regulator driver\n pxa: magician/hx4700: Convert to gpio-regulator from bq24022\n\n (plus update to v3.3-rc6)\n" }, { "commit": "d60d506e6baaf423148c458df3ece0c1d440dce4", "tree": "c25c44e70ebaaddcbe39559df5c5cd260e956be4", "parents": [ "62f383435932ea3d271bee6b957de048452c1b16", "2e5ac9436645bb9fd2097868e228321f303c9c75" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Mar 08 08:53:14 2012 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Mar 08 08:53:14 2012 -0800" }, "message": "Merge branch \u0027next/cleanup-s3c24xx\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup\n\n* \u0027next/cleanup-s3c24xx\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (24 commits)\n ARM: S3C24XX: remove call to s3c24xx_setup_clocks\n ARM: S3C24XX: add get_rate for clk_p on S3C2416/2443\n ARM: S3C24XX: add get_rate for clk_h on S3C2416/2443\n ARM: S3C24XX: remove XXX_setup_clocks method from S3C2443\n ARM: S3C24XX: remove obsolete S3C2416_DMA option\n ARM: S3C24XX: Reuse S3C2443 dma for S3C2416\n ARM: S3C24XX: Fix indentation of dma-s3c2443\n ARM: S3C24XX: Move device setup files to mach directory\n ARM: S3C24XX: Consolidate Simtec extensions\n ARM: S3C24XX: move simtec-specific code to mach directory\n ARM: S3C24XX: Move common-smdk code to mach directory\n ARM: S3C24XX: Move s3c2443-clock.c to mach-s3c24xx\n ARM: s3c2410_defconfig: update s3c2410_defconfig\n ARM: S3C2443: move mach-s3c2443/* into mach-s3c24xx/\n ARM: S3C2440: move mach-s3c2440/* into mach-s3c24xx/\n ARM: S3C2416: move mach-s3c2416/* into mach-s3c24xx/\n ARM: S3C2412: move mach-s3c2412/* into mach-s3c24xx/\n ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/\n ARM: S3C24XX: change the ARCH_S3C2410 to ARCH_S3C24XX\n ARM: S3C2410: move s3c2410_baseclk_add to clock.h\n ...\n" }, { "commit": "0a25893597dfbad08aff833bdefac2fe5b31aabd", "tree": "dabb473e3782d6d9efe0a8f8cf8b6c7fbbcd247d", "parents": [ "c5444f39620b2b7801eb1997c41befdc8bcf78ea" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Mon Mar 05 17:03:53 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Mar 07 14:38:49 2012 -0800" }, "message": "ARM: tegra: update defconfig\n\nRefresh tegra_defconfig:\n\nNew options enabled:\n* PERF_EVENTS\n* Tegra EMC scaling\n* Support for all 4 CPUs on Tegra30\n* AUTO_ZRELADDR for unified Tegra20+Tegra30 images\n* CPU_FREQ/CPU_IDLE\n* BLK_DEV_SR\n* INPUT_EVDEV\n* Regulators, including fixed, GPIO, TPS6586x\n* Audio for Tegra+ALC5632 (for Paz00/Toshiba AC100)\n* NVEC (staging, for Paz00/Toshiba AC100)\n* IOMMU for Tegra20\u0027s GART and Tegra30\u0027s SMMU\n* TEGRA_AES\n* ext4, for trim support on SD/eMMC\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\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": "6967cca8b431a181d3a02eee81f0c9f8b5e9e75a", "tree": "d8a6842c0b7766261ac48b1645f4b1d43f26f73b", "parents": [ "192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d" ], "author": { "name": "Heiko Stübner", "email": "heiko@sntech.de", "time": "Fri Mar 02 13:56:38 2012 +0100" }, "committer": { "name": "Haojian Zhuang", "email": "haojian.zhuang@gmail.com", "time": "Tue Mar 06 14:01:15 2012 +0800" }, "message": "pxa: magician/hx4700: Convert to gpio-regulator from bq24022\n\nThe bq24022 on these machines is a very simple regulator using gpios.\nOne provides the on/off functionality and a second one is used to\nchange the current between 100 and 500 mA.\n\nThis functionality can also be provided by the more generic gpio-regulator.\n\nTherefore convert both machines which makes it possible to remove the\nbq24022 driver later on.\n\nSigned-off-by: Heiko Stuebner \u003cheiko@sntech.de\u003e\nTested-by: Paul Parsons \u003clost.distance@yahoo.com\u003e\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\n" }, { "commit": "8fe2ff766d458453f8b5624291f14db9efe2ef20", "tree": "74e98e1d712bdd42857de9a7a02a97d797ebd08f", "parents": [ "84c028b9cebd928cf434b27093fa65f7b4b81cfe" ], "author": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Wed Feb 08 12:06:22 2012 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Sat Mar 03 08:55:58 2012 +0900" }, "message": "ARM: s3c2410_defconfig: update s3c2410_defconfig\n\nAccording to merging s3c24xx, updates the current s3c2410_defconfig.\n\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": "abf45ce84c4e36bd64aef20d7df9a79bd5e4b799", "tree": "f118e135bdd60b680703d1b38c7fdc7b9d7c503d", "parents": [ "082f53c2f573c75a8f1610c587a43b6817e20f90", "b1f91a9ce335eb4e0fef17c10f39a438ac3fce9b" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Feb 28 12:33:41 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Feb 28 12:33:46 2012 +0000" }, "message": "Merge branch \u0027imx/defconfig\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc\n\n* \u0027imx/defconfig\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6: (2 commits)\n ARM: defconfig: imx_v6_v7: build in REGULATOR_FIXED_VOLTAGE\n ARM: imx: update imx_v6_v7_defconfig\n\n(upadte to v3.3-rc5)\n" }, { "commit": "dae2efd750393565a90fa75eeab289dbeacc166e", "tree": "7923561b311b492c1550fe6ebc90e482c69260da", "parents": [ "afde9626089e3d0c32090120960d1e32f65e3be4", "15cc1b1c1e8848ffa711f4ea24c919627a1159da" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Feb 27 13:42:09 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Feb 27 13:42:09 2012 +0000" }, "message": "Merge branch \u0027imx-drivers\u0027 of git://git.pengutronix.de/git/imx/linux-2.6 into next/drivers\n\n* \u0027imx-drivers\u0027 of git://git.pengutronix.de/git/imx/linux-2.6:\n ARM: imx_v4_v5_defconfig: Update defconfig\n ARM: mx27_3ds: Add camera support\n ARM: imx_v6_v7_defconfig: Add support for framebuffer and camera on mx31\n" }, { "commit": "d0cdd82c6e0944df733b28f5d4cbbe97298587e4", "tree": "9de205625a4657fedbfae52c65ea017beb7509a8", "parents": [ "747303a383d59a4d4667152fb68293dd9ff06438", "9418ba306688c0b77a8548b3281ba3d130036516" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Feb 27 12:58:59 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Feb 27 12:59:03 2012 +0000" }, "message": "Merge branch \u0027imx-fixes\u0027 of git://git.pengutronix.de/git/imx/linux-2.6 into next/fixes-non-critical\n\n* \u0027imx-fixes\u0027 of git://git.pengutronix.de/git/imx/linux-2.6: (247 commits)\n ARM: mach-imx: mx3: Fix section mismatch in imx3_init_l2x0()\n ARM: imx_v4_v5_defconfig: Fix the selection of 32 bit flash support for iMX21ADS board\n ARM: mach-pcm038: Fix field name of regulator_consumer_supply struct\n\nAlso includes an update to v3.3-rc3\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "afde9626089e3d0c32090120960d1e32f65e3be4", "tree": "d986b671aee7ee9fd984b373223a5aad31aa4a53", "parents": [ "2daa79ec2126f8e710391e9d8e8f0d31d7c91d5f", "64a38516ff50c3f6c1ef563c2f410db3239d9302" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Feb 27 12:52:05 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Feb 27 12:52:05 2012 +0000" }, "message": "Merge branch \u0027features/cs89x0\u0027 of git://git.pengutronix.de/git/imx/linux-2.6 into next/drivers\n\n* \u0027features/cs89x0\u0027 of git://git.pengutronix.de/git/imx/linux-2.6:\n CS89x0 : add CS89x0 platform device to the iMX31ADS board\n CS89x0 : remove QQ2440 board support from the CS89x0 driver\n CS89x0 : add CS89x0 platform device to the iMX21ADS board\n CS89x0 : add platform driver support\n" }, { "commit": "b1f91a9ce335eb4e0fef17c10f39a438ac3fce9b", "tree": "0f99f0116f89966c8e011e190a18be1f22d71c46", "parents": [ "9394243fc8b350cd0837a4d91fc21e7966e509e3" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Mon Feb 27 15:36:38 2012 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Mon Feb 27 17:52:48 2012 +0800" }, "message": "ARM: defconfig: imx_v6_v7: build in REGULATOR_FIXED_VOLTAGE\n\nSome devices on some imx boards are supplied by fixed voltage, so\nbuild REGULATOR_FIXED_VOLTAGE support in.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "9394243fc8b350cd0837a4d91fc21e7966e509e3", "tree": "d89e5b82a08a148c60d9411ad9cec928499bf36e", "parents": [ "6b21d18ed50c7d145220b0724ea7f2613abf0f95" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Tue Jan 31 16:43:24 2012 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Mon Feb 27 17:52:48 2012 +0800" }, "message": "ARM: imx: update imx_v6_v7_defconfig\n\nIt adds CONFIG_BLK_DEV_INITRD and runs savedefconfig. The resulted\ncan boot Linaro rootfs out of box.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "15cc1b1c1e8848ffa711f4ea24c919627a1159da", "tree": "20ed567493dd3372e7d006d9dc992fa3a8c46052", "parents": [ "4c11c286c8d8ca4224c4daf5ddfa162e951d0e5c" ], "author": { "name": "Fabio Estevam", "email": "festevam@gmail.com", "time": "Wed Feb 15 19:36:11 2012 -0200" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Feb 27 10:14:15 2012 +0100" }, "message": "ARM: imx_v4_v5_defconfig: Update defconfig\n\nSelect the following drivers to be built by default:\n- SMSC911x\n- LCD_L4F00242T0 (LCD present on mx27pdk)\n- CONFIG_VIDEO_MX2\n- OV2640 (Camera present on mx27pdk)\n- CONFIG_VIDEO_MX2 (Allow mx2 video capture)\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "932fe704bbbe2bda0f0e317c4f6c1bbebd07b7cc", "tree": "11100eecca5042cae32eedfc9e33e6d3cfff9f65", "parents": [ "d65b4e98d7ea3038b767b70fe8be959b2913f16d" ], "author": { "name": "Fabio Estevam", "email": "fabio.estevam@freescale.com", "time": "Tue Feb 14 13:40:21 2012 -0200" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Feb 27 10:13:46 2012 +0100" }, "message": "ARM: imx_v6_v7_defconfig: Add support for framebuffer and camera on mx31\n\nLet framebuffer and camera support be built by default on mx31.\n\nTested on a mx31pdk board.\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "940e9ee9f226e0e2b278c5d78180fc39da8e0baa", "tree": "533112bcb056bf34bd99c682f0de4b67803d32bf", "parents": [ "dcc5abf08a1b783020cb11f37e645177f76e5705" ], "author": { "name": "Fabio Estevam", "email": "fabio.estevam@freescale.com", "time": "Mon Jan 23 14:16:17 2012 -0200" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Feb 27 10:12:51 2012 +0100" }, "message": "ARM: imx_v4_v5_defconfig: Fix the selection of 32 bit flash support for iMX21ADS board\n\ncommit 1a96571d (Enable 32 bit flash support for iMX21ADS board) aimed to\nenable 32 bit flash support, but all it did was to delete an unset option.\n\nFix this by enabling CONFIG_MTD_MAP_BANK_WIDTH_4 option.\n\nCc: Jaccon Bastiaansen \u003cjaccon.bastiaansen@gmail.com\u003e\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "770e2da2aef92e31cd52ed9a8c20cae0e84e9034", "tree": "0b93f1ada0c299407c3af8c6f2cfe2f80314f07c", "parents": [ "62aa2b537c6f5957afd98e29f96897419ed5ebab" ], "author": { "name": "Roland Stigge", "email": "stigge@antcom.de", "time": "Wed Feb 08 21:40:59 2012 +0100" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Feb 09 16:00:33 2012 -0800" }, "message": "ARM: LPC32xx: Added lpc32xx_defconfig\n\nThis patch adds a working defconfig for the LPC32XX architecture. It is a\ngeneral default configuration for the PHY3250 reference board and others\nbased on LPC32XX.\n\nSigned-off-by: Roland Stigge \u003cstigge@antcom.de\u003e\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: Kevin Wells \u003ckevin.wells@nxp.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "e69128b947da0a2474447868f73c76311e2baedb", "tree": "73f84e2a0e55bcda2e14d28b011c250a14203e0d", "parents": [ "0d167e0dd3e28ee5502a0e9f8d10c9730d35c5b7", "467f1cf504fbe8c50018c9b45ff465b379bc81f8" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Feb 07 15:19:08 2012 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Feb 07 15:19:08 2012 -0800" }, "message": "Merge branch \u0027at91-3.4-base+9x5\u0027 of git://github.com/at91linux/linux-at91 into next/soc\n\n* \u0027at91-3.4-base+9x5\u0027 of git://github.com/at91linux/linux-at91:\n ARM: at91/at91sam9x5: Device tree definition files\n ARM: at91/at91sam9x5: SoC basic support\n ARM: at91/at91sam9x5: Configuration and Makefile\n ARM: at91/at91sam9x5: clock management for at91sam9x5 chip family\n ARM: at91/at91sam9x5: PMC header file\n ARM: at91/at91sam9x5: overall definition\n ARM: at91: code removal of CAP9 SoC\n\nConflicts:\n\tarch/arm/mach-at91/at91cap9.c\n" }, { "commit": "0d167e0dd3e28ee5502a0e9f8d10c9730d35c5b7", "tree": "237d29da78122379c861227f37cc833f966f9898", "parents": [ "88b1988ec2337f5fd8b9204a919838d0bc34b7b4", "c62ab98584396480467a6e422ab172644862de35" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Feb 07 15:14:06 2012 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Feb 07 15:14:06 2012 -0800" }, "message": "Merge branch \u0027mxs/defconfig\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc\n\n* \u0027mxs/defconfig\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6:\n ARM: mx28: Let audio support be built by default\n" }, { "commit": "9918ceafd4a9e013572e03983f528017c29bb1cb", "tree": "90d7885b26b87d27ed4cdb4026e608908e8a8a4c", "parents": [ "57225b76864210d667b935c54babf22b6c31336b" ], "author": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Thu Jan 26 14:07:09 2012 +0100" }, "committer": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Fri Feb 03 13:33:05 2012 +0100" }, "message": "ARM: at91: code removal of CAP9 SoC\n\nFollowing removal announce and addition to feature-removal-schedule.txt,\nhere is the actual source code deletion for Atmel CAP9 family.\n\nSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\n" }, { "commit": "64a38516ff50c3f6c1ef563c2f410db3239d9302", "tree": "60eb060d79f278b3ab033c9b686cf28950d3d029", "parents": [ "69c311fd604a01db3ab26c3f16d6c9cb0b2d5de6" ], "author": { "name": "Jaccon Bastiaansen", "email": "jaccon.bastiaansen@gmail.com", "time": "Thu Jan 26 21:47:27 2012 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Feb 01 16:52:02 2012 +0100" }, "message": "CS89x0 : add CS89x0 platform device to the iMX31ADS board\n\nAdd CS89x0 networking support to the iMX31ADS board by using the\nplatform driver support in the CS89x0 driver.\n\nSigned-off-by: Jaccon Bastiaansen \u003cjaccon.bastiaansen@gmail.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "c8c9e8379723e769c84e2b1914c56cfbb2c0988d", "tree": "588d62949f88aa97ed988fb6c59602d7a0901b2b", "parents": [ "e9460a9e811dddd9ea1ae9838d9b53bfaf78cd2c" ], "author": { "name": "Jaccon Bastiaansen", "email": "jaccon.bastiaansen@gmail.com", "time": "Thu Jan 26 21:46:57 2012 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Feb 01 16:49:50 2012 +0100" }, "message": "CS89x0 : add CS89x0 platform device to the iMX21ADS board\n\nAdd CS89x0 networking support to the iMX21ADS board by using the\nplatform driver support in the CS89x0 driver.\n\nSigned-off-by: Jaccon Bastiaansen \u003cjaccon.bastiaansen@gmail.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "c62ab98584396480467a6e422ab172644862de35", "tree": "e5cdd60e595284c6aea4bc6557758c0f286338dc", "parents": [ "dcd6c92267155e70a94b3927bce681ce74b80d1f" ], "author": { "name": "Fabio Estevam", "email": "fabio.estevam@freescale.com", "time": "Mon Jan 16 16:51:31 2012 -0200" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Fri Jan 27 11:49:34 2012 +0800" }, "message": "ARM: mx28: Let audio support be built by default\n\nLet audio support be built by default.\n\nAs sgtl5000 codec is connected via I2C, let MXS I2C driver also be built\nby default.\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nAcked-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\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": "6bebb572404f96d367170fb263603cda7251f932", "tree": "d7bca6b7b39e256aa52427908ba1235ce2a31e44", "parents": [ "dcd6c92267155e70a94b3927bce681ce74b80d1f" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Wed Jan 04 10:50:09 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 19 23:59:39 2012 +0000" }, "message": "ARM: 7268/1: integrator: defconfig for both AP and CP\n\nThis updates the Integrator defconfig to include the hardware\nfound on the Integrator/CP: SMC91X, CLCD, MMCI/PL180. Further\nthe sometimes disrupting VGA_CONSOLE is disabled (those who\nhave a VGA card can enable it) and typical default VFAT\nlayouts of the MMC cards are supported by enabling VFAT and\nCP437 encoding of the file system.\n\nAfter this my default kernels boot successfully on Integrator\nAP and CP alike.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "4c4d285ad5665bfbd983b95fde8d7a477d24a361", "tree": "05da51053d4c8943ae21ea0b152aef4c67eba19d", "parents": [ "56c8bc3b7ed3d24c665e2ce992f86a5bedffc852", "e64e1b11b14d363ac70fd13ab809969a6d7e42a8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 23:29:20 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 23:29:20 2012 -0800" }, "message": "Merge tag \u0027rmobile-for-linus\u0027 of git://github.com/pmundt/linux-sh\n\nSH/R-Mobile updates for 3.3 merge window.\n\n* tag \u0027rmobile-for-linus\u0027 of git://github.com/pmundt/linux-sh: (32 commits)\n arm: mach-shmobile: add a resource name for shdma\n ARM: mach-shmobile: r8a7779 SMP support V3\n ARM: mach-shmobile: Add kota2 defconfig.\n ARM: mach-shmobile: Add marzen defconfig.\n ARM: mach-shmobile: r8a7779 power domain support V2\n ARM: mach-shmobile: Fix up marzen build for recent GIC changes.\n ARM: mach-shmobile: r8a7779 PFC function support\n ARM: mach-shmobile: Flush caches in platform_cpu_die()\n ARM: mach-shmobile: Allow SoC specific CPU kill code\n ARM: mach-shmobile: Fix headsmp.S code to use CPUINIT\n ARM: mach-shmobile: clock-r8a7779: clkz/clkzs support\n ARM: mach-shmobile: clock-r8a7779: add DIV4 clock support\n ARM: mach-shmobile: Marzen LAN89218 support\n ARM: mach-shmobile: Marzen SCIF2/SCIF4 support\n ARM: mach-shmobile: r8a7779 PFC GPIO-only support V2\n ARM: mach-shmobile: r8a7779 and Marzen base support V2\n sh: pfc: Unlock register support\n sh: pfc: Variable bitfield width config register support\n sh: pfc: Add config_reg_helper() function\n sh: pfc: Convert index to field and value pair\n ...\n" }, { "commit": "f0a217a31a745421df98db0d14ebdadef11d734c", "tree": "c8784c47bf9e39b1591db5cd995069753ee35aba", "parents": [ "cc9e4fedc77c71fb6edfc2bf84be9b3d5d61dd86", "43aa77f40a417ac50ec5b0c94ded527690049c63", "d06830e7143b178c568aa4ce90b2c0281e7fb1de" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Jan 10 17:10:55 2012 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Jan 10 17:10:55 2012 +0900" }, "message": "Merge branches \u0027rmobile/kota2\u0027 and \u0027rmobile/marzen\u0027 into rmobile-latest\n\nConflicts:\n\tarch/arm/mach-shmobile/Kconfig\n\tarch/arm/mach-shmobile/Makefile\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "43aa77f40a417ac50ec5b0c94ded527690049c63", "tree": "1a299b8adaf300396e9ee58f32054a7ffa669cbf", "parents": [ "a0e86bd4252519321b0d102dc4ed90557aa7bee9" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Jan 10 17:09:24 2012 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Jan 10 17:09:24 2012 +0900" }, "message": "ARM: mach-shmobile: Add kota2 defconfig.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "d06830e7143b178c568aa4ce90b2c0281e7fb1de", "tree": "863306a12f6a0340e648b8d8eecc687c35e20013", "parents": [ "a662c08260fac126059a148cbd1061e71e806b4a" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Jan 10 16:57:48 2012 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Jan 10 16:57:48 2012 +0900" }, "message": "ARM: mach-shmobile: Add marzen defconfig.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "cc9e4fedc77c71fb6edfc2bf84be9b3d5d61dd86", "tree": "24e175ed43f1075ec252d6f63bfdeea921e60e6d", "parents": [ "04cf399640b7acfa9abe2eb7900cd934db8af697", "c133bcd3f9ef18979ac3ab7c4f26baeb08aaa181" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Jan 10 14:38:38 2012 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Jan 10 14:38:38 2012 +0900" }, "message": "Merge branch \u0027rmobile/bonito\u0027 into rmobile-latest\n" } ], "next": "5ede3ceb7b2c2843e153a1803edbdc8c56655950" }