)]}' { "log": [ { "commit": "f1ae98da8525c6b8b1c301c3a2b0bd2b6515cca2", "tree": "f73e377f98bbb452612a1f53b3d399cff6cac1fa", "parents": [ "f8f5701bdaf9134b1f90e5044a82c66324d2073f" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Wed May 30 10:48:29 2012 +0200" }, "committer": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Mon Jun 04 08:01:24 2012 +0200" }, "message": "ARM: dma-mapping: remove unconditional dependency on CMA\n\nCMA has been enabled unconditionally on all ARMv6+ systems to solve the\nlong standing issue of double kernel mappings for all dma coherent\nbuffers. This however created a dependency on CONFIG_EXPERIMENTAL for\nthe whole ARM architecture what should be really avoided. This patch\nremoves this dependency and lets one use old, well-tested dma-mapping\nimplementation also on ARMv6+ systems without the need to use\nEXPERIMENTAL stuff.\n\nReported-by: Russell King \u003clinux@arm.linux.org.uk\u003e\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\n" }, { "commit": "47e1993d32d4e0f9524c2147576468fe11e87b5f", "tree": "9957257116c0086e891db39bfa246f3b8f3d7a0f", "parents": [ "63bda79dc484c015f9902f2c8ae019952b93f876", "9dde0ae3769875ec1370cb316e50c54b57d52c1a", "a035254aefe5a6c0b45c8c55588ab47403c674ed" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 30 16:16:12 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 30 16:16:12 2012 -0700" }, "message": "Merge branches \u0027fixes\u0027 and \u0027fixes2\u0027 into devel-late\n\n* fixes:\n ixp4xx: fix compilation by adding gpiolib support\n\n* fixes2:\n ARM: LPC32xx: Adjust dts files to gpio dt binding\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": "2c757fd5d1a92086f225a75a8fac7cab242d11b0", "tree": "d150ea105242d551f6959c2525472295e151144c", "parents": [ "ce53044c68cf4fb6c50a2a0d88786be65fae7235", "424663566c43ce87e8b33228860bf882f1ea61bf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:31:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:31:49 2012 -0700" }, "message": "Merge tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc cleanups (part 2) from Olof Johansson:\n \"More cleanups, continuing an earlier set with omap and samsung\n specific cleanups. These could not go into the first set because they\n have dependencies on various other series that in turn depend on the\n first cleanups.\"\n\nFixed up conflicts in arch/arm/plat-omap/counter_32k.c due to commit\nbd0493eaaf5c: \"move read_{boot,persistent}_clock to the architecture\nlevel\" that changed how the persistent clocks were handled. And trivial\nconflicts in arch/arm/mach-omap1/common.h due to just independent\nchanges close to each other.\n\n* tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (35 commits)\n ARM: SAMSUNG: merge plat-s5p into plat-samsung\n ARM: SAMSUNG: move options for common s5p into plat-samsung/Kconfig\n ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung\n ARM: SAMSUNG: move platform device for s5p uart into plat-samsung\n ARM: SAMSUNG: move hr timer for common s5p into plat-samsung\n ARM: SAMSUNG: move pm part for common s5p into plat-samsung\n ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung\n ARM: SAMSUNG: move clock part for common s5p into plat-samsung\n ARM: S3C24XX: Use common macro to define resources on dev-uart.c\n ARM: S3C24XX: move common clock init into common.c\n ARM: S3C24XX: move common power-management code to mach-s3c24xx\n ARM: S3C24XX: move plat-s3c24xx/dev-uart.c into common.c\n ARM: S3C24XX: move plat-s3c24xx/cpu.c\n ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX\n ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX\n GPMC: add ECC control definitions\n ARM: OMAP2+: dmtimer: remove redundant sysconfig context restore\n ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx\n ARM: OMAP: AM35xx: remove redunant cpu_is checks for AM3505\n ARM: OMAP1: Pass dma request lines in platform data to MMC driver\n ...\n" }, { "commit": "d484864dd96e1830e7689510597707c1df8cd681", "tree": "51551708ba3f26d05575fa91daaf0c0d970a77c3", "parents": [ "be87cfb47c5c740f7b17929bcd7c480b228513e0", "0f51596bd39a5c928307ffcffc9ba07f90f42a8b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 09:18:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 09:18:59 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.linaro.org/people/mszyprowski/linux-dma-mapping\n\nPull CMA and ARM DMA-mapping updates from Marek Szyprowski:\n \"These patches contain two major updates for DMA mapping subsystem\n (mainly for ARM architecture). First one is Contiguous Memory\n Allocator (CMA) which makes it possible for device drivers to allocate\n big contiguous chunks of memory after the system has booted.\n\n The main difference from the similar frameworks is the fact that CMA\n allows to transparently reuse the memory region reserved for the big\n chunk allocation as a system memory, so no memory is wasted when no\n big chunk is allocated. Once the alloc request is issued, the\n framework migrates system pages to create space for the required big\n chunk of physically contiguous memory.\n\n For more information one can refer to nice LWN articles:\n\n - \u0027A reworked contiguous memory allocator\u0027:\n\t\thttp://lwn.net/Articles/447405/\n\n - \u0027CMA and ARM\u0027:\n\t\thttp://lwn.net/Articles/450286/\n\n - \u0027A deep dive into CMA\u0027:\n\t\thttp://lwn.net/Articles/486301/\n\n - and the following thread with the patches and links to all previous\n versions:\n\t\thttps://lkml.org/lkml/2012/4/3/204\n\n The main client for this new framework is ARM DMA-mapping subsystem.\n\n The second part provides a complete redesign in ARM DMA-mapping\n subsystem. The core implementation has been changed to use common\n struct dma_map_ops based infrastructure with the recent updates for\n new dma attributes merged in v3.4-rc2. This allows to use more than\n one implementation of dma-mapping calls and change/select them on the\n struct device basis. The first client of this new infractructure is\n dmabounce implementation which has been completely cut out of the\n core, common code.\n\n The last patch of this redesign update introduces a new, experimental\n implementation of dma-mapping calls on top of generic IOMMU framework.\n This lets ARM sub-platform to transparently use IOMMU for DMA-mapping\n calls if one provides required IOMMU hardware.\n\n For more information please refer to the following thread:\n\t\thttp://www.spinics.net/lists/arm-kernel/msg175729.html\n\n The last patch merges changes from both updates and provides a\n resolution for the conflicts which cannot be avoided when patches have\n been applied on the same files (mainly arch/arm/mm/dma-mapping.c).\"\n\nAcked by Andrew Morton \u003cakpm@linux-foundation.org\u003e:\n \"Yup, this one please. It\u0027s had much work, plenty of review and I\n think even Russell is happy with it.\"\n\n* \u0027for-linus\u0027 of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: (28 commits)\n ARM: dma-mapping: use PMD size for section unmap\n cma: fix migration mode\n ARM: integrate CMA with DMA-mapping subsystem\n X86: integrate CMA with DMA-mapping subsystem\n drivers: add Contiguous Memory Allocator\n mm: trigger page reclaim in alloc_contig_range() to stabilise watermarks\n mm: extract reclaim code from __alloc_pages_direct_reclaim()\n mm: Serialize access to min_free_kbytes\n mm: page_isolation: MIGRATE_CMA isolation functions added\n mm: mmzone: MIGRATE_CMA migration type added\n mm: page_alloc: change fallbacks array handling\n mm: page_alloc: introduce alloc_contig_range()\n mm: compaction: export some of the functions\n mm: compaction: introduce isolate_freepages_range()\n mm: compaction: introduce map_pages()\n mm: compaction: introduce isolate_migratepages_range()\n mm: page_alloc: remove trailing whitespace\n ARM: dma-mapping: add support for IOMMU mapper\n ARM: dma-mapping: use alloc, mmap, free from dma_ops\n ARM: dma-mapping: remove redundant code and do the cleanup\n ...\n\nConflicts:\n\tarch/x86/include/asm/dma-mapping.h\n" }, { "commit": "b1bf7d4d1b3911352cf1ec63c1de06214288ccd0", "tree": "0fd27c638977cb5c7e6e3f95085ce842b57a4ae3", "parents": [ "0708500d49e8439d9fe5529795bdc1485f0f46c3", "3e11f7b840b4671213c66817294ad7dd0b572756" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 14:01:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 14:01:46 2012 -0700" }, "message": "Merge tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull GPIO driver changes from Grant Likely:\n \"Lots of gpio changes, both to core code and drivers.\n\n Changes do touch architecture code to remove the need for separate\n arm/gpio.h includes in most architectures.\n\n Some new drivers are added, and a number of gpio drivers are converted\n to use irq_domains for gpio inputs used as interrupts. Device tree\n support has been amended to allow multiple gpio_chips to use the same\n device tree node.\n\n Remaining changes are primarily bug fixes.\"\n\n* tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6: (33 commits)\n gpio/generic: initialize basic_mmio_gpio shadow variables properly\n gpiolib: Remove \u0027const\u0027 from data argument of gpiochip_find()\n gpio/rc5t583: add gpio driver for RICOH PMIC RC5T583\n gpiolib: quiet gpiochip_add boot message noise\n gpio: mpc8xxx: Prevent NULL pointer deref in demux handler\n gpio/lpc32xx: Add device tree support\n gpio: Adjust of_xlate API to support multiple GPIO chips\n gpiolib: Implement devm_gpio_request_one()\n gpio-mcp23s08: dbg_show: fix pullup configuration display\n Add support for TCA6424A\n gpio/omap: (re)fix wakeups on level-triggered GPIOs\n gpio/omap: fix broken context restore for non-OFF mode transitions\n gpio/omap: fix missing check in *_runtime_suspend()\n gpio/omap: remove cpu_is_omapxxxx() checks from *_runtime_resume()\n gpio/omap: remove suspend/resume callbacks\n gpio/omap: remove retrigger variable in gpio_irq_handler\n gpio/omap: remove saved_wakeup field from struct gpio_bank\n gpio/omap: remove suspend_wakeup field from struct gpio_bank\n gpio/omap: remove saved_fallingdetect, saved_risingdetect\n gpio/omap: remove virtual_irq_start variable\n ...\n\nConflicts:\n\tdrivers/gpio/gpio-samsung.c\n" }, { "commit": "c7523a7c88db637d66841018532cb4b3ab6ab0a8", "tree": "cec08263a493831d43e17d4daa633e2a6b09480e", "parents": [ "2f78d8e249973f1eeb88315e6444e616c60177ae", "b80fe1015be4e3c926d8eb4cc6a340fdd22a43e1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 13:29:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 13:29:46 2012 -0700" }, "message": "Merge branch \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull timer updates from Thomas Gleixner.\n\nVarious trivial conflict fixups in arch Kconfig due to addition of\nunrelated entries nearby. And one slightly more subtle one for sparc32\n(new user of GENERIC_CLOCKEVENTS), fixed up as per Thomas.\n\n* \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits)\n timekeeping: Fix a few minor newline issues.\n time: remove obsolete declaration\n ntp: Fix a stale comment and a few stray newlines.\n ntp: Correct TAI offset during leap second\n timers: Fixup the Kconfig consolidation fallout\n x86: Use generic time config\n unicore32: Use generic time config\n um: Use generic time config\n tile: Use generic time config\n sparc: Use: generic time config\n sh: Use generic time config\n score: Use generic time config\n s390: Use generic time config\n openrisc: Use generic time config\n powerpc: Use generic time config\n mn10300: Use generic time config\n mips: Use generic time config\n microblaze: Use generic time config\n m68k: Use generic time config\n m32r: Use generic time config\n ...\n" }, { "commit": "d5b4bb4d103cd601d8009f2d3a7e44586c9ae7cc", "tree": "0f3b6da2b66fc7a4278764982279c2815c913010", "parents": [ "c80ddb526331a72c9e9d1480f85f6fd7c74e3d2d", "bb8187d35f820671d6dd76700d77a6b55f95e2c5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 17:12:06 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 17:12:06 2012 -0700" }, "message": "Merge branch \u0027delete-mca\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\nPull the MCA deletion branch from Paul Gortmaker:\n \"It was good that we could support MCA machines back in the day, but\n realistically, nobody is using them anymore. They were mostly limited\n to 386-sx 16MHz CPU and some 486 class machines and never more than\n 64MB of RAM. Even the enthusiast hobbyist community seems to have\n dried up close to ten years ago, based on what you can find searching\n various websites dedicated to the relatively short lived hardware.\n\n So lets remove the support relating to CONFIG_MCA. There is no point\n carrying this forward, wasting cycles doing routine maintenance on it;\n wasting allyesconfig build time on validating it, wasting I/O on git\n grep\u0027ping over it, and so on.\"\n\nLet\u0027s see if anybody screams. It generally has compiled, and James\nBottomley pointed out that there was a MCA extension from NCR that\nallowed for up to 4GB of memory and PPro-class machines. So in *theory*\nthere may be users out there.\n\nBut even James (technically listed as a maintainer) doesn\u0027t actually\nhave a system, and while Alan Cox claims to have a machine in his cellar\nthat he offered to anybody who wants to take it off his hands, he didn\u0027t\nargue for keeping MCA support either.\n\nSo we could bring it back. But somebody had better speak up and talk\nabout how they have actually been using said MCA hardware with modern\nkernels for us to do that. And David already took the patch to delete\nall the networking driver code (commit a5e371f61ad3: \"drivers/net:\ndelete all code/drivers depending on CONFIG_MCA\").\n\n* \u0027delete-mca\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n MCA: delete all remaining traces of microchannel bus support.\n scsi: delete the MCA specific drivers and driver code\n serial: delete the MCA specific 8250 support.\n arm: remove ability to select CONFIG_MCA\n" }, { "commit": "9dde0ae3769875ec1370cb316e50c54b57d52c1a", "tree": "c0d7967cd121cddf66ebeff5777007f557f86065", "parents": [ "76e10d158efb6d4516018846f60c2ab5501900bc" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Wed May 23 18:19:51 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 23 21:22:43 2012 +0200" }, "message": "ixp4xx: fix compilation by adding gpiolib support\n\nOnce again, ixp4xx no longer even compiles. This patch fixes the issue\nby converting over to gpiolib. This patch was first made by Imre and\nposted by Marc, and I added in Russell\u0027s suggestion to empty the gpio\nheader file.\n\nThis fix should also go for 3.1, 3.2, 3.3, and 3.4.\n\nSigned-off-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "e8650a08232e75274304b812ff04cfce9af9671c", "tree": "0609c942e6ca99016e788ff2ee2bbed1bb9215a4", "parents": [ "3c2c4b73aa79e4a1b601710b59e092441175f4bb", "f70d4a95edc7da87f39cd8b603ba131df2c198ed" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 19:22:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 19:22:50 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\nPull trivial updates from Jiri Kosina:\n \"As usual, it\u0027s mostly typo fixes, redundant code elimination and some\n documentation updates.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (57 commits)\n edac, mips: don\u0027t change code that has been removed in edac/mips tree\n xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer\n lib: Change mail address of Oskar Schirmer\n net: Change mail address of Oskar Schirmer\n arm/m68k: Change mail address of Sebastian Hess\n i2c: Change mail address of Oskar Schirmer\n net: Fix tcp_build_and_update_options comment in struct tcp_sock\n atomic64_32.h: fix parameter naming mismatch\n Kconfig: replace \"--- help ---\" with \"---help---\"\n c2port: fix bogus Kconfig \"default no\"\n edac: Fix spelling errors.\n qla1280: Remove redundant NULL check before release_firmware() call\n remoteproc: remove redundant NULL check before release_firmware()\n qla2xxx: Remove redundant NULL check before release_firmware() call.\n aic94xx: Get rid of redundant NULL check before release_firmware() call\n tehuti: delete redundant NULL check before release_firmware()\n qlogic: get rid of a redundant test for NULL before call to release_firmware()\n bna: remove redundant NULL test before release_firmware()\n tg3: remove redundant NULL test before release_firmware() call\n typhoon: get rid of redundant conditional before all to release_firmware()\n ...\n" }, { "commit": "cdd3a354a05b0c33fe33ab11a0fb0838396cad19", "tree": "ea2c87bbc2dc5865a97e73e201661d69937b45d5", "parents": [ "813a95e5b4fa936bbde10ef89188932745dcd7f4", "ada2e35defe6c6f0a986ec8147e47726fbd0e7b1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:41:01 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:41:01 2012 -0700" }, "message": "Merge tag \u0027pm\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc power management changes from Olof Johansson:\n \"Power management changes here are mostly for the omap platform, but\n also include cpuidle changes for ux500 and suspend/resume code for\n mmp.\"\n\n* tag \u0027pm\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)\n ARM: OMAP2+: WDTIMER integration: fix !PM boot crash, disarm timer after hwmod reset\n ARM: OMAP2/3: hwmod data: Add 32k-sync timer data to hwmod database\n ARM: OMAP4: hwmod_data: Name the common irq for McBSP ports\n ARM: OMAP4: hwmod data: I2C: add flag for context restore\n ARM: OMAP3: hwmod_data: Rename the common irq for McBSP ports\n ARM: OMAP2xxx: hwmod data: add HDQ/1-wire hwmod\n ARM: OMAP3: hwmod data: add HDQ/1-wire hwmod\n ARM: OMAP2+: hwmod data: add HDQ/1-wire hwmod shared data\n ARM: OMAP2+: HDQ1W: add custom reset function\n ARM: OMAP2420: hwmod data: Add MMC hwmod data for 2420\n arm: omap3: clockdomain data: Remove superfluous commas from gfx_sgx_3xxx_wkdeps[]\n ARM: OMAP2+: powerdomain: Get rid off duplicate pwrdm_clkdm_state_switch() API\n ARM: OMAP3: clock data: add clockdomain for HDQ functional clock\n ARM: OMAP3+: dpll: Configure autoidle mode only if it\u0027s supported\n ARM: OMAP2+: dmtimer: cleanup iclk usage\n ARM: OMAP4+: Add prm and cm base init function.\n ARM: OMAP2/3: Add idle_st bits for ST_32KSYNC timer to prcm-common header\n ARM: OMAP3: Fix CM register bit masks\n ARM: OMAP: clock: convert AM3517/3505 detection/flags to AM35xx\n ARM: OMAP3: clock data: treat all AM35x devices the same\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": "8dca6010d44cc722a94dc6da96560f9083dac782", "tree": "c804c272bc3d07a05459c2688e4b1c8b141d561c", "parents": [ "9bc747bea5fad819e0c0ad96e6a67ea0640dfe2b", "74c437532b8b5db53509963ec38e8424c56ff6f4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:27:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 22 09:27:39 2012 -0700" }, "message": "Merge tag \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull non-critical arm-soc bug fixes from Olof Johansson:\n \"These bug fixes were not important enough to have them included in the\n v3.4 release, mostly because they cover harmless warnings or\n unrealistic configurations. Instead we queue them up to be picked up\n in the next merge window.\"\n\nFixed up trivial conflict in arch/arm/mach-omap2/board-omap4panda.c\n\n* tag \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: spear6xx: remove board selection options\n ARM: OMAP: igep0020: Specify the VPLL2 regulator unconditionally\n ARM: OMAP2+: INTC: fix Kconfig option for TI81XX\n ARM: OMAP2+: remove incorrect irq_chip ack field\n ARM: OMAP4: Adding ID for OMAP4460 ES1.1\n ARM: OMAP4: panda: add statics to remove warnings\n ARM: OMAP2+: Incorrect Register Offsets in OMAP Mailbox\n ARM: OMAP: fix trivial warnings for dspbridge\n arm: davinci: use for_each_set_bit_from\n ARM: OMAP4: hsmmc: check for null pointer\n ARM: OMAP1: fix compilation issue in board-sx1.c\n ARM: disable SUSPEND/ARCH_SUSPEND_POSSIBLE for ARCH_TEGRA\n ARM: davinci: da850-evm: fix section mismatch\n ARM: tegra: add pll_x freq table entry for 750MHz\n ARM: davinci: mark spi_board_info arguments as const\n ARM: davinci: fix incorrect pdctl next bit position\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": "0f51596bd39a5c928307ffcffc9ba07f90f42a8b", "tree": "b636403815316ecad2170092b70f1079df260a95", "parents": [ "61f6c7a47a2f84b7ba4b65240ffe9247df772b06", "4ce63fcd919c32d22528e54dcd89506962933719" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue May 22 08:55:43 2012 +0200" }, "committer": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue May 22 08:55:43 2012 +0200" }, "message": "Merge branch \u0027for-next-arm-dma\u0027 into for-linus\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/mm/dma-mapping.c\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\n" }, { "commit": "471368557a734c6c486ee757952c902b36e7fd01", "tree": "f192a77d2cb70b1d135e7be62418806e8c590a3e", "parents": [ "cb60e3e65c1b96a4d6444a7a13dc7dd48bc15a2b", "e0d8ffd1df44518cb9ac9b1807d1f13cc100fc2f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 20:33:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 20:33:19 2012 -0700" }, "message": "Merge branch \u0027irq-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull core irq changes from Ingo Molnar:\n \"A collection of small fixes.\"\n\nBy Thomas Gleixner\n* \u0027irq-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n hexagon: Remove select of not longer existing Kconfig switches\n arm: Select core options instead of redefining them\n genirq: Do not consider disabled wakeup irqs\n genirq: Allow check_wakeup_irqs to notice level-triggered interrupts\n genirq: Be more informative on irq type mismatch\n genirq: Reject bogus threaded irq requests\n genirq: Streamline irq_action\n" }, { "commit": "bf67f3a5c456a18f2e8d062f7e88506ef2cd9837", "tree": "2a2324b2572162059307db82f9238eeb25673a77", "parents": [ "226da0dbc84ed97f448523e2a4cb91c27fa68ed9", "203dacbdca977bedaba61ad2fca75d934060a5d5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 19:43:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 19:43:57 2012 -0700" }, "message": "Merge branch \u0027smp-hotplug-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull smp hotplug cleanups from Thomas Gleixner:\n \"This series is merily a cleanup of code copied around in arch/* and\n not changing any of the real cpu hotplug horrors yet. I wish I\u0027d had\n something more substantial for 3.5, but I underestimated the lurking\n horror...\"\n\nFix up trivial conflicts in arch/{arm,sparc,x86}/Kconfig and\narch/sparc/include/asm/thread_info_32.h\n\n* \u0027smp-hotplug-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (79 commits)\n um: Remove leftover declaration of alloc_task_struct_node()\n task_allocator: Use config switches instead of magic defines\n sparc: Use common threadinfo allocator\n score: Use common threadinfo allocator\n sh-use-common-threadinfo-allocator\n mn10300: Use common threadinfo allocator\n powerpc: Use common threadinfo allocator\n mips: Use common threadinfo allocator\n hexagon: Use common threadinfo allocator\n m32r: Use common threadinfo allocator\n frv: Use common threadinfo allocator\n cris: Use common threadinfo allocator\n x86: Use common threadinfo allocator\n c6x: Use common threadinfo allocator\n fork: Provide kmemcache based thread_info allocator\n tile: Use common threadinfo allocator\n fork: Provide weak arch_release_[task_struct|thread_info] functions\n fork: Move thread info gfp flags to header\n fork: Remove the weak insanity\n sh: Remove cpu_idle_wait()\n ...\n" }, { "commit": "ff8ce5f67ddca709fe59e6173f89260f0fdc2b22", "tree": "90d3ad380b290d251b54590be485b2ffb4528e5a", "parents": [ "4f6ade91532b5b05ea28219b891f12a3cec528cd", "4ab1056766a4e49f6b9ef324313dd1583f8f8f4e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 16:01:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 16:01:50 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull core ARM updates from Russell King:\n \"This is the bulk of the core ARM updates for this merge window.\n Included in here is a different way to handle the VIVT cache flushing\n on context switch, which should allow scheduler folk to remove a\n special case in their core code.\n\n We have architectured timer support here, which is a set of timers\n specified by the ARM architecture for future SoCs. So we should see\n less variability in timer design going forward.\n\n The last big thing here is my cleanup to the way we handle PCI across\n ARM, fixing some oddities in some platforms which hadn\u0027t realised\n there was a way to deal with their private data already built in to\n our PCI backend.\n\n I\u0027ve also removed support for the ARMv3 architecture; it hasn\u0027t worked\n properly for years so it seems pointless to keep it around.\"\n\n* \u0027for-linus\u0027 of git://git.linaro.org/people/rmk/linux-arm: (47 commits)\n ARM: PCI: remove per-pci_hw list of buses\n ARM: PCI: dove/kirkwood/mv78xx0: use sys-\u003eprivate_data\n ARM: PCI: provide a default bus scan implementation\n ARM: PCI: get rid of pci_std_swizzle()\n ARM: PCI: versatile: fix PCI interrupt setup\n ARM: PCI: integrator: use common PCI swizzle\n ARM: 7416/1: LPAE: Remove unused L_PTE_(BUFFERABLE|CACHEABLE) macros\n ARM: 7415/1: vfp: convert printk\u0027s to pr_*\u0027s\n ARM: decompressor: avoid speculative prefetch from non-RAM areas\n ARM: Remove ARMv3 support from decompressor\n ARM: 7413/1: move read_{boot,persistent}_clock to the architecture level\n ARM: Remove support for ARMv3 ARM610 and ARM710 CPUs\n ARM: 7363/1: DEBUG_LL: limit early mapping to the minimum\n ARM: 7391/1: versatile: add some auxdata for device trees\n ARM: 7389/2: plat-versatile: modernize FPGA IRQ controller\n AMBA: get rid of last two uses of NO_IRQ\n ARM: 7408/1: cacheflush: return error to userspace when flushing syscall fails\n ARM: 7409/1: Do not call flush_cache_user_range with mmap_sem held\n ARM: 7404/1: cmpxchg64: use atomic64 and local64 routines for cmpxchg64\n ARM: 7347/1: SCU: use cpu_logical_map for per-CPU low power mode\n ...\n" }, { "commit": "764e0da14fd7ac2d259d98d34ece0a87d32306c9", "tree": "3d1c3065ca2f140f065c15c0b9645703241c68e7", "parents": [ "bdebaf80a02b854381fe212e0dac13c8c8edac57" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon May 21 23:16:18 2012 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon May 21 23:43:46 2012 +0200" }, "message": "timers: Fixup the Kconfig consolidation fallout\n\nSigh, I missed to check which architecture Kconfig files actually\ninclude the core Kconfig file. There are a few which did not. So we\nbroke them.\n\nInstead of adding the includes to those, we are better off to move the\ninclude to init/Kconfig like we did already with irqs and others.\n\nThis does not change anything for the architectures using the old\nstyle periodic timer mode. It just solves the build wreckage there.\n\nFor those architectures which use the clock events infrastructure it\nmoves the include of the core Kconfig file to \"General setup\" which is\na way more logical place than having it at random locations specified\nby the architecture specific Kconfigs.\n\nReported-by: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Anna-Maria Gleixner \u003canna-maria@glx-um.de\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "e47b65b032f2997aa0a7392ecdf656c86d4d7561", "tree": "801d2b42702da485506bcb19606489f0400a7c32", "parents": [ "8e95a53ba4b060e2d0d46575059ae96ea91a80fd" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Mon May 21 20:45:37 2012 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 12:50:12 2012 -0700" }, "message": "net: drop NET dependency from HAVE_BPF_JIT\n\nThere is no point having the NET dependency on the select target, as it\nforces all users to depend on NET to tell they support BPF_JIT. Move\nthe config option to the bottom of the file - this could be a nice place\nalso for future \"selectable\" config symbols.\n\nFix up all users to drop the dependency on NET now that it is not\nrequired to supress warnings for non-NET builds.\n\nReported-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nAcked-by: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4175160b065e74572819a320dcd34129224a4e1c", "tree": "3298e2c9a7c7db33bf28617875e5429e17eec61c", "parents": [ "ddf90a2ff2c4a9da99acc898a4afeab3e4251fcd", "0ec8e7aa8f63f0cacd545fcd7f40f93fde2c0e6e" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 21 15:15:24 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 21 15:15:24 2012 +0100" }, "message": "Merge branch \u0027misc\u0027 into for-linus\n\nConflicts:\n\tarch/arm/kernel/ptrace.c\n" }, { "commit": "ddf90a2ff2c4a9da99acc898a4afeab3e4251fcd", "tree": "97eb0b6e2d4fad9d5a3e58a4762997c6170ae05d", "parents": [ "dfb85185bda373a70409c70c2632b02fb0f8f449", "5693188a6e888603afa9564974145e5e6e2c623c", "56cb248428ead13a6b423ed3f3cf9e4aa01244b1", "d098bc7d58ebda22a6554b6c9df1056802d9900f", "34fd421349ffc6a4280b71276bf7c6d48f92156f", "90cf2418f5c45192bac1ac57af62f61dbac92886", "d12379acaf55a395083ca81d753b1af75507556c" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 21 15:15:10 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 21 15:15:10 2012 +0100" }, "message": "Merge branches \u0027amba\u0027, \u0027devel-stable\u0027, \u0027fixes\u0027, \u0027mach-types\u0027, \u0027mmci\u0027, \u0027pci\u0027 and \u0027versatile\u0027 into for-linus\n" }, { "commit": "c79095092834a18ae74cfc08def1a5a101dc106c", "tree": "c6cd81c38b92dcdb269288ab9a125bc13f4bb339", "parents": [ "0a2b9a6ea93650b8a00f9fd5ee8fdd25671e2df6" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Thu Dec 29 13:09:51 2011 +0100" }, "committer": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Mon May 21 15:09:38 2012 +0200" }, "message": "ARM: integrate CMA with DMA-mapping subsystem\n\nThis patch adds support for CMA to dma-mapping subsystem for ARM\narchitecture. By default a global CMA area is used, but specific devices\nare allowed to have their private memory areas if required (they can be\ncreated with dma_declare_contiguous() function during board\ninitialisation).\n\nContiguous memory areas reserved for DMA are remapped with 2-level page\ntables on boot. Once a buffer is requested, a low memory kernel mapping\nis updated to to match requested memory access type.\n\nGFP_ATOMIC allocations are performed from special pool which is created\nearly during boot. This way remapping page attributes is not needed on\nallocation time.\n\nCMA has been enabled unconditionally for ARMv6+ systems.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCC: Michal Nazarewicz \u003cmina86@mina86.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nTested-by: Rob Clark \u003crob.clark@linaro.org\u003e\nTested-by: Ohad Ben-Cohen \u003cohad@wizery.com\u003e\nTested-by: Benjamin Gaignard \u003cbenjamin.gaignard@linaro.org\u003e\nTested-by: Robert Nelson \u003crobertcnelson@gmail.com\u003e\nTested-by: Barry Song \u003cBaohua.Song@csr.com\u003e\n" }, { "commit": "4ce63fcd919c32d22528e54dcd89506962933719", "tree": "648f7681a5c89209b627e8c3e899d953ed38685d", "parents": [ "f99d60341238fe73fc514129cd9ae4e44e1b2c47" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Wed May 16 15:48:21 2012 +0200" }, "committer": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Mon May 21 15:06:23 2012 +0200" }, "message": "ARM: dma-mapping: add support for IOMMU mapper\n\nThis patch add a complete implementation of DMA-mapping API for\ndevices which have IOMMU support.\n\nThis implementation tries to optimize dma address space usage by remapping\nall possible physical memory chunks into a single dma address space chunk.\n\nDMA address space is managed on top of the bitmap stored in the\ndma_iommu_mapping structure stored in device-\u003earchdata. Platform setup\ncode has to initialize parameters of the dma address space (base address,\nsize, allocation precision order) with arm_iommu_create_mapping() function.\nTo reduce the size of the bitmap, all allocations are aligned to the\nspecified order of base 4 KiB pages.\n\ndma_alloc_* functions allocate physical memory in chunks, each with\nalloc_pages() function to avoid failing if the physical memory gets\nfragmented. In worst case the allocated buffer is composed of 4 KiB page\nchunks.\n\ndma_map_sg() function minimizes the total number of dma address space\nchunks by merging of physical memory chunks into one larger dma address\nspace chunk. If requested chunk (scatter list entry) boundaries\nmatch physical page boundaries, most calls to dma_map_sg() requests will\nresult in creating only one chunk in dma address space.\n\ndma_map_page() simply creates a mapping for the given page(s) in the dma\naddress space.\n\nAll dma functions also perform required cache operation like their\ncounterparts from the arm linear physical memory mapping version.\n\nThis patch contains code and fixes kindly provided by:\n- Krishna Reddy \u003cvdumpa@nvidia.com\u003e,\n- Andrzej Pietrasiewicz \u003candrzej.p@samsung.com\u003e,\n- Hiroshi DOYU \u003chdoyu@nvidia.com\u003e\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nAcked-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nTested-By: Subash Patel \u003csubash.ramaswamy@linaro.org\u003e\n" }, { "commit": "2dc6a016bbedf18f18ad73997e5338307d6dbde9", "tree": "741bf3c884304108b2e1d0a471aa6042c0d142e7", "parents": [ "a227fb92a0f5f0dd8282719386e9b3a29f0d16b2" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Fri Feb 10 19:55:20 2012 +0100" }, "committer": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Mon May 21 15:06:14 2012 +0200" }, "message": "ARM: dma-mapping: use asm-generic/dma-mapping-common.h\n\nThis patch modifies dma-mapping implementation on ARM architecture to\nuse common dma_map_ops structure and asm-generic/dma-mapping-common.h\nhelpers.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nAcked-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nTested-By: Subash Patel \u003csubash.ramaswamy@linaro.org\u003e\n" }, { "commit": "d4aa8b15936426b64de8996dcd3fc86b28894850", "tree": "ffbd2ecbd8126d021c5a2f023602ab37855d29ca", "parents": [ "9c6079aa1bfcf7e14de10b824779ce39b679bcb8" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon May 21 11:06:17 2012 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon May 21 11:06:17 2012 +0200" }, "message": "arm: Select core options instead of redefining them\n\nHARDIRQS_SW_RESEND and GENERIC_IRQ_PROBE are already defined as config\nswitches in the core Kconfig file. Select them instead of defining\nthem in ARM.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "3d92a71a4467681ef6a47e10447d200b52c78af8", "tree": "baee6bbf5f8d2a72e5990c5d32520e962672b175", "parents": [ "6e24f31eab6af44043e9d432bde415c1b4ca1a9e" ], "author": { "name": "Anna-Maria Gleixner", "email": "anna-maria@glx-um.de", "time": "Fri May 18 16:45:44 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon May 21 11:01:41 2012 +0200" }, "message": "arm: Use generic time config\n\nSigned-off-by: Anna-Maria Gleixner \u003canna-maria@glx-um.de\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nLink: http://lkml.kernel.org/r/20120518163104.760560327@glx-um.de\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "281f4d9ce7326b48e4d770ef689b97edb69e97da", "tree": "21953e476647d955a9f65e68aaaa5814f8958575", "parents": [ "a5e371f61ad33c07b28e7c9b60c78d71fdd34e2a" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed May 16 20:50:20 2012 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu May 17 19:01:46 2012 -0400" }, "message": "arm: remove ability to select CONFIG_MCA\n\nIt isn\u0027t clear to me why this ever existed, as I\u0027ve never heard\nof an ARM board with an MCA bus. Regardless, the MCA bus support\nis going away, so remove the ability to select it from ARM.\n\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: linux-arm-kernel@lists.infradead.org\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "3c0dec5f58b3c7b3627715126d1bf9b030a076f0", "tree": "4bf8f56fca3bf6be109209b116fc8e32cb2e0f9e", "parents": [ "fcd8d84a585f3578a9ebdd27e757495a27415322", "7e0fa1b5fa91d9aa456d102c273b2cf0f2e95d39" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 16 16:35:25 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 16 16:35:25 2012 +0200" }, "message": "Merge branch \u0027clk-next\u0027 of git://git.linaro.org/people/mturquette/linux into next/clock\n\n* \u0027clk-next\u0027 of git://git.linaro.org/people/mturquette/linux:\n clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().\n clk: Provide dummy clk_unregister()\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 ARM: Orion: SDIO: Add support for clk.\n ARM: Orion: NAND: Add support for clk, if there is one.\n ARM: Orion: EHCI: Add support for enabling clocks\n ARM: Orion: SATA: Add per channel clk/clkdev support.\n ARM: Orion: UART: Get the clock rate via clk_get_rate().\n ARM: Orion: WDT: Add clk/clkdev support\n ARM: Orion: Eth: Add clk/clkdev support.\n ARM: Orion: SPI: Add clk/clkdev support.\n ARM: Orion: Add clocks using the generic clk infrastructure.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "0e896b1ddc1905df904df98c204bacf028219729", "tree": "dc1965765c0a55e1260c4c3956db4ae2b23cc235", "parents": [ "48b9bf0953867d4fb21f44d8c1a061b5358fe53b", "0573a2bb885848af67127b77dbebb900d0ae19b9" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 16 15:43:21 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 16 15:43:21 2012 +0200" }, "message": "Merge branch \u0027clps711x/cleanup\u0027 into next/cleanup\n\n* clps711x/cleanup:\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\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "cbd8d842319c8084c050292e7d167be2a4cf1ad9", "tree": "5bc38760f2f92a113e34b6ad487a3b9374ed071a", "parents": [ "0fa7be407dc101afe2d3dc99ded99de34c967a52" ], "author": { "name": "Barry Song", "email": "Baohua.Song@csr.com", "time": "Tue May 15 10:35:46 2012 +0800" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue May 15 17:04:01 2012 +0200" }, "message": "ARM: PRIMA2: select PINCTRL and PINCTRL_SIRF in Kconfig\n\nSigned-off-by: Barry Song \u003cBaohua.Song@csr.com\u003e\nAcked-by: 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": "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": "0e2fce59e455fb5e40c9c965556880fc7986af7c", "tree": "f36013ab23dfd507efac86e3a5068d01145d6f54", "parents": [ "b3ff9341ff828d38afe2799b1c7b4f37c1fcf411" ], "author": { "name": "Alexander Shiyan", "email": "shc_work@mail.ru", "time": "Mon May 14 21:46:10 2012 +0400" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 20:39:24 2012 +0200" }, "message": "ARM: clps711x: Added note about support EP731x CPU to Kconfig\n\nep7312 has been supported for a very long time, but has never\nbeen mentioned in the Kconfig file.\n\nSigned-off-by: Alexander Shiyan \u003cshc_work@mail.ru\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\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": "163ec0369be4c26e68385f6cec88d0ee38c8d8e5", "tree": "f3e441866f8bc1b0548e7d8eddd9548b6aedef5e", "parents": [ "199642bfe107c411f25fbfc16c9fd49cfef9785d", "99dbdd98f271899e023d52b3f4c2bf67cdd7eb56" ], "author": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Sun May 13 07:53:34 2012 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Sun May 13 07:53:34 2012 +0900" }, "message": "Merge branch \u0027next/cleanup-plat-s3c24xx\u0027 into next/cleanup-plat-s3c24xx-s5p\n" }, { "commit": "199642bfe107c411f25fbfc16c9fd49cfef9785d", "tree": "a2ca24d98d38d389c0dc5ae69cce82df4d2dd14a", "parents": [ "e033ca9bfa0831889d7b8fdad516c771ad200e41" ], "author": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Sun May 13 07:11:38 2012 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Sun May 13 07:52:54 2012 +0900" }, "message": "ARM: SAMSUNG: merge plat-s5p into plat-samsung\n\nSince just plat-samsung can support all of Samsung stuff so\nthat there is no more need to keep the plat-s5p for S5P SoCs.\n\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "eae0185a9677d3ff0c1781ee196f2ef42deb0ea1", "tree": "15ed6ba564cd04b4ac7235f85ea7489d4eeaaa9b", "parents": [ "93c6d8927fa692faef3d7d945bd4fe84b0185ad4", "5df33a62c4a028d6fc7f2dcc159827d09b7334b8" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun May 13 00:11:06 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun May 13 00:11:06 2012 +0200" }, "message": "Merge branch \u0027spear/clock\u0027 into next/clock\n\nViresh Kumar \u003cviresh.kumar@st.com\u003e writes:\n\n This is rebased over a (merge of Mike\u0027s/clk-next \u0026 SPEAr\u0027s DT) + Russell\u0027s\n patch: CLKDEV: provide helpers for common clock framework rebased over them.\n\n* spear/clock:\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\nConflicts:\n\tdrivers/clk/Makefile\n\n[Arnd: rebased again without the spear/dt branch]\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "5df33a62c4a028d6fc7f2dcc159827d09b7334b8", "tree": "f4da61ce3bf14e9bf4a1dae3188109a6de34f708", "parents": [ "f8abc080d33e69dfa2c3dd0f84c31832e2679091" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Tue Apr 10 09:02:35 2012 +0530" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat May 12 21:44:12 2012 +0200" }, "message": "SPEAr: Switch to common clock framework\n\nSPEAr SoCs used its own clock framework since now. From now on they will move to\nuse common clock framework.\n\nThis patch updates existing SPEAr machine support to adapt for common clock\nframework.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nReviewed-by: Mike Turquette \u003cmturquette@linaro.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\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": "844d0b5a0b42d6c73114a1dc229db751120d226f", "tree": "faf9f83e78ae24f6730d64999a89c35144da3b8a", "parents": [ "50260924afd4b745bfb6e5f1caee381a1875fc31", "a0f5e3631b07cabf624e7d818df76d47d9d21017" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Sat May 12 13:32:09 2012 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Sat May 12 13:32:09 2012 +0800" }, "message": "Merge branches \u0027clk/mxs\u0027 and \u0027imx/pinctrl/for-3.5\u0027 into mxs/dt/for-3.5\n" }, { "commit": "a0f5e3631b07cabf624e7d818df76d47d9d21017", "tree": "51a2d22aee63da4c0dba43447ee54759a5657dd5", "parents": [ "fe233b9df3842b3927c0275322a8047f8b33b194" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Sun May 06 23:13:13 2012 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Sat May 12 09:43:21 2012 +0800" }, "message": "ARM: mxs: enable pinctrl support\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "7563bbf89d065a2c3f05059ecbcc805645edcc62", "tree": "2b8231e8145a73cce0da67ce38e0360fcd0a802e", "parents": [ "25cf25073a4e1e0563c288908481f10f98acb19a" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Sun Apr 15 10:52:54 2012 +0100" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri May 11 18:00:14 2012 -0600" }, "message": "gpiolib/arches: Centralise bolierplate asm/gpio.h\n\nRather than requiring architectures that use gpiolib but don\u0027t have any\nneed to define anything custom to copy an asm/gpio.h provide a Kconfig\nsymbol which architectures must select in order to include gpio.h and\nfor other architectures just provide the trivial implementation directly.\n\nThis makes it much easier to do gpiolib updates and is also a step towards\nmaking gpiolib APIs available on every architecture.\n\nFor architectures with existing boilerplate code leave a stub header in\nplace which warns on direct inclusion of asm/gpio.h and includes\nlinux/gpio.h to catch code that\u0027s doing this. Direct inclusion of\nasm/gpio.h has long been deprecated.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nAcked-by: Jonas Bonn \u003cjonas@southpole.se\u003e\nAcked-by: Tony Luck \u003ctony.luck@intel.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "bdbaaf1ac756116a0f6ed116931934e7a6f35160", "tree": "a23cd113270f9013dfeffad1dfa17012bbf63d68", "parents": [ "d48b97b403d23f6df0b990cee652bdf9a52337a3", "3d5e8af45a3d52ff9fd30035ffbc4887e04f4d73" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 09 23:26:01 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed May 09 23:26:15 2012 -0700" }, "message": "Merge branch \u0027for-3.5/fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/fixes\n\nBy Stephen Warren\nvia Stephen Warren\n* \u0027for-3.5/fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:\n ARM: disable SUSPEND/ARCH_SUSPEND_POSSIBLE for ARCH_TEGRA\n ARM: tegra: add pll_x freq table entry for 750MHz\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\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": "2f129bf4aab684bef1e82e747b709a5025ecb698", "tree": "4be6e04fc306cfad25b3b86f831cd4d462c10f44", "parents": [ "f0948f59dbc8e725a96ba16da666e8f5cdd43ba8" ], "author": { "name": "Andrew Lunn", "email": "andrew@lunn.ch", "time": "Thu Dec 15 08:15:07 2011 +0100" }, "committer": { "name": "Mike Turquette", "email": "mturquette@linaro.org", "time": "Tue May 08 16:33:39 2012 -0700" }, "message": "ARM: Orion: Add clocks using the generic clk infrastructure.\n\nAdd tclk as a fixed rate clock for all platforms. In addition, on\nkirkwood, add a gated clock for most of the clocks which can be gated.\n\nSigned-off-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nTested-by: Jamie Lentin \u003cjm@lentin.co.uk\u003e\n[mturquette@linaro.org: removed redundant CLKDEV_LOOKUP from Kconfig]\n[mturquette@linaro.org: removed redundant clk.h from mach-dove/common.c]\nSigned-off-by: Mike Turquette \u003cmturquette@linaro.org\u003e\n" }, { "commit": "2664681fa4101aef2bceb81bbe26a81a88131393", "tree": "2a7e24a19c50da323956accbde0ca13b613bff30", "parents": [ "e80d76f84660268859ab82e82fd78c1ce8439323" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Sun Apr 29 00:02:39 2012 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Wed May 09 00:02:41 2012 +0800" }, "message": "ARM: mxs: switch to common clk framework\n\nIt switches mxs clock support to common clk framework based drivers.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "67ba5293f705eb1d1b98710e5ccb0f615936a6fc", "tree": "cdb4cfd94033b5c0f42eeb4de368802049880a12", "parents": [ "86627c93b35082f7a0e4d3111546943984b932c7", "d909a81b198a397593495508c4a5755fe95552fb" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 08 14:07:48 2012 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 08 14:07:48 2012 +0200" }, "message": "Merge branch \u0027smp/threadalloc\u0027 into smp/hotplug\n\nReason: Pull in the separate branch which was created so arch/tile can\nbase further work on it.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "448eca90932d97856b6a6097fc50eef96d77dec0", "tree": "75a2f19fca8e20eb5c8340be6cb2a49eaeb6dde4", "parents": [ "85f7f656274fa0ba109dd8774db3887d42de5c6b" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon May 07 17:59:49 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 08 12:35:06 2012 +0200" }, "message": "arm: Remove unused cpu_idle_wait()\n\ncpuidle uses a generic function now. Remove the unused code.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nLink: http://lkml.kernel.org/r/20120507175652.260797846@linutronix.de\n" }, { "commit": "3f5d081957cee794fe2937bb7edafa7ac949044d", "tree": "eca3454f0e5ab78e540cc39d02b2bd82421a85d5", "parents": [ "87046f4f3194ac0a795a10f3368ac73c04c633e3" ], "author": { "name": "Chao Xie", "email": "chao.xie@marvell.com", "time": "Mon May 07 11:23:58 2012 +0800" }, "committer": { "name": "Haojian Zhuang", "email": "haojian.zhuang@gmail.com", "time": "Mon May 07 11:42:54 2012 +0800" }, "message": "ARM: mm: proc-mohawk: add suspend resume for mohawk\n\nWhen enable ARCH_SUSPEND_POSSIBLE, it need defintion of\ncpu_mohawk_do_suspend and cpu_mohawk_do_resume\n\nSigned-off-by: Chao Xie \u003cchao.xie@marvell.com\u003e\nSigned-off-by: Haojian Zhuang \u003c\u003chaojian.zhuang@gmail.com\u003e\n" }, { "commit": "a6359d1eec43d1fd6ffbac958149844873e0084f", "tree": "cbb9681ac4f34c6653064ecbd1bdda8f910d40a2", "parents": [ "e4d59621923ba6c42f30a9d74c7c78d101c2f7aa" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu May 03 09:03:02 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat May 05 13:00:46 2012 +0200" }, "message": "init_task: Replace CONFIG_HAVE_GENERIC_INIT_TASK\n\nNow that all archs except ia64 are converted, replace the config and\nlet the ia64 select CONFIG_ARCH_INIT_TASK\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLink: http://lkml.kernel.org/r/20120503085035.867948914@linutronix.de\n\n" }, { "commit": "5290dc292915aaed6ae71ec3db5d4aa3285e7d51", "tree": "aafbe36686b38228391fd32cea60d6221d71fd8a", "parents": [ "5dced29d71c2ad9b6e69a4af360bd2fd1b3c4950" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu May 03 09:02:50 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat May 05 13:00:22 2012 +0200" }, "message": "arm: Use generic init_task\n\nSame code. Use the generic version. The special Makefile treatment is\npointless anyway as init_task.o contains only data which is handled by\nthe linker script. So no point on being treated like head text.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Russell King \u003clinux@arm.linux.org.uk\u003e\nLink: http://lkml.kernel.org/r/20120503085034.221811388@linutronix.de\n" }, { "commit": "c24b31147a0615abd6f15c9e2b6349191860db35", "tree": "e3a3f228a5ae10b0eb1f5ea2e76496d8a529c19d", "parents": [ "3f4dd3224df9664a44bf05df56c7c12622f7a1c7" ], "author": { "name": "Haojian Zhuang", "email": "haojian.zhuang@gmail.com", "time": "Thu Apr 12 19:02:02 2012 +0800" }, "committer": { "name": "Haojian Zhuang", "email": "haojian.zhuang@gmail.com", "time": "Sat May 05 16:35:13 2012 +0800" }, "message": "ARM: mmp: support DT in irq\n\nMerge irq-pxa168 and irq-mmp2. And support device tree also.\n\nSince CONFIG_SPARSE_IRQ is enabled in arch-mmp, base irq starts from\nNR_IRQS_LEGACY.\n\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "3108e6ab21a9b9dbd88f0b2ff99f73e95b8b1580", "tree": "9e87e1e4196849090103317d109dc95ba9d159f8", "parents": [ "69964ea4c7b68c9399f7977aa5b9aa6539a6a98a" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Sat Apr 28 14:33:47 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri May 04 16:53:37 2012 +0100" }, "message": "ARM: 7389/2: plat-versatile: modernize FPGA IRQ controller\n\nThis does two things to the FPGA IRQ controller in the versatile\nfamily:\n\n- Convert to MULTI_IRQ_HANDLER so we can drop the entry macro\n from the Integrator. The C IRQ handler was inspired from\n arch/arm/common/vic.c, recent bug discovered in this handler was\n accounted for.\n- Convert to using IRQ domains so we can get rid of the NO_IRQ\n mess and proceed with device tree and such stuff.\n\nAs part of the exercise, bump all the low IRQ numbers on the\nIntegrator PIC to start from 1 rather than 0, since IRQ 0 is\nnow NO_IRQ. The Linux IRQ numbers are thus entirely decoupled\nfrom the hardware IRQ numbers in this controller.\n\nI was unable to split this patch. The main reason is the half-done\nconversion to device tree in Versatile.\n\nTested on Integrator/AP and Integrator/CP.\n\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "3d5e8af45a3d52ff9fd30035ffbc4887e04f4d73", "tree": "4f5a598c51b52ee5a98b6def84b6526a56ed4d8c", "parents": [ "aea812e1ac80a491d39396e2a2d15bb725933c84" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Fri Apr 13 15:30:07 2012 -0600" }, "committer": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed May 02 10:09:24 2012 -0600" }, "message": "ARM: disable SUSPEND/ARCH_SUSPEND_POSSIBLE for ARCH_TEGRA\n\nTegra doesn\u0027t yet support system sleep. Explicitly disable support\nfor this feature in Kconfig.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\n" }, { "commit": "022c03a2d650c641fa0f94dbc9d9ff77f8057678", "tree": "02b674ae7ca92dda57a487877d0625dca341b26a", "parents": [ "bfa05f4f3398b61205567f3a5cad90804a5a1fdc" ], "author": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Wed Jan 11 17:25:17 2012 +0000" }, "committer": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Fri Apr 27 13:35:33 2012 +0100" }, "message": "ARM: local timers: Add A15 architected timer support\n\nAdd support for the A15 generic timer and clocksource.\nAs the timer generates interrupts on a different PPI depending\non the execution mode (normal or secure), it is possible to\nregister two different PPIs.\n\nSigned-off-by: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\n" }, { "commit": "84ec6d5796e095e2f8698bd2b5d33849ed26d9e2", "tree": "559f3072f2d1195ef1e02171f5e6429650a80792", "parents": [ "13583bf15eb1e890e03d46b6f2753e4b64af21c9" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Apr 20 13:05:50 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Apr 26 12:06:11 2012 +0200" }, "message": "arm: Use generic idle thread allocation\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Srivatsa S. Bhat \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nTested-by: Frank Rowand \u003cfrank.rowand@am.sony.com\u003e\nLink: http://lkml.kernel.org/r/20120420124557.448826362@linutronix.de\n" }, { "commit": "0693bf68148c4473158e435383e75af70b704f78", "tree": "8bb62e5b4ad99f9dd87d90949b0772cb81cdd96f", "parents": [ "bf2c9f9866928df60157bc4f1ab39f93a32c754e" ], "author": { "name": "Wade Farnsworth", "email": "wade_farnsworth@mentor.com", "time": "Wed Apr 04 16:19:47 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Apr 25 19:49:28 2012 +0100" }, "message": "ARM: 7374/1: add TRACEHOOK support\n\nAdd calls to tracehook_report_syscall_{entry,exit} and tracehook_signal_handler\n\nSigned-off-by: Steven Walter \u003cstevenrwalter@gmail.com\u003e\nSigned-off-by: Wade Farnsworth \u003cwade_farnsworth@mentor.com\u003e\nReviewed-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "98fab064d321f740fde24785d1421523d249fc0e", "tree": "2f1c84a432e58395a707e750937512a514f7474e", "parents": [ "37e74beb8ac95f1abd8d08d005c55cb9af7db9a5" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Apr 25 12:51:07 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Apr 25 12:53:10 2012 +0100" }, "message": "ARM: Remove unnecessary selection of TICK_ONESHOT\n\nIn 3872c48b (tick: Document TICK_ONESHOT config option) Thomas describes\nthe circumstances under which TICK_ONESHOT should be selected. This is\nan internal time keeping configuration symbol which should not be\nselected by platform or arch code. So remove our select statements for\nit.\n\nThis kills these warnings in OMAP builds:\n\nkernel/time/tick-sched.c:47: warning: \u0027tick_do_update_jiffies64\u0027 defined but not used\nkernel/time/tick-sched.c:89: warning: \u0027tick_init_jiffy_update\u0027 defined but not used\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "f0c4b8d653f5ee091fb8d4d02ed7eaad397491bb", "tree": "cc7f1d1be2354dee506453f63f92a878384f30a8", "parents": [ "e895bd7992df1ebd1e0c28f7965520482bc83b74" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Fri Apr 20 17:20:08 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Apr 23 14:21:52 2012 +0100" }, "message": "ARM: 7396/1: errata: only handle ARM erratum #326103 on affected cores\n\nErratum #326103 (\"FSR write bit incorrect on a SWP to read-only memory\")\nonly affects the ARM 1136 core prior to r1p0. The workaround\ndisassembles the faulting instruction to determine whether it was a read\nor write access on all v6 cores.\n\nAn issue has been reported on the ARM 11MPCore whereby loading the\nfaulting instruction may happen in parallel with that page being\nunmapped, resulting in a deadlock due to the lack of TLB broadcasting\nin hardware:\n\nhttp://lists.infradead.org/pipermail/linux-arm-kernel/2012-March/091561.html\n\nThis patch limits the workaround so that it is only used on affected\ncores, which are known to be UP only. Other v6 cores can rely on the\nFSR to indicate the access type correctly.\n\nCc: stable@vger.kernel.org\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\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": "f5c422713308e492eddc44a12134f9f249ddfbdb", "tree": "f5f3f115b40aada230e8d413429000a0a7741991", "parents": [ "e04920d9efcb3517cabc61a55a3ce4bce51518bc" ], "author": { "name": "Roland Stigge", "email": "stigge@antcom.de", "time": "Sun Apr 22 12:01:19 2012 +0200" }, "committer": { "name": "Roland Stigge", "email": "stigge@antcom.de", "time": "Sun Apr 22 12:01:19 2012 +0200" }, "message": "ARM: LPC32xx: Device tree support\n\nThis patch does the actual device tree switch for the LPC32xx SoC.\n\nSigned-off-by: Roland Stigge \u003cstigge@antcom.de\u003e\n" }, { "commit": "37e74beb8ac95f1abd8d08d005c55cb9af7db9a5", "tree": "ed55a12ee9fd7f8a18d2ed51b61f54ecbd71985d", "parents": [ "4542b6a0fa6b48d9ae6b41c1efeb618b7a221b2a" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Mon Apr 16 22:53:44 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Apr 19 19:33:23 2012 +0100" }, "message": "ARM: 7388/1: Kconfig: Remove duplicate IRQ Kconfig entries\n\nThese kconfig entries are already defined in kernel/irq/Kconfig\nso select them instead of redefining them.\n\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "59bf896406471ac49d124b3e5f4edcafe28e5360", "tree": "40360c346a159f947d6284bf9c2fe38c70a7751c", "parents": [ "3773b4540721a2e8d4b957f4619ada4bf0bc8e45" ], "author": { "name": "Masanari Iida", "email": "standby24x7@gmail.com", "time": "Wed Apr 18 00:01:21 2012 +0900" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Apr 18 14:12:27 2012 +0200" }, "message": "Fix \"the the\" in various Kconfig\n\nFix typo \"the the\" in various Kconfig.\n\nSigned-off-by: Masanari Iida \u003cstandby24x7@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "929e994f7e249a58f50ccdd066da9899a6e39c7a", "tree": "5666420bc58c31710ec81f50a7e52b2a2a57298e", "parents": [ "e816b57a337ea3b755de72bec38c10c864f23015" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Thu Mar 15 12:21:12 2012 +0100" }, "committer": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Mon Apr 16 12:36:39 2012 +0200" }, "message": "ARM: at91: change AT91 Kconfig entry comment\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\n" }, { "commit": "17d2f847e6aa1181024cb881fdc6cbad18f11b04", "tree": "d6a1c35140a566a3b4bdf032b597cf96f5758e95", "parents": [ "0034102808e0dbbf3a2394b82b1bb40b5778de9e", "c65f2abf54a6d07260f1fa64773154e1d7047961" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Apr 14 22:17:47 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Apr 14 22:17:47 2012 -0700" }, "message": "Merge branch \u0027ixp2xxx/removal\u0027 into next/cleanup\n\n* ixp2xxx/removal:\n ARM: remove ixp23xx and ixp2000 platforms\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": "1ac02d795889d1828a66d4b3a3fd66492d1d7cf2", "tree": "e77b927029ba0280754936c5a75941bfdfa8ec8d", "parents": [ "00bd60fe33f3b9e0d790a5e3eebbaa50ac89ead2" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Wed Apr 04 17:48:04 2012 -0500" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Apr 05 11:29:55 2012 -0700" }, "message": "ARM: fix __io macro for PCMCIA\n\nWith commit c334bc1 (ARM: make mach/io.h include optional), PCMCIA was\nbroken. PCMCIA depends on __io() returning a valid i/o address, and most\nARM platforms require IO_SPACE_LIMIT be set to 0xffffffff for PCMCIA. This\nneeds a better fix with a fixed i/o address mapping, but for now we just\nrestore things to the previous behavior.\n\nThis fixes at91, omap1, pxa and sa11xx. pxa needs io.h if PCI is enabled,\nbut PCMCIA is not. sa11xx already has IO_SPACE_LIMIT set to 0xffffffff,\nso it doesn\u0027t need an io.h.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: Joachim Eastwood \u003cjoachim.eastwood@jotron.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Andrew Victor \u003clinux@maxim.org.za\u003e\nCc: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: Jean-Christophe Plagniol-Villard \u003cplagnioj@jcrosoft.com\u003e\nTested-by: Paul Parsons \u003clost.distance@yahoo.com\u003e (pxa270)\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "820d41cf0cd0e94a5661e093821e2e5c6b36a9d8", "tree": "4d03046048dc52a8fa539c7e7b846e02738d8ca5", "parents": [ "6268b325c3066234e7bddb99d2b98bcedb0c0033", "88b48684fe2d4f6207223423227c80d5408bccaf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 18:02:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 18:02:10 2012 -0700" }, "message": "Merge tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: cleanups of io includes\" from Olof Johansson:\n \"Rob Herring has done a sweeping change cleaning up all of the\n mach/io.h includes, moving some of the oft-repeated macros to a common\n location and removing a bunch of boiler plate. This is another step\n closer to a common zImage for multiple platforms.\"\n\nFix up various fairly trivial conflicts (\u003cmach/io.h\u003e removal vs changes\naround it, tegra localtimer.o is *still* gone, yadda-yadda).\n\n* tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)\n ARM: tegra: Include assembler.h in sleep.S to fix build break\n ARM: pxa: use common IOMEM definition\n ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol\n ARM: __io abuse cleanup\n ARM: create a common IOMEM definition\n ARM: iop13xx: fix missing declaration of iop13xx_init_early\n ARM: fix ioremap/iounmap for !CONFIG_MMU\n ARM: kill off __mem_pci\n ARM: remove bunch of now unused mach/io.h files\n ARM: make mach/io.h include optional\n ARM: clps711x: remove unneeded include of mach/io.h\n ARM: dove: add explicit include of dove.h to addr-map.c\n ARM: at91: add explicit include of hardware.h to uncompressor\n ARM: ep93xx: clean-up mach/io.h\n ARM: tegra: clean-up mach/io.h\n ARM: orion5x: clean-up mach/io.h\n ARM: davinci: remove unneeded mach/io.h include\n [media] davinci: remove includes of mach/io.h\n ARM: OMAP: Remove remaining includes for mach/io.h\n ARM: msm: clean-up mach/io.h\n ...\n" }, { "commit": "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": "9e4db1c3eed55c22328d8022c2c80adb3093833f", "tree": "9643545e6bd182f1d3e19942f590a6a1e3198320", "parents": [ "de8856d2c11f562c60ed9340a83db4a4f829a6e6", "aae528d9a8ad79d4b21b1b723abc9447fdb0d200" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 18:17:02 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 18:17:02 2012 -0700" }, "message": "Merge branch \u0027platforms\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull ARM platform updates from Russell King:\n \"This covers platform stuff for platforms I have a direct interest in\n (iow, I have the hardware). Essentially:\n - as we no longer support any other Acorn platforms other than RiscPC\n anymore, we can collect all that code into mach-rpc.\n - convert Acorn expansion card stuff to use IRQ allocation functions,\n and get rid of NO_IRQ from there.\n - cleanups to the ebsa110 platform to move some private stuff out of\n its header files.\n - large amount of SA11x0 updates:\n - conversion of private DMA implementation to DMA engine support\n (this actually gives us greater flexibility in drivers over the old\n API.)\n - re-worked ucb1x00 updates - convert to genirq, remove sa11x0\n dependencies, fix various minor issues\n - move platform specific sa11x0 framebuffer data into platform files\n in arch/arm instead of keeping this in the driver itself\n - update sa11x0 IrDA driver for DMA engine, and allow it to use DMA\n for SIR transmissions as well as FIR\n - rework sa1111 support for genirq, and irq allocation\n - fix sa1111 IRQ support so it works again\n - use sparse IRQ support\n\n After this, I have one more pull request remaining from my current\n set, which I think is going to be the most problematical as it\n generates 8 conflicts.\"\n\nFixed up the trivial conflict in arch/arm/mach-rpc/Makefile as per\nRussell.\n\n* \u0027platforms\u0027 of git://git.linaro.org/people/rmk/linux-arm: (125 commits)\n ARM: 7343/1: sa11x0: convert to sparse IRQ\n ARM: 7342/2: sa1100: prepare for sparse irq conversion\n ARM: 7341/1: input: prepare jornada720 keyboard and ts for sa11x0 sparse irq\n ARM: 7340/1: rtc: sa1100: include mach/irqs.h instead of asm/irq.h\n ARM: sa11x0: remove unused DMA controller definitions\n ARM: sa11x0: remove old SoC private DMA driver\n USB: sa1111: add hcd .reset method\n USB: sa1111: add OHCI shutdown methods\n USB: sa1111: reorganize ohci-sa1111.c\n USB: sa1111: get rid of nasty printk(KERN_DEBUG \"%s: ...\", __FILE__)\n USB: sa1111: sparse and checkpatch cleanups\n ARM: sa11x0: don\u0027t static map sa1111\n ARM: sa1111: use dev_err() rather than printk()\n ARM: sa1111: cleanup sub-device registration and unregistration\n ARM: sa1111: only setup DMA for DMA capable devices\n ARM: sa1111: register sa1111 devices with dmabounce in bus notifier\n ARM: sa1111: move USB interface register definitions to ohci-sa1111.c\n ARM: sa1111: move PCMCIA interface register definitions to sa1111_generic.c\n ARM: sa1111: move PS/2 interface register definitions to sa1111p2.c\n ARM: sa1111: delete unused physical GPIO register definitions\n ...\n" }, { "commit": "66f03c614c0902ccf7d6160459362a9352f33271", "tree": "b9a8864efe5aa7fc5c96cc5ccbeca41f5cd6f6a7", "parents": [ "34800598b2eebe061445216473b1e4c2ff5cba99", "cdc3df6f44f72c5924a16a47e1663c3fb0e57820" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:47:35 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:47:35 2012 -0700" }, "message": "Merge tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: device tree work\" from Arnd Bergmann:\n \"Most of these patches convert code from using static platform data to\n describing the hardware in the device tree. This is only the first\n half of the changes for v3.4 because a lot of patches for this topic\n came in the last week before the merge window.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\nFix up trivial conflicts in arch/arm/mach-vexpress/{Kconfig,core.h}\n\n* tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (86 commits)\n Document: devicetree: add OF documents for arch-mmp\n ARM: dts: append DTS file of pxa168\n ARM: mmp: append OF support on pxa168\n ARM: mmp: enable rtc clk in pxa168\n i2c: pxa: add OF support\n serial: pxa: add OF support\n arm/dts: mt_ventoux: very basic support for TeeJet Mt.Ventoux board\n ARM: OMAP2+: Remove extra ifdefs for board-generic\n ARM: OMAP2+: Fix build error when only ARCH_OMAP2/3 or 4 is selected\n ASoC: DT: Add digital microphone binding to PAZ00 board.\n ARM: dt: Add ARM PMU to tegra*.dtsi\n ARM: at91: at91sam9x5cm/dt: add leds support\n ARM: at91: usb_a9g20/dt: add gpio-keys support\n ARM: at91: at91sam9m10g45ek/dt: add gpio-keys support\n ARM: at91: at91sam9m10g45ek/dt: add leds support\n ARM: at91: usb_a9g20/dt: add leds support\n ARM: at91/pio: add new PIO3 features\n ARM: at91: add sam9_smc.o to at91sam9x5 build\n ARM: at91/tc/clocksource: Add 32 bit variant to Timer Counter\n ARM: at91/tc: add device tree support to atmel_tclib\n ...\n" }, { "commit": "34800598b2eebe061445216473b1e4c2ff5cba99", "tree": "a6d0eb6fe45d9480888d7ddb34840e172ed80e56", "parents": [ "46b407ca4a6149c8d27fcec1881d4f184bec7c77", "511f1cb6d426938fabf9c6d69ce4861b66ffd919" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:41:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:41:24 2012 -0700" }, "message": "Merge tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: driver specific updates\" from Arnd Bergmann:\n \"These are all specific to some driver. They are typically the\n platform side of a change in the drivers directory, such as adding a\n new driver or extending the interface to the platform. In cases where\n there is no maintainer for the driver, or the maintainer prefers to\n have the platform changes in the same branch as the driver changes,\n the patches to the drivers are included as well.\n\n A much smaller set of driver updates that depend on other branches\n getting merged first will be sent later.\n\n The new export of tegra_chip_uid conflicts with other changes in\n fuse.c. In rtc-sa1100.c, the global removal of IRQF_DISABLED\n conflicts with the cleanup of the interrupt handling of that driver.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\nFixed up aforementioned trivial conflicts.\n\n* tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)\n ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci\n mmc: sdhci-s3c: add platform data for the second capability\n ARM: SAMSUNG: support the second capability for samsung-soc\n ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC\n ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1\n ARM: EXYNOS: Enable MDMA driver\n regulator: Remove bq24022 regulator driver\n rtc: sa1100: add OF support\n pxa: magician/hx4700: Convert to gpio-regulator from bq24022\n ARM: OMAP3+: SmartReflex: fix error handling\n ARM: OMAP3+: SmartReflex: fix the use of debugfs_create_* API\n ARM: OMAP3+: SmartReflex: micro-optimization for sanity check\n ARM: OMAP3+: SmartReflex: misc cleanups\n ARM: OMAP3+: SmartReflex: move late_initcall() closer to its argument\n ARM: OMAP3+: SmartReflex: add missing platform_set_drvdata()\n ARM: OMAP3+: hwmod: add SmartReflex IRQs\n ARM: OMAP3+: SmartReflex: clear ERRCONFIG_VPBOUNDINTST only on a need\n ARM: OMAP3+: SmartReflex: Fix status masking in ERRCONFIG register\n ARM: OMAP3+: SmartReflex: Add a shutdown hook\n ARM: OMAP3+: SmartReflex Class3: disable errorgen before disable VP\n ...\n\nConflicts:\n\tarch/arm/mach-tegra/Makefile\n\tarch/arm/mach-tegra/fuse.c\n\tdrivers/rtc/rtc-sa1100.c\n" }, { "commit": "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": "c8bc5e39ac110acc88e41dd45d3f99956686f074", "tree": "1e4c21347e6d7b3cd7ac649436bbf3e2c1854229", "parents": [ "e22057c8599373e5caef0bc42bdb95d2a361ab0d", "489e7bece7f6859a7df484a4dce08fa51fb0d876" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 15:55:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 15:55:54 2012 -0700" }, "message": "Merge tag \u0027fixes-non-critical\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: Non-critical bug fixes\" from Ardn Bergmann:\n \"Simple bug fixes that were not considered important enough for\n inclusion into 3.3. One bug fix was originally intended for 3.3 but\n accidentally got missed, but is not marked stable because it should\n only get backported once later fixes also make it into v3.4.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\n* tag \u0027fixes-non-critical\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (66 commits)\n iomux-mx25.h slew rate adjusted for LCD __LD pins\n ARM: davinci: DA850: move da850_register_pm to .init.text\n ARM: davinci: cpufreq: fix compiler warning\n ARM: OMAP2+: Fix build for omap4 only builds with missing include of linux/bug.h\n ARM: OMAP2+: Fix section warnings for hsmmc_init_one\n ARM: OMAP2+: Fix build issues with missing include of linux/bug.h\n ARM: OMAP2+: gpmc-smsc911x: only register regulator for first instance\n ARM: OMAP3+: PM: VP: fix integer truncation error\n ARM: OMAP2+: PM: fix wakeupgen warning when hotplug disabled\n ARM: OMAP2+: PM: fix section mismatch with omap2_init_processor_devices()\n ARM: OMAP2: Fix section warning for n8x0 when CONFIG_MMC_OMAP is not set\n ARM: OMAP2+: Fix omap24xx_io_desc warning if SoC subtypes are not selected\n ARM: OMAP1: Fix section mismatch for omap1_init_early()\n ARM: OMAP1: Fix typo in lcd_dma.c\n ARM: OMAP: mailbox: trivial whitespace fix\n ARM: OMAP: Remove definition cpu_is_omap4430()\n ARM: OMAP2+: included some headers twice\n ARM: OMAP: clock.c: included linux/debugfs.h twice\n ARM: OMAP: don\u0027t build hwspinlock in vain\n ARM: OMAP2+: ads7846_init: put gpio_pendown into pdata if it\u0027s provided\n ...\n" }, { "commit": "b0df89868006517417251e02cc4ce5d4b0165885", "tree": "6800388c633a13f64fd1f7845ce026ca2606522f", "parents": [ "4ba21e868f4b6e2ce5432055e206edadc6319533", "6c634726352f0d796a4b5e6aa9849ee5b45712ce" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Mar 27 11:30:31 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Mar 27 11:30:31 2012 +0100" }, "message": "Merge branch \u0027devel-stable\u0027 into for-linus\n\nConflicts:\n\tarch/arm/Kconfig.debug\n\tarch/arm/plat-versatile/Kconfig\nMerge fixes:\n\tarch/arm/mach-integrator/Kconfig\n\tdrivers/clocksource/Kconfig\n" }, { "commit": "fada8dcf2d085f4e2eb1ba760c8d37111977dbec", "tree": "10f9b86ac3f1ea04be15a8f26818da270e68bfab", "parents": [ "38b4205abeaed7eaae0a2a9e9af8e1252fa5c86a" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Mar 27 10:44:23 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Mar 27 10:44:23 2012 +0100" }, "message": "ARM: fix Kconfig warning for HAVE_BPF_JIT\n\nLast night\u0027s randconfig and the allnoconfig builds spat out the\nfollowing warning while building:\n\nwarning: (ARM) selects HAVE_BPF_JIT which has unmet direct dependencies (NET)\n\nAcked-by: Mircea Gherzan \u003cmgherzan@gmail.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "aae528d9a8ad79d4b21b1b723abc9447fdb0d200", "tree": "146617a0ab9032b8ad0dfaf4afad24a8f954179f", "parents": [ "41569e370c5e1f5714a3386a3795efff99891f97", "5eca8f3a8048235d7fa3faa9ee4fc292d25a7425", "375dec92777c96015a13a23eaeb4f23281fb8662" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:57:55 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:57:55 2012 +0100" }, "message": "Merge branches \u0027acorn\u0027, \u0027ebsa110\u0027 and \u0027sa11x0\u0027 into platforms\n" }, { "commit": "375dec92777c96015a13a23eaeb4f23281fb8662", "tree": "74164b30e8aa689c51ccb552c06aedc86219539d", "parents": [ "f314f33be77d6a48ae19748e3dc4a6657042b525" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 23 14:29:33 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 25 23:57:22 2012 +0100" }, "message": "ARM: 7343/1: sa11x0: convert to sparse IRQ\n\nNow that Neponset, UCB1x00 and SA1111 are all converted to use the IRQ\nallocation interfaces, we can enable sparse IRQ support for SA11x0\nplatforms.\n" }, { "commit": "58af4a244fa9f7ef86f45aa9f8fa835a89274bdd", "tree": "ebd669001d231a354f4ccc8d885fd4d01b1e6369", "parents": [ "a2a47ca36642e3995e982957bc42678cf11ca6ac" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Mar 20 14:33:01 2012 -0500" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Sun Mar 25 14:35:58 2012 -0500" }, "message": "ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol\n\nThe only users of ARCH_HAS_DMA_SET_COHERENT_MASK are 2 ARM platforms:\nixp4xx and pxa cm_x2xx. We\u0027ve been getting lucky that the define is\nimplicitly included before dma-mapping.h, but the removal of io.h broke\nthings (c334bc1 ARM: make mach/io.h include optional). Since memory.h\nis the correct place, but no longer exists, convert the define to a\nkconfig entry.\n\nReported-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Imre Kaloz \u003ckaloz@openwrt.org\u003e\nCc: Krzysztof Halasa \u003ckhc@pm.waw.pl\u003e\nCc: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nAcked-by: Haojian Zhuang \u003chaojian.zhuang@marvell.com\u003e\nCc: Vinod Koul \u003cvinod.koul@intel.com\u003e\nCc: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "695436e3738ec6375a4a1026034d14433be3fb3a", "tree": "3255d6fbe91c470f55cc4328b8c4f318a657151e", "parents": [ "ddecdfcea0ae891f782ae853771c867ab51024c2" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Sun Feb 26 10:46:48 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 09:38:56 2012 +0000" }, "message": "ARM: 7349/1: integrator: convert to sparse irqs\n\nThis converts the Integrator AP/CP to use sparse IRQs.\nTested on both machines.\n\nAcked-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "ddecdfcea0ae891f782ae853771c867ab51024c2", "tree": "bf344a86217258b88425834ef513585d71f58861", "parents": [ "09f05d8529ff4aa92311c1a55ce35ac98cb59b8c" ], "author": { "name": "Mircea Gherzan", "email": "mgherzan@gmail.com", "time": "Fri Mar 16 13:37:12 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 09:38:56 2012 +0000" }, "message": "ARM: 7259/3: net: JIT compiler for packet filters\n\nBased of Matt Evans\u0027s PPC64 implementation.\n\nThe compiler generates ARM instructions but interworking is\nsupported for Thumb2 kernels.\n\nSupports both little and big endian. Unaligned loads are emitted\nfor ARMv6+. Not all the BPF opcodes that deal with ancillary data\nare supported. The scratch memory of the filter lives on the stack.\nHardware integer division is used if it is available.\n\nEnabled in the same way as for x86-64 and PPC64:\n\n\techo 1 \u003e /proc/sys/net/core/bpf_jit_enable\n\nA value greater than 1 enables opcode output.\n\nSigned-off-by: Mircea Gherzan \u003cmgherzan@gmail.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "09f05d8529ff4aa92311c1a55ce35ac98cb59b8c", "tree": "0196ddc9e80d74c8d3e3473bd7bc21b3e520c3d9", "parents": [ "a9468f30b5eac6957c86aea97954553bfb7c1f18" ], "author": { "name": "Rabin Vincent", "email": "rabin@rab.in", "time": "Sat Feb 18 17:52:41 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 09:38:56 2012 +0000" }, "message": "ARM: 7334/1: add jump label support\n\nAdd the arch-specific code to support jump labels for ARM and Thumb-2.\n\nThis code will only be activated on compilers that are capable of\nbuilding it. It has been tested with GCC 4.6 patched with the patch\nfrom GCC bug 48637.\n\nCc: Jason Baron \u003cjbaron@redhat.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin@rab.in\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "ba81f502e73cee92964af6c39eb8c8d7e44e38c1", "tree": "59dacf9fc80cec4f3c93779ea56da1c3a622ee46", "parents": [ "5936d1161ff503a1170722fe9b2d9ac4da700eef" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 15 11:55:22 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 09:38:54 2012 +0000" }, "message": "ARM: Versatile Express: add NO_IOPORT\n\nOn Versatile Express, the PCI Express buses are broken and unusable, so\nwe aren\u0027t going to support PCI/ISA IO cycles on this platform. Remove\nthe PCI/ISA IO inb et.al. support for this platform.\n\nAcked-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "a7f464f3db93ae5492bee6f6e48939fd8a45fa99", "tree": "e9ac49cedb1da56631b0e5b172cc39cdde06235c", "parents": [ "f5f5195487affe53f90d99cba4aee73a20cae565" ], "author": { "name": "Imre Kaloz", "email": "kaloz@openwrt.org", "time": "Thu Jan 26 13:08:57 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 09:38:52 2012 +0000" }, "message": "ARM: 7001/2: Wire up support for the XZ decompressor\n\nWire up support for the XZ decompressor\n\nSigned-off-by: Imre Kaloz \u003ckaloz@openwrt.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "a1be5d649699e0eecfe5fc65130954435543cda4", "tree": "6a31c20d91e1b20958ba6b3951a9d8862c8827ac", "parents": [ "d65b4e98d7ea3038b767b70fe8be959b2913f16d" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Mar 01 15:35:50 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 24 09:37:30 2012 +0000" }, "message": "ARM: riscpc: move time-acorn.c to mach-rpc\n\nNothing but RiscPC makes use of the Acorn timekeeping code, so move\nit into mach-rpc.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "56c10bf82c10588b743e75a13a7949e11b9fc942", "tree": "a2eda0459abb314107ac64af770bf7fb360aefc6", "parents": [ "bab2d8c6020e1d7521cb6c4939f72b061ce947bc", "61b80086a525c8a6081257ae40da5dee2bcaee16" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 17:30:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 17:30:49 2012 -0700" }, "message": "Merge branch \u0027for-armsoc\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull #1 ARM updates from Russell King:\n \"This one covers stuff which Arnd is waiting for me to push, as this is\n shared between both our trees and probably other trees elsewhere.\n\n Essentially, this contains:\n - AMBA primecell device initializer updates - mostly shrinking the\n size of the device declarations in platform code to something more\n reasonable.\n - Getting rid of the NO_IRQ crap from AMBA primecell stuff.\n - Nicolas\u0027 idle cleanups. This in combination with the restart\n cleanups from the last merge window results in a great many\n mach/system.h files being deleted.\"\n\nYay: ~80 files, ~2000 lines deleted.\n\n* \u0027for-armsoc\u0027 of git://git.linaro.org/people/rmk/linux-arm: (60 commits)\n ARM: remove disable_fiq and arch_ret_to_user macros\n ARM: make entry-macro.S depend on !MULTI_IRQ_HANDLER\n ARM: rpc: make default fiq handler run-time installed\n ARM: make arch_ret_to_user macro optional\n ARM: amba: samsung: use common amba device initializers\n ARM: amba: spear: use common amba device initializers\n ARM: amba: nomadik: use common amba device initializers\n ARM: amba: u300: use common amba device initializers\n ARM: amba: lpc32xx: use common amba device initializers\n ARM: amba: netx: use common amba device initializers\n ARM: amba: bcmring: use common amba device initializers\n ARM: amba: ep93xx: use common amba device initializers\n ARM: amba: omap2: use common amba device initializers\n ARM: amba: integrator: use common amba device initializers\n ARM: amba: realview: get rid of private platform amba_device initializer\n ARM: amba: versatile: get rid of private platform amba_device initializer\n ARM: amba: vexpress: get rid of private platform amba_device initializer\n ARM: amba: provide common initializers for static amba devices\n ARM: amba: make use of -1 IRQs warn\n ARM: amba: u300: get rid of NO_IRQ initializers\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": "065319c229c76ded943a8a7cf55e1e6e1e55ae69", "tree": "6b16c74b13eb2d8147aa346aa0dec247a8cd0a28", "parents": [ "c77ef898625f558c89c6ca0b27e2032f0fad4196", "63ecf0a9b55ada8c59ac10472c4468b46cf2e97a" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Mar 15 16:09:17 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Mar 15 16:09:21 2012 +0000" }, "message": "Merge branch \u0027board-specific\u0027 of git://github.com/hzhuang1/linux into next/boards\n\n* \u0027board-specific\u0027 of git://github.com/hzhuang1/linux:\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\n(update to 3.3-rc7)\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "f82989bde1cfa5e2b4614d8e4896d795dae418d9", "tree": "970cd7c833fad85acbf00be335b0ae8c4991b375", "parents": [ "695d82fae9160406acb9de204c471248abcc2a9f", "30c766bdeccf945615097ca185326c1d7199f023" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Mar 15 15:50:27 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Mar 15 15:51:06 2012 +0000" }, "message": "Merge branch \u0027fixes\u0027 of git://gitorious.org/linux-davinci/linux-davinci into next/fixes-non-critical\n\n* \u0027fixes\u0027 of git://gitorious.org/linux-davinci/linux-davinci: (2 commits)\n ARM: davinci: DA850: move da850_register_pm to .init.text\n ARM: davinci: cpufreq: fix compiler warning\n\n(update to v3.3-rc7)\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "f4e2467bad53023589cbff18dd1ab6e0aa3f004c", "tree": "8d7abbf418eabd25bbcdc9b6de2f8216d2eaa616", "parents": [ "e3643b77de143c5548ec93abd8aa68f4123295ea", "a6de3df4f172e124280d88e617ee7d29f7af970b" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Mar 15 15:19:05 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Mar 15 15:20:07 2012 +0000" }, "message": "Merge branch \u0027ep93xx-for-arm-soc\u0027 of git://github.com/RyanMallon/linux-2.6 into next/cleanup\n\n* \u0027ep93xx-for-arm-soc\u0027 of git://github.com/RyanMallon/linux-2.6:\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\n(update to v3.3-rc7)\n\nConflicts:\n\tarch/arm/mach-s3c2440/common.h\n" }, { "commit": "ae0b82504e515fdb9bc23c0b770d2b30efd49dc9", "tree": "665d1f26b32f9e68346a9529388fbadec519e865", "parents": [ "f7c8faedf98aa5ec372e0191078ac7fe1e7fb067", "a6e24019468009a21b674e392d74283a90f415dd" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Mar 13 17:38:09 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Mar 13 17:38:09 2012 -0700" }, "message": "Merge branch \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc\n\n* \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas: (234 commits)\n ARM: shmobile: remove additional __io() macro use\n ARM: mach-shmobile: default to no earlytimer\n ARM: mach-shmobile: r8a7779 and Marzen timer rework\n ARM: mach-shmobile: r8a7740 and Bonito timer rework\n ARM: mach-shmobile: sh73a0, AG5EVM and Kota2 timer rework\n ARM: mach-shmobile: sh7372, AP4EVB and Mackerel timer rework\n ARM: mach-shmobile: sh7377 and G4EVM timer rework\n ARM: mach-shmobile: sh7367 and G3EVM timer rework\n ARM: mach-shmobile: add shmobile_earlytimer_init()\n ARM: mach-shmobile: Move sh7372 AP4EVB external clk setup\n ARM: mach-shmobile: Move sh7372 Mackerel external clk setup\n ARM: mach-shmobile: rename clk_init() to shmobile_clk_init()\n ARM: mach-shmobile: r8a7779 L2 cache support\n ARM: mach-shmobile: r8a7779 map_io and init_early update\n ARM: mach-shmobile: r8a7740 map_io and init_early update\n ARM: mach-shmobile: sh73a0 map_io and init_early update\n ARM: mach-shmobile: sh7372 map_io and init_early update\n ARM: mach-shmobile: sh7377 map_io and init_early update\n ARM: mach-shmobile: sh7367 map_io and init_early update\n sh: remove clk_ops\n ...\n\n (includes an update to v3.3-rc7)\n\nConflicts:\n\tarch/arm/mach-omap2/id.c\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": "714cc3a574282732dbd0c4389e4f82d750d7e5f9", "tree": "1991cd96e8f5c247de7689fb3980dfd5ad80cc4c", "parents": [ "46cdaba11d6d66e834916850c293396399cf8736" ], "author": { "name": "Heiko Stuebner", "email": "heiko@sntech.de", "time": "Wed Mar 07 01:53:23 2012 -0800" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Wed Mar 07 01:53:23 2012 -0800" }, "message": "ARM: S3C24XX: remove obsolete S3C2416_DMA option\n\nThe S3C2416 now reuses the dma selection of the S3C2443.\nTherefore it is not necessary to keep the S3C2416_DMA option around.\n\nSigned-off-by: Heiko Stuebner \u003cheiko@sntech.de\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "880bcd4a8363f24375027f9ded4670960dcfa70a", "tree": "31894d9dc2c29f31234e479de520a50858cce54c", "parents": [ "a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13", "8c3d7c30c306d83ff9c303f42307765a5a7bc254" ], "author": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Sat Mar 03 08:57:03 2012 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Wed Mar 07 01:36:33 2012 -0800" }, "message": "Merge branch \u0027topic/cleanup-s3c24xx\u0027 into next/cleanup-s3c24xx\n\nConflicts:\n\tarch/arm/mach-s3c24xx/include/mach/system.h\n" } ], "next": "c334bc150524f833db3c76a0aaf55fb5044444e1" }