)]}' { "log": [ { "commit": "a0a4194c943bc64dd7b6e26cccb036cb26b81363", "tree": "4282f0dd573344d10f69616eb05868b5cd563cc1", "parents": [ "cf0223503e6198292cdcc864e01eeb5fe7490752", "b958f7a7cbdfbf59ba61de7ebb9c59b0ee3a7967" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 03 09:40:51 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 03 09:40:51 2011 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.infradead.org/users/sameo/mfd-2.6\n\n* \u0027for-next\u0027 of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits)\n mfd: Fix missing abx500 header file updates\n mfd: Add missing \u003clinux/io.h\u003e include to intel_msic\n x86, mrst: add platform support for MSIC MFD driver\n mfd: Expose TurnOnStatus in ab8500 sysfs\n mfd: Remove support for early drop ab8500 chip\n mfd: Add support for ab8500 v3.3\n mfd: Add ab8500 interrupt disable hook\n mfd: Convert db8500-prcmu panic() into pr_crit()\n mfd: Refactor db8500-prcmu request_clock() function\n mfd: Rename db8500-prcmu init function\n mfd: Fix db5500-prcmu defines\n mfd: db8500-prcmu voltage domain consumers additions\n mfd: db8500-prcmu reset code retrieval\n mfd: db8500-prcmu tweak for modem wakeup\n mfd: Add db8500-pcmu watchdog accessor functions for watchdog\n mfd: hwacc power state db8500-prcmu accessor\n mfd: Add db8500-prcmu accessors for PLL and SGA clock\n mfd: Move to the new db500 PRCMU API\n mfd: Create a common interface for dbx500 PRCMU drivers\n mfd: Initialize DB8500 PRCMU regs\n ...\n\nFix up trivial conflicts in\n\tarch/arm/mach-imx/mach-mx31moboard.c\n\tarch/arm/mach-omap2/board-omap3beagle.c\n\tarch/arm/mach-u300/include/mach/irqs.h\n\tdrivers/mfd/wm831x-spi.c\n" }, { "commit": "952414505f55afe5cd6dc004765076aa22b3ed7e", "tree": "eba11ed702ae02fea7f1a0d422346454fc98296f", "parents": [ "68e24ba70465b82ad24e0774ceab5360180d4627", "3e965b176341b78620f7404fd8b7f9a0d061f8a2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:11:00 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 20:11:00 2011 -0700" }, "message": "Merge branch \u0027next/cleanup\u0027 of git://git.linaro.org/people/arnd/arm-soc\n\n* \u0027next/cleanup\u0027 of git://git.linaro.org/people/arnd/arm-soc: (125 commits)\n ARM: mach-mxs: fix machines\u0027 initializers order\n mmc: mxcmmc: explicitly includes mach/hardware.h\n arm/imx: explicitly includes mach/hardware.h in pm-imx27.c\n arm/imx: remove mx27_setup_weimcs() from mx27.h\n arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c\n arm/imx: remove mx31_setup_weimcs() from mx31.h\n ARM: tegra: devices.c should include devices.h\n ARM: tegra: cpu-tegra: unexport two functions\n ARM: tegra: cpu-tegra: sparse type fix\n ARM: tegra: dma: staticify some tables and functions\n ARM: tegra: tegra2_clocks: don\u0027t export some tables\n ARM: tegra: tegra_powergate_is_powered should be static\n ARM: tegra: tegra_rtc_read_ms should be static\n ARM: tegra: tegra_init_cache should be static\n ARM: tegra: pcie: 0 -\u003e NULL changes\n ARM: tegra: pcie: include board.h\n ARM: tegra: pcie: don\u0027t cast __iomem pointers\n ARM: tegra: tegra2_clocks: 0 -\u003e NULL changes\n ARM: tegra: tegra2_clocks: don\u0027t cast __iomem pointers\n ARM: tegra: timer: don\u0027t cast __iomem pointers\n ...\n\nFix up trivial conflicts in\n arch/arm/mach-omap2/Makefile,\n arch/arm/mach-u300/{Makefile.boot,core.c}\n arch/arm/plat-{mxc,omap}/devices.c\n" }, { "commit": "3e965b176341b78620f7404fd8b7f9a0d061f8a2", "tree": "a2dbf06d6ae20fbe417b70f0a471cc4f93ff0a71", "parents": [ "034ee299122c6b145d6d3cafb9ef5c329a4ab990", "5839fec9d8db35b2b07359b18a77295418e239ad" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 23:25:41 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 23:25:41 2011 +0100" }, "message": "Merge branch \u0027next/fixes\u0027 into next/cleanup\n\nConflicts:\n\tarch/arm/mach-mxs/include/mach/gpio.h\n\tarch/arm/plat-mxc/include/mach/gpio.h\n\tdrivers/video/omap/lcd_apollon.c\n\tdrivers/video/omap/lcd_ldp.c\n\tdrivers/video/omap/lcd_overo.c\n" }, { "commit": "5839fec9d8db35b2b07359b18a77295418e239ad", "tree": "f060f613c7d76b2784a93c96b7b8cd3f0d201254", "parents": [ "43872fa788060eef91ae437957e0a5e39f1c56fd", "0cdc8b921d68817b687755b4f6ae20cd8ff1d026" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 23:11:46 2011 +0100" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Oct 31 23:11:53 2011 +0100" }, "message": "Merge branch \u0027depends/rmk/memory_h\u0027 into next/fixes\n\nFix up all conflicts between the memory.h cleanup and bug fixes.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "81397a625d063403d80a25bba00fa1cb6d7e04f5", "tree": "35175b626457ba008da464cf5d02a9c10c0cf17c", "parents": [ "041af835b343d5f0d0615e20881f5974c9b1e566" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Fri Oct 28 22:19:02 2011 +0200" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Oct 29 13:05:46 2011 +0200" }, "message": "ARM: mark empty gpio.h files empty\n\nIt is generally a better idea to make intentionally empty files\ncontain the human-readable /* empty */ comment, also it makes\nthe files play nice with \"make distclean\".\n\nReported-by: Jeff Garzik \u003cjeff@garzik.org\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Jeff Garzik \u003cjeff@garzik.org\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "1fdb24e969110fafea36d3b393bea438f702c87f", "tree": "47a1dfef8a259e7922285315f8a02d31b4efe2f1", "parents": [ "f362f98e7c445643d27c610bb7a86b79727b592e", "531a6a941745e1e045dd2a6bd09e1dc01247a5f3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 12:02:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 12:02:27 2011 -0700" }, "message": "Merge branch \u0027devel-stable\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027devel-stable\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits)\n ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET\n ARM: gic, local timers: use the request_percpu_irq() interface\n ARM: gic: consolidate PPI handling\n ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H\n ARM: mach-s5p64x0: remove mach/memory.h\n ARM: mach-s3c64xx: remove mach/memory.h\n ARM: plat-mxc: remove mach/memory.h\n ARM: mach-prima2: remove mach/memory.h\n ARM: mach-zynq: remove mach/memory.h\n ARM: mach-bcmring: remove mach/memory.h\n ARM: mach-davinci: remove mach/memory.h\n ARM: mach-pxa: remove mach/memory.h\n ARM: mach-ixp4xx: remove mach/memory.h\n ARM: mach-h720x: remove mach/memory.h\n ARM: mach-vt8500: remove mach/memory.h\n ARM: mach-s5pc100: remove mach/memory.h\n ARM: mach-tegra: remove mach/memory.h\n ARM: plat-tcc: remove mach/memory.h\n ARM: mach-mmp: remove mach/memory.h\n ARM: mach-cns3xxx: remove mach/memory.h\n ...\n\nFix up mostly pretty trivial conflicts in:\n - arch/arm/Kconfig\n - arch/arm/include/asm/localtimer.h\n - arch/arm/kernel/Makefile\n - arch/arm/mach-shmobile/board-ap4evb.c\n - arch/arm/mach-u300/core.c\n - arch/arm/mm/dma-mapping.c\n - arch/arm/mm/proc-v7.S\n - arch/arm/plat-omap/Kconfig\nlargely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP -\u003e\nCONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and\naddition of NEED_MACH_MEMORY_H next to HAVE_IDE.\n" }, { "commit": "ca90666287401b475d9e0becf85bd02f069f1de8", "tree": "ad4dd789f8d5ab639c78997d3655b94fcbf660ef", "parents": [ "60325f0c6ee7c6b68f95aaa643260fb33d4bdd88", "374e759db148d1e874e3afb76707082af67e0984" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 27 08:39:10 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 27 08:39:10 2011 +0200" }, "message": "Merge branch \u0027gpio\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027gpio\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)\n ARM: 7135/1: ep93xx: bring back missing \u003cmach/gpio.h\u003e\n ARM: 7104/1: plat-pxa: break out GPIO driver specifics\n ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem\n ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics\n ARM: 7101/1: arm/tegra: Replace \u003cmach/gpio.h\u003e with \u003cmach/gpio-tegra.h\u003e\n ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h\n ARM: 7083/1: rewrite U300 GPIO to use gpiolib\n ARM: 7074/1: gpio: davinci: eliminate unused variable warnings\n ARM: 7063/1: Orion: gpio: add missing include of linux/types.h\n ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build\n ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio\n ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq\n ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio\n ARM: 7057/1: mach-pnx4008: rename GPIO header\n ARM: 7056/1: plat-nomadik: kill off \u003cplat/gpio.h\u003e\n ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function\n ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem\n ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics\n ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem\n ARM: 7043/1: mach-ixp2000: rename GPIO header\n ...\n\nFix up trivial conflicts in arch/arm/mach-u300/Kconfig manually\n" }, { "commit": "c9d6329c35869ebf2ff88a5831e8073d3365e8bd", "tree": "735df8ad43f404ca031dd2cf2040d74538958b47", "parents": [ "4e7e2a2008f5d8c49791c412849d5b0232d39bb3", "ad7761ab3adc03fbf2cca8e3c84344175d876c40" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 14:04:01 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 14:04:01 2011 +0200" }, "message": "Merge branch \u0027for-next\u0027 of git://git.linaro.org/people/triad/linux-pinctrl\n\n* \u0027for-next\u0027 of git://git.linaro.org/people/triad/linux-pinctrl:\n pinctrl/sirf: fix sirfsoc_get_group_pins prototype\n pinctrl: Don\u0027t copy function name when requesting a pin\n pinctrl: Don\u0027t copy pin names when registering them\n pinctrl: Remove unsafe __refdata\n pinctrl: get_group_pins() const fixes\n pinctrl: add a driver for the CSR SiRFprimaII pinmux\n pinctrl: add a driver for the U300 pinmux\n drivers: create a pin control subsystem\n" }, { "commit": "8959e74399c798b45c0f5d477972b927c28f8dc9", "tree": "d13209e52a68649cd923f946649c8b3add0d52af", "parents": [ "94be70d4b279ba1b35119a3340833ffcc798c2e2" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Mon Sep 26 11:45:30 2011 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Oct 24 14:09:16 2011 +0200" }, "message": "mfd: Delete ab3550 driver\n\nThe AB3550 never passed the prototype stage. Instead it was used\nas a precursor to AB5500 for testing basic building blocks used\nin that chip, since they had large similarities. Since AB3550 will\nnot see the light of day in product form and since the prototypes\nare no longer used, let\u0027s delete the driver and any references to\nit.\n\nCc: Mattias Wallin \u003cmattias.wallin@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "40c6d8aee40e373db75e6b0b4230fc8e8259d7a6", "tree": "28dd575d38399a08b3c344596aafa81f554c05bb", "parents": [ "cd227fbffa9e971ee80065de772d3201c73e1670" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Aug 17 14:24:52 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Oct 17 09:12:40 2011 +0100" }, "message": "ARM: 7022/1: allow to detect conflicting zreladdrs\n\nBoards used to specify zreladdr in their Makefile.boot with\nzreladdr-y :\u003d x, so conflicting zreladdrs were silently overwritten.\nThis patch changes this to zreladdr-y +\u003d x, so that we end\nup with multiple words in zreladdr in such a case. We can\ndetect this later and complain if necessary.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "98da3529536ed3c78ae493f4cc3d7ac8d43fc72c", "tree": "4d10ff569e1cbea384c7e0e162b0481be4766e30", "parents": [ "2744e8afb3b76343e7eb8197e8b3e085036010a5" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Mon May 02 20:54:38 2011 +0200" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Oct 13 12:57:45 2011 +0200" }, "message": "pinctrl: add a driver for the U300 pinmux\n\nThis adds a driver for the U300 pinmux portions of the system\ncontroller \"SYSCON\". It also serves as an example of how to use\nthe pinmux subsystem. This driver also houses the platform data\nfor the only supported platform.\n\nThis deletes the old U300 driver in arch/arm/mach-u300 and\nreplace it with a driver using the new subsystem.\n\nThe new driver is considerably fatter than the old one, but it\nalso registers all 467 pins of the system and adds the power\nand EMIF pin groups and corresponding functions. The idea\nis to use this driver as a a reference for other\nimplementation so it needs to be as complete and verbose\nas possible.\n\nReviewed-by: Barry Song \u003c21cnbao@gmail.com\u003e\n[Fixup for changed function names and semantics in the v10 patch]\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "71f2c153755442c05d15cd025484f676a5f3541f", "tree": "fe48af6ddc33da7a0aaf1a16ed9feeafa4a8e1e1", "parents": [ "8efc59ad6764ade520012cb192cd484e5191cd9c", "c825dda905bac330c2da7fabdf5c0ac28758b3cd" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Oct 08 21:07:42 2011 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Oct 08 21:07:42 2011 +0200" }, "message": "Merge branch \u0027depends/rmk/devel-stable\u0027 into next/cleanup\n" }, { "commit": "639da5ee374ba8f070690bbd355ca30139ce145a", "tree": "21ec04820d870a0cd21f257193057355baa3cbc1", "parents": [ "57c89707dae01e0142e7185b6e8ff71b120f4c4d" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Wed Aug 31 22:55:46 2011 -0400" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Mon Sep 26 10:11:25 2011 -0400" }, "message": "ARM: add an extra temp register to the low level debugging addruart macro\n\nSome platforms (like OMAP not to name it) are doing rather complicated\nhacks just to determine the base UART address to use. Let\u0027s give their\naddruart macro some slack by providing an extra work register which will\nallow for much needed cleanups.\n\nThis is basically a no-op as this commit is only adding the extra argument\nto the macro but no one is using it yet.\n\nSigned-off-by: nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\n" }, { "commit": "cc890cd78acd7ab03442907d354b6af34e973cb3", "tree": "67cf73ea730969ffc26c3a5c55de8d96bb8b6299", "parents": [ "526a0dc771a5cac3224e26abd1f018976b967516" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Thu Sep 08 09:04:51 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Sep 08 10:03:56 2011 +0100" }, "message": "ARM: 7083/1: rewrite U300 GPIO to use gpiolib\n\nThis rewrites the U300 GPIO so as to use gpiolib and\nstruct gpio_chip instead of just generic GPIO, hiding\nall the platform specifics and passing in GPIO chip\nvariant as platform data at runtime instead of the\ncompiletime kludges.\n\nAs a result \u003cmach/gpio.h\u003e is now empty for U300 and\nusing just defaults.\n\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Debian kernel maintainers \u003cdebian-kernel@lists.debian.org\u003e\nCc: Arnaud Patard \u003carnaud.patard@rtp-net.org\u003e\nReported-by: Ben Hutchings \u003cben@decadent.org.uk\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": "ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893", "tree": "07e491fd3b782d47811a1b3d31d51b0a0d4630df", "parents": [ "0cd21ebcc51e6d2500e303446f68d86a6f473ccb", "af6871683e25100813d35b3d802f1ed7b90b9f3a" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Aug 23 10:54:51 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Aug 23 10:54:51 2011 +0100" }, "message": "Merge branch \u0027atag_offset\u0027 of git://git.linaro.org/people/nico/linux into devel-stable\n" }, { "commit": "d70a5969e9d52ef1c0e19a1b154785f8e1acba29", "tree": "9f388541062ce5d9f8fdebe048e8499981d622d6", "parents": [ "fd24f903182b3f2cda39d95574e45aa8983e5770" ], "author": { "name": "Jon Medhurst", "email": "tixy@yxit.co.uk", "time": "Thu Aug 04 15:41:42 2011 +0100" }, "committer": { "name": "Jon Medhurst", "email": "tixy@yxit.co.uk", "time": "Mon Aug 22 12:00:11 2011 +0000" }, "message": "ARM: mach-u300: Setup consistent dma size at boot time\n\nSigned-off-by: Jon Medhurst \u003ctixy@yxit.co.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\n" }, { "commit": "e9fe594344c3db554aebb48513b60bba90c4dd2d", "tree": "77fb5f430cb9eba7090e1c7d02b25595c82b9718", "parents": [ "eb3cf18cccc33d86179674ac1c49dcbc142fc2d9" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Mon Aug 22 08:36:26 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Aug 22 09:12:53 2011 +0100" }, "message": "ARM: 7034/1: mach-u300: delete irq_to_gpio() function\n\nThis function is not used in the U300 build, and on the whole the\ncall is hard to consolidate so get rid of it from this machine.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "eb3cf18cccc33d86179674ac1c49dcbc142fc2d9", "tree": "11fe5bd0ae6f0efe19dc004e2cf68d30b09f2059", "parents": [ "0f33286190634eeb3ec7638045980c39c98380f4" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Mon Aug 22 08:34:26 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Aug 22 09:12:53 2011 +0100" }, "message": "ARM: 7033/1: mach-u300: break out GPIO driver specifics\n\nThe \u003cmach/gpio.h\u003e file is included from upper directories\nand deal with generic GPIO and gpiolib stuff. Break out the\nplatform and driver specific defines and functions into its own\nheader file.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "4611b68922addef195c62f7dd86ef48aaf742989", "tree": "4fd38880e47e8f793b7214ae4e493d7472489eed", "parents": [ "b61cafee2e0b1c83f99be07d7aef6331b5e9f25d" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Tue Jul 05 22:38:18 2011 -0400" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Sun Aug 21 17:15:18 2011 -0400" }, "message": "ARM: mach-u300: convert boot_params to atag_offset\n\nSomeone was smoking good stuff with CONFIG_MACH_U300_2MB_ALIGNMENT_FIX here...\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "c21d2319efcdca6d1bc5d24d22dde8976464031e", "tree": "a2ff88b722fb26e9218191bba1ef94edbaa2a039", "parents": [ "711e2deb63bb151249fa78287f99ba1e7de77b2f" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Tue Aug 09 21:26:15 2011 +0200" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Wed Aug 17 10:20:30 2011 +0200" }, "message": "mach-u300: retire AVE device\n\nWe need to face the fact that there will never be a mainlined\ndriver for the U300 advanced video encoder, so let\u0027s just\ndrop the declaration of this device.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "711e2deb63bb151249fa78287f99ba1e7de77b2f", "tree": "4360c7b2c9859ed32a7ac43fb90f3a96ab8579a1", "parents": [ "5485c1e090e7057517f180c7be1ab328df4bf949" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Tue Aug 09 21:20:20 2011 +0200" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Wed Aug 17 10:20:30 2011 +0200" }, "message": "mach-u300: delete bogus memory mappings\n\nGet rid of the bogus memory map to TCM (there is a real\nmechanism for handling that nowadays!) and the commented-\nout declaration of the ROM.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "c43ed5600b285e7b3bfe868ffe2eb259939c4b98", "tree": "f358310c22f862672b219a0f66953de7eef4949e", "parents": [ "73285146544589424e8e1c1ebd6304d3c6231acf" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Tue Aug 09 21:30:01 2011 +0200" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Wed Aug 17 10:20:29 2011 +0200" }, "message": "mach-u300: drop SEMI config option\n\nWhen we have only dual-RAM configurations, the SEMI (shared\nmemory interface) must always be enabled.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "73285146544589424e8e1c1ebd6304d3c6231acf", "tree": "bf708ce0fad584054e6904219e58c833d02f72d0", "parents": [ "93ee7a9340d64f20295aacc3fb6a22b759323280" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Tue Aug 09 21:03:43 2011 +0200" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Wed Aug 17 10:20:29 2011 +0200" }, "message": "mach-u300: retire odd singlemem variant\n\nThe U300 had a special variant where a memory was shared\nbetween two CPU:s and only one part of memory was\naccessible for the kernel. However it is now seriously\nlegacy and only create problems for kernel consolidation,\nso let\u0027s retire it.\n\nCc: Nicolas Pitre \u003cnico@fluxnic.net\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "8f3c4537bb08001c4772d66ad3fcfcf24d8d180d", "tree": "8cf16008305b6a0c6e0420e69a06d20b3ccd2469", "parents": [ "01e7dc89d060413fd639635618de506093730964" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Aug 08 13:58:28 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Aug 12 08:54:19 2011 +0100" }, "message": "ARM: gpio: make trivial GPIOLIB implementation the default\n\nRather than marking the mach/gpio.h header files which want to use the\ntrivial GPIOLIB implementation, mark those which do not want to use it\ninstead. This means that by default, you get the trivial implementation\nand only have to do something extra if you need to. This should\nencourage the use of the trivial default implementation.\n\nAs an additional bonus, several gpio.h header files become empty.\n\nAcked-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nTested-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nAcked-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "01e7dc89d060413fd639635618de506093730964", "tree": "4fd1f5563c3446155e18fe76d4789ca6fe17b791", "parents": [ "22fe67837614469f8e86c97e9e43d46270701b33" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jul 26 11:29:42 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Aug 12 08:54:05 2011 +0100" }, "message": "ARM: gpio: consolidate gpio_to_irq\n\nMany of the gpio_to_irq implementations use the gpiolib version of this\nfunction. Provide the standard gpiolib gpio_to_irq() for everyone, but\nallow platforms to override it if they wish. Add the neccessary\noverrides for those platforms which do not use the standard definition.\n\nAcked-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "69f1d1a6acbaa7d83ef3f4ee26209c58cd000204", "tree": "12be981f8a123b8361edd64b84fd72f339a9655d", "parents": [ "2d86a3f04e345b03d5e429bfe14985ce26bff4dc", "1e09939bad24df95ddeeeca4fbec64fa94b66def" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 17:41:04 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 17:41:04 2011 -0700" }, "message": "Merge branch \u0027next/devel\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc\n\n* \u0027next/devel\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits)\n ARM: S5P64X0: External Interrupt Support\n ARM: EXYNOS4: Enable MFC on Samsung NURI\n ARM: EXYNOS4: Enable MFC on universal_c210\n ARM: S5PV210: Enable MFC on Goni\n ARM: S5P: Add support for MFC device\n ARM: EXYNOS4: Add support FIMD on SMDKC210\n ARM: EXYNOS4: Add platform device and helper functions for FIMD\n ARM: EXYNOS4: Add resource definition for FIMD\n ARM: EXYNOS4: Change devname for FIMD clkdev\n ARM: SAMSUNG: Add IRQ_I2S0 definition\n ARM: SAMSUNG: Add platform device for idma\n ARM: EXYNOS4: Add more registers to be saved and restored for PM\n ARM: EXYNOS4: Add more register addresses of CMU\n ARM: EXYNOS4: Add platform device for dwmci driver\n ARM: EXYNOS4: configure rtc-s3c on NURI\n ARM: EXYNOS4: configure MAX8903 secondary charger on NURI\n ARM: EXYNOS4: configure ADC on NURI\n ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI\n ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI\n ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs\n ...\n\nFix up tons of silly conflicts:\n - arch/arm/mach-davinci/include/mach/psc.h\n - arch/arm/mach-exynos4/Kconfig\n - arch/arm/mach-exynos4/mach-smdkc210.c\n - arch/arm/mach-exynos4/pm.c\n - arch/arm/mach-imx/mm-imx1.c\n - arch/arm/mach-imx/mm-imx21.c\n - arch/arm/mach-imx/mm-imx25.c\n - arch/arm/mach-imx/mm-imx27.c\n - arch/arm/mach-imx/mm-imx31.c\n - arch/arm/mach-imx/mm-imx35.c\n - arch/arm/mach-mx5/mm.c\n - arch/arm/mach-s5pv210/mach-goni.c\n - arch/arm/mm/Kconfig\n" }, { "commit": "b7e9c223be8ce335e30f2cf6ba588e6a4092275c", "tree": "2d1e3b75606abc18df7ad65e51ac3f90cd68b38d", "parents": [ "c172d82500a6cf3c32d1e650722a1055d72ce858", "e3bbfa78bab125f58b831b5f7f45b5a305091d72" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jul 11 14:15:48 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jul 11 14:15:55 2011 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nSync with Linus\u0027 tree to be able to apply pending patches that\nare based on newer code already present upstream.\n" }, { "commit": "32d55ff91635c22dc853c532ec85dc16663d251f", "tree": "16ac562bd95c024183e10f6bf1b1ede1b349e57e", "parents": [ "cde21de148a5bf474bbde59ebf046992fab3c77b" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Thu Jun 16 09:28:28 2011 +0200" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Thu Jun 23 12:09:43 2011 +0200" }, "message": "mach-u300: set apropriate FIFO trigger levels\n\nThe U300 just defined the fill level limits for the FIFOs to\n1 item out of habit. It can easily handle four.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "cde21de148a5bf474bbde59ebf046992fab3c77b", "tree": "50b5a0f7c52db0e4a502e5b09fa793afbaf669c2", "parents": [ "c5314877edd2ea9cccca0ca87c9a439a8d356c14" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Mon May 30 15:51:47 2011 +0200" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Thu Jun 23 12:09:42 2011 +0200" }, "message": "mach-u300: cleanup clockevent code\n\nUse the new clockevents_config_and_register() function to register\nthe U300 clockevent, since that code requires -\u003ecpumask to be set\nwe set this even on this UP system to please the framework.\n\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "28f65c11f2ffb3957259dece647a24f8ad2e241b", "tree": "6b7621d09d10df89eedd908d4506fb9f457a909f", "parents": [ "140a1ef2f91a00e1d25f0878c193abdc25bf6ebe" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Jun 09 09:13:32 2011 -0700" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Jun 10 14:55:36 2011 +0200" }, "message": "treewide: Convert uses of struct resource to resource_size(ptr)\n\nSeveral fixes as well where the +1 was missing.\n\nDone via coccinelle scripts like:\n\n@@\nstruct resource *ptr;\n@@\n\n- ptr-\u003eend - ptr-\u003estart + 1\n+ resource_size(ptr)\n\nand some grep and typing.\n\nMostly uncompiled, no cross-compilers.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "6075e9df471e35f2ebf4c73c95c304d0473bd4b2", "tree": "5e42fba380df72f7295263454ff220ae3ddbb7a6", "parents": [ "a0a54d37b4b1d1f55d1e81e8ffc223bb85472fa3" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Tue Jun 07 09:40:51 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jun 09 10:15:06 2011 +0100" }, "message": "ARM: 6949/2: mach-u300: fix compilaton warning in IO accessors\n\nThe IO accessors for U300 were using u32 rather than the nominal\nvoid __iomem * type, rectify this by properly defining the\nvirtual base for statically mapped peripherals to be\nvoid __iomem *. Requires fixing a field in struct clk as well.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "9425032b77c3a4f066a032bac7f7d08668b6cc3c", "tree": "0e9ee91b2947618bfb40187e8550b7d4b9ff5b0a", "parents": [ "2fdf99934c2c39848ad3633ce504a0262f21faf9" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Tue May 31 22:10:03 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jun 06 10:56:10 2011 +0100" }, "message": "ARM: 6947/2: mach-u300: fix compilation error in timer\n\nThe introduction of the mmio timer accidentally referenced the\nold clocksource struct which does not exist anymore. Fix this by\nusing a simple string instead.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "06caa7ad8341db2f03165fa763559475cc404584", "tree": "c0ae571b12d30e66a9792d4914ff9ec86943e419", "parents": [ "7812803a3119f7cf375bd04bc019ce2395a7c2fc" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Tue May 24 23:06:52 2011 +0200" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu May 26 17:29:33 2011 -0600" }, "message": "gpio: move U300 GPIO driver to drivers/gpio\n\nThis moves the U300 GPIO driver out of arch/arm/mach-u300 and into\nthe desired location indicated by the subsystem maintainer.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "234b6ceddb4fc2a4bc5b9a7670f070f6e69e0868", "tree": "891f57ca663b5ec0bb61bb3e38c5306e0d13d2bd", "parents": [ "442c8176d2efa468577738e3a99a6e051f6e8e55" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun May 08 14:09:47 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 23 18:04:51 2011 +0100" }, "message": "clocksource: convert ARM 32-bit up counting clocksources\n\nConvert ixp4xx, lpc32xx, mxc, netx, pxa, sa1100, tcc8k, tegra and u300\nto use the generic mmio clocksource recently introduced.\n\nCc: Imre Kaloz \u003ckaloz@openwrt.org\u003e\nCc: Krzysztof Halasa \u003ckhc@pm.waw.pl\u003e\nAcked-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nAcked-by: \"Hans J. Koch\" \u003chjk@hansjkoch.de\u003e\nAcked-by: Colin Cross \u003cccross@android.com\u003e\nCc: Erik Gilling \u003ckonkers@android.com\u003e\nCc: Olof Johansson \u003colof@lixom.net\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "411f5c7a502769ccc0377c5ba36cb0b283847ba8", "tree": "2c3a29671e3f923de48c55f94194849264a7bf53", "parents": [ "6d7ed21d17e640b120b902a314143e5ef4917a70", "9ced9f03d12d7539e86b0bff5bc750153c976c34" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 19:08:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 17 19:08:06 2011 -0700" }, "message": "Merge branch \u0027devel-stable\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel-stable\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)\n davinci: DM644x EVM: register MUSB device earlier\n davinci: add spi devices on tnetv107x evm\n davinci: add ssp config for tnetv107x evm board\n davinci: add tnetv107x ssp platform device\n spi: add ti-ssp spi master driver\n mfd: add driver for sequencer serial port\n ARM: EXYNOS4: Implement Clock gating for System MMU\n ARM: EXYNOS4: Enhancement of System MMU driver\n ARM: EXYNOS4: Add support for gpio interrupts\n ARM: S5P: Add function to register gpio interrupt bank data\n ARM: S5P: Cleanup S5P gpio interrupt code\n ARM: EXYNOS4: Add missing GPYx banks\n ARM: S3C64XX: Fix section mismatch from cpufreq init\n ARM: EXYNOS4: Add keypad device to the SMDKV310\n ARM: EXYNOS4: Update clocks for keypad\n ARM: EXYNOS4: Update keypad base address\n ARM: EXYNOS4: Add keypad device helpers\n ARM: EXYNOS4: Add support for SATA on ARMLEX4210\n plat-nomadik: make GPIO interrupts work with cpuidle ApSleep\n mach-u300: define a dummy filter function for coh901318\n ...\n\nFix up various conflicts in\n - arch/arm/mach-exynos4/cpufreq.c\n - arch/arm/mach-mxs/gpio.c\n - drivers/net/Kconfig\n - drivers/tty/serial/Kconfig\n - drivers/tty/serial/Makefile\n - drivers/usb/gadget/fsl_mxc_udc.c\n - drivers/video/Kconfig\n" }, { "commit": "96cb164bdec6f91eadf09a858c4820701f791b37", "tree": "fc1d5112d76974cd4cd16927e119640b09d1aeca", "parents": [ "4b4f757c807375564ce3d4ff1d088d3847c52f6d" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Mon Sep 27 17:40:22 2010 +0200" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Mon Mar 14 14:05:17 2011 +0100" }, "message": "mach-u300: define a dummy filter function for coh901318\n\nAll platform data has to be made conditional on\nas to avoid cluttering the code with other #ifdef:s.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "ec8f12533b4a439a8feb0d1a3bf15516781804be", "tree": "a98e81640b999e78461070dc9dfcd2a375fc8e3d", "parents": [ "1a721859f8e57ddf3f6df2b5094057f9f536b4d0" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Fri Aug 13 11:31:59 2010 +0200" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Mon Mar 14 14:05:13 2011 +0100" }, "message": "mach-u300: config U300 PL180 PL011 PL022 for DMA\n\nThis will configure the platform data for the PL180, PL011 and\nPL022 PrimeCells found in the U300 to use DMA with the generic\nPrimeCell DMA engine for COH 901 318.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "1a721859f8e57ddf3f6df2b5094057f9f536b4d0", "tree": "b8d15cc4e560c3657f62147d2873958c6f410552", "parents": [ "741caea4e518f5374cc9ff7cfaabc0e591416420" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Wed Feb 02 14:41:19 2011 +0100" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Mon Mar 14 14:05:12 2011 +0100" }, "message": "mach-u300: use mmci driver for GPIO card detect\n\nThe mmci driver can handle a GPIO pin for card detect, using\nIRQs and all just fine, so switch to using that. Delete the\nold bogus input device hack, if userspace need to detect\nMMC cards it should use udev like everyone else.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "f4117ac9e237b74afdf5e001d5ea26a4d15e9847", "tree": "dce3ccceda23d4bf620ec3d025a14773c7c938a8", "parents": [ "6fc31d54443bdc25a8166be15e3920a7e39d195d" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 04 18:07:14 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 17 23:26:55 2011 +0000" }, "message": "ARM: P2V: separate PHYS_OFFSET from platform definitions\n\nThis uncouple PHYS_OFFSET from the platform definitions, thereby\nfacilitating run-time computation of the physical memory offset.\n\nAcked-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nAcked-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nAcked-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nAcked-by: Magnus Damm \u003cdamm@opensource.se\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nAcked-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nAcked-by: Wan ZongShun \u003cmcuos.com@gmail.com\u003e\nAcked-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nAcked-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nAcked-by: Jiandong Zheng \u003cjdzheng@broadcom.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "008d23e4852d78bb2618f2035f8b2110b6a6b968", "tree": "81c88f744f6f3fc84132527c1ddc0b4da410c5e2", "parents": [ "8f685fbda43deccd130d192c9fcef1444649eaca", "bfc672dcf323877228682aff79dff8ecd9f30ff8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n Documentation/trace/events.txt: Remove obsolete sched_signal_send.\n writeback: fix global_dirty_limits comment runtime -\u003e real-time\n ppc: fix comment typo singal -\u003e signal\n drivers: fix comment typo diable -\u003e disable.\n m68k: fix comment typo diable -\u003e disable.\n wireless: comment typo fix diable -\u003e disable.\n media: comment typo fix diable -\u003e disable.\n remove doc for obsolete dynamic-printk kernel-parameter\n remove extraneous \u0027is\u0027 from Documentation/iostats.txt\n Fix spelling milisec -\u003e ms in snd_ps3 module parameter description\n Fix spelling mistakes in comments\n Revert conflicting V4L changes\n i7core_edac: fix typos in comments\n mm/rmap.c: fix comment\n sound, ca0106: Fix assignment to \u0027channel\u0027.\n hrtimer: fix a typo in comment\n init/Kconfig: fix typo\n anon_inodes: fix wrong function name in comment\n fix comment typos concerning \"consistent\"\n poll: fix a typo in comment\n ...\n\nFix up trivial conflicts in:\n - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)\n - fs/ext4/ext4.h\n\nAlso fix missed \u0027diabled\u0027 typo in drivers/net/bnx2x/bnx2x.h while at it.\n" }, { "commit": "4073723acb9cdcdbe4df9c0e0c376c65d1697e43", "tree": "f41c17eac157b1223ce104845cf9b1e5a9e6a83d", "parents": [ "58daf18cdcab550262a5f4681e1f1e073e21965a", "4ec3eb13634529c0bc7466658d84d0bbe3244aea" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 06 22:32:52 2011 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 06 22:32:52 2011 +0000" }, "message": "Merge branch \u0027misc\u0027 into devel\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/common/Makefile\n\tarch/arm/kernel/Makefile\n\tarch/arm/kernel/smp.c\n" }, { "commit": "5c21b7ca2c1cca3758a1d357dd57987c96ad1aa0", "tree": "4b2883e118d67534e139f7508bedb656abb63812", "parents": [ "e3f4c0ab916334e861fc49eeb2673a8c13e978e7" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Dec 15 21:50:14 2010 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Dec 22 22:44:47 2010 +0000" }, "message": "ARM: u300: convert sched_clock() to use new infrastructure\n\nConvert u300 to use the new sched_clock() infrastructure for extending\n32bit counters to full 64-bit nanoseconds.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "5e06b6492e53ab2a4e467763a9ee9f70b032c301", "tree": "6259d673f427d7194c6825bb1868ccf8b0ee21fe", "parents": [ "684e94cbcb5add60356d124166e40feb2174f0f1" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Dec 15 19:19:25 2010 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Dec 22 22:44:42 2010 +0000" }, "message": "ARM: ensure all sched_clock() implementations are notrace marked\n\nftrace requires sched_clock() to be notrace. Ensure that all\nimplementations are so marked. Also make sure that they include\nlinux/sched.h\n\nAlso ensure OMAP clocksource read functions are marked notrace as\nthey\u0027re used for sched_clock() too.\n\nTested-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nTested-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nTested-by: Mikael Pettersson \u003cmikpe@it.uu.se\u003e\nTested-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nTested-by: Olof Johansson \u003colof@lixom.net\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "da797478c1ba05a858c7719a02ce0856a5bb69ce", "tree": "051d00ae199e5ec117dc243d9c1dcafed39a0487", "parents": [ "6b46340a18e7552656097119d121b4b42049dde1" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Dec 13 13:19:55 2010 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Dec 22 22:44:37 2010 +0000" }, "message": "ARM: U300: update clock source registration\n\nIn d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new\ninterfaces were added which simplify (and optimize) the selection of the\ndivisor shift/mult constants. Switch over to using this new interface.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "4b7bd364700d9ac8372eff48832062b936d0793b", "tree": "0dbf78c95456a0b02d07fcd473281f04a87e266d", "parents": [ "c0d8768af260e2cbb4bf659ae6094a262c86b085", "90a8a73c06cc32b609a880d48449d7083327e11a" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Dec 22 18:57:02 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Dec 22 18:57:02 2010 +0100" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nConflicts:\n\tMAINTAINERS\n\tarch/arm/mach-omap2/pm24xx.c\n\tdrivers/scsi/bfa/bfa_fcpim.c\n\nNeeded to update to apply fixes for which the old branch was too\noutdated.\n" }, { "commit": "6d803ba736abb5e122dede70a4720e4843dd6df4", "tree": "6d01199e41ede3ae3931664f7bd10a68dbcc42e6", "parents": [ "64d2dc384e41e2b7acead6804593ddaaf8aad8e1" ], "author": { "name": "Jean-Christop PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Wed Nov 17 10:04:33 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Nov 26 10:51:04 2010 +0000" }, "message": "ARM: 6483/1: arm \u0026 sh: factorised duplicated clkdev.c\n\nfactorise some generic infrastructure to assist looking up struct clks\nfor the ARM \u0026 SH architecture.\n\nas the code is identical at 99%\n\nput the arch specific code for allocation as example in asm/clkdev.h\n\nSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "b595076a180a56d1bb170e6eceda6eb9d76f4cd3", "tree": "bc01ec7283808013e0b8ce7713fd6fc40f810429", "parents": [ "6aaccece1c483f189f76f1282b3984ff4c7ecb0a" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Mon Nov 01 15:38:34 2010 -0400" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Nov 01 15:38:34 2010 -0400" }, "message": "tree-wide: fix comment/printk typos\n\n\"gadget\", \"through\", \"command\", \"maintain\", \"maintain\", \"controller\", \"address\",\n\"between\", \"initiali[zs]e\", \"instead\", \"function\", \"select\", \"already\",\n\"equal\", \"access\", \"management\", \"hierarchy\", \"registration\", \"interest\",\n\"relative\", \"memory\", \"offset\", \"already\",\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "90ae83f7fc32733e5829d806306c0c590f1a383f", "tree": "5b4cd7290c70d9899ca7caa99998395218b15cab", "parents": [ "47c5ba53bc5e5f88b5d1bbb97acd25afc27f74eb", "65289d6345d93abd860e43fd2119ac176d6cc697" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 01 07:50:43 2010 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 01 07:50:43 2010 -0400" }, "message": "Merge branch \u0027next-spi\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-spi\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi/pl022: fix erroneous platform data in U300\n spi: fixed odd static string conventions in core code\n spi/bfin_spi: only request GPIO on first load\n spi/bfin_spi: handle error/status changes after data interrupts\n spi: enable spi_board_info to be registered after spi_master\n" }, { "commit": "65289d6345d93abd860e43fd2119ac176d6cc697", "tree": "54e176162e4c6ddf13dbc6098de6d5ccdde4e9fd", "parents": [ "eb288a1f45e2aa903ac8edf67dc6d59df0369fe1" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Oct 21 21:05:25 2010 +0200" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Nov 01 01:01:08 2010 -0400" }, "message": "spi/pl022: fix erroneous platform data in U300\n\nThis fixes an erroneous use of LSB first in the U300 machine, the\nPL022 used in U300 is a standard ARM core that doesn\u0027t support this\nbit so it should never have been set.\n\nCc: Kevin Wells \u003cwellsk40@gmail.com\u003eOA\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "67577927e8d7a1f4b09b4992df640eadc6aacb36", "tree": "2e9efe6b5745965faf0dcc084d4613d9356263f9", "parents": [ "6fe4c590313133ebd5dadb769031489ff178ece1", "51f00a471ce8f359627dd99aeac322947a0e491b" ], "author": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sat Oct 30 12:35:11 2010 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sat Oct 30 12:35:11 2010 +0100" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n\nConflicts:\n\tdrivers/mtd/mtd_blkdevs.c\n\nMerge Grant\u0027s device-tree bits so that we can apply the subsequent fixes.\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "93ac5a552c831096003f9bc74471300dc1710a42", "tree": "91f79071e37e84adbd6d0e9b66d6a53292c0dd47", "parents": [ "6c009ab89a212b4364cdb74192d438f542fb291c" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Mon Sep 13 00:35:37 2010 +0200" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon Oct 25 00:35:46 2010 +0100" }, "message": "ARM: platform data to use the FSMC NAND with the U300\n\nJust as it says, if this is merged along with the other patch, the\ndriver supports the U300 NAND flash interface.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "b5153163ed580e00c67bdfecb02b2e3843817b3e", "tree": "b8c878601f07f5df8f694435857a5f3dcfd75482", "parents": [ "a8cbf22559ceefdcdfac00701e8e6da7518b7e8e", "6451d7783ba5ff24eb1a544eaa6665b890f30466" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 21 16:42:32 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 21 16:42:32 2010 -0700" }, "message": "Merge branch \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (278 commits)\n arm: remove machine_desc.io_pg_offst and .phys_io\n arm: use addruart macro to establish debug mappings\n arm: return both physical and virtual addresses from addruart\n arm/debug: consolidate addruart macros for CONFIG_DEBUG_ICEDCC\n ARM: make struct machine_desc definition coherent with its comment\n eukrea_mbimxsd-baseboard: Pass the correct GPIO to gpio_free\n cpuimx27: fix compile when ULPI is selected\n mach-pcm037_eet: fix compile errors\n Fixing ethernet driver compilation error for i.MX31 ADS board\n cpuimx51: update board support\n mx5: add cpuimx51sd module and its baseboard\n iomux-mx51: fix GPIO_1_xx \u0027s IOMUX configuration\n imx-esdhc: update devices registration\n mx51: add resources for SD/MMC on i.MX51\n iomux-mx51: fix SD1 and SD2\u0027s iomux configuration\n clock-mx51: rename CLOCK1 to CLOCK_CCGR for better readability\n clock-mx51: factorize clk_set_parent and clk_get_rate\n eukrea_mbimxsd: add support for DVI displays\n cpuimx25 \u0026 cpuimx35: fix OTG port registration in host mode\n i.MX31 and i.MX35 : fix errate TLSbo65953 and ENGcm09472\n ...\n" }, { "commit": "6451d7783ba5ff24eb1a544eaa6665b890f30466", "tree": "78651bbbed163fe933cd42deabebad682d7c03dc", "parents": [ "c293393faa8e11a5a80a9e358718432b8697f451" ], "author": { "name": "Nicolas Pitre", "email": "nicolas.pitre@linaro.org", "time": "Thu Oct 14 22:21:46 2010 -0400" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Wed Oct 20 00:27:46 2010 -0400" }, "message": "arm: remove machine_desc.io_pg_offst and .phys_io\n\nSince we\u0027re now using addruart to establish the debug mapping, we can\nremove the io_pg_offst and phys_io members of struct machine_desc.\n\nThe various declarations were removed using the following script:\n\n grep -rl MACHINE_START arch/arm | xargs \\\n sed -i \u0027/MACHINE_START/,/MACHINE_END/ { /\\.\\(phys_io\\|io_pg_offst\\)/d }\u0027\n\n[ Initial patch was from Jeremy Kerr, example script from Russell King ]\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nAcked-by: Eric Miao \u003ceric.miao at canonical.com\u003e\n" }, { "commit": "0ea1293009826da45e1019f45dfde1e557bb30df", "tree": "7111bcd355921f03415182845e5f236ffe1896f4", "parents": [ "1ea64615601229f0dc16dee91dc5b50216411baa" ], "author": { "name": "Jeremy Kerr", "email": "jeremy.kerr@canonical.com", "time": "Tue Jul 06 18:30:06 2010 +0800" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Wed Oct 20 00:27:33 2010 -0400" }, "message": "arm: return both physical and virtual addresses from addruart\n\nRather than checking the MMU status in every instance of addruart, do it\nonce in kernel/debug.S, and change the existing addruart macros to\nreturn both physical and virtual addresses. The main debug code can then\nselect the appropriate address to use.\n\nThis will also allow us to retreive the address of a uart for the MMU\nstate that we\u0027re not current in.\n\nUpdated with fixes for OMAP from Jason Wang \u003cjason77.wang@gmail.com\u003e\nand Tony Lindgren \u003ctony@atomide.com\u003e, and fix for versatile express from\nLorenzo Pieralisi \u003clorenzo.pieralisi@arm.com\u003e.\n\nSigned-off-by: Jeremy Kerr \u003cjeremy.kerr@canonical.com\u003e\nSigned-off-by: Lorenzo Pieralisi \u003clorenzo.pieralisi@arm.com\u003e\nSigned-off-by: Jason Wang \u003cjason77.wang@gmail.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\nTested-by: Kevin Hilman \u003ckhilman@deeprootsystems.com\u003e\n" }, { "commit": "bde435a9ca376d0b7809768ca803dbf14416b9c1", "tree": "dd9678beb7c219922ad9b94db0e8f0a804ae2ab4", "parents": [ "fadcf49b9bd7ec5fb69befbf477e747d5b6a0328" ], "author": { "name": "Kevin Wells", "email": "wellsk40@gmail.com", "time": "Thu Sep 16 06:18:50 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Oct 12 21:37:37 2010 -0600" }, "message": "spi/pl022: Add spi-\u003emode support to AMBA SPI driver\n\nThis patch adds spi-\u003emode support for the AMBA pl022 driver and\nallows spidev to correctly alter SPI modes. Unused fields used in\nthe pl022 header file for the pl022_config_chip have been removed.\n\nThe ab8500 client driver selects the data transfer size instead\nof the platform data.\n\nFor platforms that use the amba pl022 driver, the unused fields\nin the controller data structure have been removed and the .mode\nfield in the SPI board info structure is used instead.\n\nSigned-off-by: Kevin Wells \u003cwellsk40@gmail.com\u003e\nTested-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "63f469324f999a28e67b90eb27a5fe0e379b7064", "tree": "55a74d40b336cd060ce05bd73aa53e2bc1cf6819", "parents": [ "a0719f52d90aed5b82ecf2f3ed14bc4ced3d1a8a" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Mon Sep 13 13:44:47 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Sep 17 10:16:49 2010 +0100" }, "message": "ARM: 6377/1: supply _cansleep gpio function to U300\n\nWe have to use _cansleep gpio accessors in the MMCI driver so as\nto avoid slowpath warnings, now U300 has MMCI but doesn\u0027t have\nthese functions in place to siply wrap the existing non-sleeping\nfunctions into sleepable variants.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "3af8a8dad07527b25055b8b4c2a2b0d69362e7fb", "tree": "1c2847dcddbeed9217c1fee8b92b16758426bb63", "parents": [ "b7276b236dcf400003179e77f5b4b4c05e1fb29c" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Aug 05 07:59:54 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Aug 10 22:10:56 2010 +0100" }, "message": "ARM: 6297/1: move U300 timer to dynamic clock lookup\n\nThis moves the U300 timer code to look up its clock rate from the\nclock framework as is apropriate and also switches it over to use\nthe generic code for *calc_mult_shift() on clock source and clock\nevent.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "b7276b236dcf400003179e77f5b4b4c05e1fb29c", "tree": "bd6d2ca778640be672356bf92808450dfa01bede", "parents": [ "379aae5d6c3d8d9751d85a8022e68a90df13a7ae" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Aug 05 07:58:58 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Aug 10 22:10:55 2010 +0100" }, "message": "ARM: 6296/1: clock U300 intcon and timer properly\n\nThis removes the quirks to clock the U300 VIC and timer by custom\nhooks and moves the control out to the clock framework where it\nbelongs. This is possible now that clocks are available early.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "379aae5d6c3d8d9751d85a8022e68a90df13a7ae", "tree": "e4484124e084be47d26cb43287f99edbd887d615", "parents": [ "c2fab1242a16f8e66b680d664322c3811e7b003d" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Aug 05 07:58:13 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Aug 10 22:10:55 2010 +0100" }, "message": "ARM: 6295/1: fix U300 apb_pclk split\n\nThis fixes a regression due to the new apb_pclk stuff in the U300\nplatform, makes it run by splitting the apb clock off the single\nUART clocks. For the MMCI and PL022 clocks we don\u0027t split them:\nthese are actually hardwired to the same clock terminal and will\nthus simply have a double reference count and will be referenced\ntwice.\n\nWe also move clock registration to .init_irq() so they are\navailable early enough for probing to be successful and remove the\nearlier quirk to clock primecells during PrimeCell registration.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "c2fab1242a16f8e66b680d664322c3811e7b003d", "tree": "bc957a804f02775117d80ac552473bac054e5fd9", "parents": [ "cdf357f1e13a08a11261edacb3083746f65c1ed9" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Mon Aug 09 09:16:50 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Aug 10 22:10:54 2010 +0100" }, "message": "ARM: 6306/1: fix inverted MMC card detect in U300\n\nThis converts the U300 to uninverted logic for MMCI card detect,\nfixing a regression in the current tree.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f", "tree": "854ab394486288d40fa8179cbfaf66e8bdc44b0f", "parents": [ "73b2c7165b76b20eb1290e7efebc33cfd21db1ca", "3a09b1be53d23df780a0cd0e4087a05e2ca4a00c" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:14:38 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:14:38 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n" }, { "commit": "ceb0885d3b01bb2e2f18765770e212914f2864be", "tree": "0952c90cd49704a9172e985ca491d79b60c40bc8", "parents": [ "b31fc7af78e17b0203e1cd5a195c590e8adeae0d", "08458ef6eede6cf7d5a33c3a7c8bcdc3943012c2" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 14:20:02 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 14:20:02 2010 +0100" }, "message": "Merge branch \u0027misc\u0027 into devel\n\nConflicts:\n\tarch/arm/mm/init.c\n" }, { "commit": "b31fc7af78e17b0203e1cd5a195c590e8adeae0d", "tree": "4032893d60c28e28a39bace2c48483352f626ba9", "parents": [ "f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0", "4037242c4f5ff77afe61bf07ca1e8a99490219e5", "a0fb007bf0c7de9ae361a9ad3821df4c69d4d2d9", "cea0bb1bc59b94625e60b69aaa9ad6749d5b57dd", "7d63397574c874a05e071987248c44fcf13eccf1", "a9deb137e4eb94d0a4fa0c3535b2c056d9363bef", "39ae702cd3b8b9d30693b73ad1a3d74c799b5b1a", "f4f5e28d2ee02e3b68da4a8b6156f3b4872d03be", "7cfe249475fdd82ad3c2767a9b906cc775dab868", "4bd48940190a34fe5a78a1595ec7756edf36b18a", "a3e5bb42898d10cff1d054d4b115d4dd608c0566" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 14:19:35 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 14:19:35 2010 +0100" }, "message": "Merge branches \u0027at91\u0027, \u0027ep93xx\u0027, \u0027kexec\u0027, \u0027iop\u0027, \u0027lmb\u0027, \u0027nomadik\u0027, \u0027nuc\u0027, \u0027pl\u0027, \u0027spear\u0027 and \u0027versatile\u0027 into devel\n" }, { "commit": "1dbd30e9890fd69e50b17edd70ca583546b0fe4e", "tree": "5b5ab74c1792a81340478f7bbccd053e60a23a5e", "parents": [ "07d2a5c721c6aa2bd69812a74c8b3b116abf3e56" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Mon Jul 12 21:53:28 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jul 27 10:42:38 2010 +0100" }, "message": "ARM: 6225/1: make TCM allocation static and common for all archs\n\nThis changes the TCM handling so that a fixed area is reserved at\n0xfffe0000-0xfffeffff for TCM. This areas is used by XScale but\nXScale does not have TCM so the mechanisms are mutually exclusive.\n\nThis change is needed to make TCM detection more dynamic while\nstill being able to compile code into it, and is a must for the\nunified ARM goals: the current TCM allocation at different places\nin memory for each machine would be a nightmare if you want to\ncompile a single image for more than one machine with TCM so it\nhas to be nailed down in one place.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "8d717a52d1b0959128be5134dd12608e8e4f2115", "tree": "6bc2aca8c9b14a9b0d2f86609e63c2436b03c2d6", "parents": [ "2778f62056ada442414392d7ccd41188bb631619" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat May 22 19:47:18 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jul 27 08:48:23 2010 +0100" }, "message": "ARM: Convert platform reservations to use LMB rather than bootmem\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "3126c7bc4106c572ef47e2c220df5a00e7973379", "tree": "7ef39fa9e53521889a2dd3c5aed5221379a47bec", "parents": [ "2f7989efd4398d92b8adffce2e07dd043a0895fe" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 15 11:01:17 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 22 09:55:38 2010 +0100" }, "message": "ARM: AMBA: Add pclk definition for platforms using primecells\n\nAdd a dummy clk definition for the APB pclk signal on all platforms\nusing the AMBA bus infrastructure. This ensures that these platforms\ncontinue to work when the core amba bus code controls the APB pclk.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "82400d2c827aa4f70c8b047d6147f50438f4ab87", "tree": "b2e2eb01a2128582287245adfb3dbbb15b4c29c0", "parents": [ "78e2c6415a50646896d75dedf9f71e54081311fa" ], "author": { "name": "Christoph Egger", "email": "siccegge@cs.fau.de", "time": "Wed Jun 30 18:03:43 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Jul 20 17:27:15 2010 +0200" }, "message": "Removing dead MACH_U300_BS26\n\nMACH_U300_BS26 doesn\u0027t exist in Kconfig, therefore removing all\nreferences for it from the source code.\n\nSigned-off-by: Christoph Egger \u003csiccegge@cs.fau.de\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "98c672cf1fa2a56f6f43e3f48b1208b83845582c", "tree": "39ac68eb0d260f090cebabff9a2f2cf8c6bcebd2", "parents": [ "b65b4781fbd5846a82cdac0c32818af1a7452d1f" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat May 22 18:18:57 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jul 16 11:06:40 2010 +0100" }, "message": "ARM: Move platform memory reservations out of generic code\n\nMove the platform specific bootmem memory reservations out of\narch/arm/mm/mmu.c into their respective platform files.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b", "tree": "c2c130a74be25b0b2dff992e1a195e2728bdaadd", "parents": [ "fd0961ff67727482bb20ca7e8ea97b83e9de2ddb", "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Jun 16 18:08:13 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Jun 16 18:08:13 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n" }, { "commit": "421f91d21ad6f799dc7b489bb33cc560ccc56f98", "tree": "aaf9f6385233fdf9277e634603156c89ede7f770", "parents": [ "65155b3708137fabee865dc4da822763c0c41208" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Fri Jun 11 12:17:00 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Jun 16 18:05:05 2010 +0200" }, "message": "fix typos concerning \"initiali[zs]e\"\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "d162251d1b8860ef489aecb712e5f06c33763ef3", "tree": "5904f7726990c3a7f6914d34daf52e95bc23f6b4", "parents": [ "09bcb3f3369e164bf51b3b566b865f2514b23e8c" ], "author": { "name": "Mattias Wallin", "email": "mattias.wallin@stericsson.com", "time": "Sat May 01 18:26:40 2010 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Fri May 28 01:37:47 2010 +0200" }, "message": "ARM: AB3550 board configuration and irq for U300\n\nThis patch adds the i2c board configuration needed for the\nMixed Signal chip AB3550. It also adds the irq numbers needed\nfor the irq_chip implementation.\n\nSigned-off-by: Mattias Wallin \u003cmattias.wallin@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "812f9e9d424dde9ccb35975c0281edb6f8543735", "tree": "6c86267a32459639801f6f169a953f691f6eaac7", "parents": [ "d88b25be3584138e53076ea3eea3d886c870470e" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Sat May 01 18:26:07 2010 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Fri May 28 01:37:44 2010 +0200" }, "message": "mfd: Renamed ab3100.h to abx500.h\n\nThe goal here is to make way for a more general interface for the\nanalog baseband chips ab3100 ab3550 ab550 and future chips.\n\nThis patch have been divided into two parts since both changing name\nand content of a file is not recommended in git.\n\nSigned-off-by: Mattias Wallin \u003cmattias.wallin@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "6f68fbaafbaa033205cd131d3e1f3c4b914e9b78", "tree": "56b434496064ed170f94381e3ec4c6c340b71376", "parents": [ "6e4513972a5ad28517477d21f301a02ac7a0df76", "0b28330e39bbe0ffee4c56b09fc415fcec595ea3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:05:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:05:46 2010 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:\n DMAENGINE: extend the control command to include an arg\n async_tx: trim dma_async_tx_descriptor in \u0027no channel switch\u0027 case\n DMAENGINE: DMA40 fix for allocation of logical channel 0\n DMAENGINE: DMA40 support paused channel status\n dmaengine: mpc512x: Use resource_size\n DMA ENGINE: Do not reset \u0027private\u0027 of channel\n ioat: Remove duplicated devm_kzalloc() calls for ioatdma_device\n ioat3: disable cacheline-unaligned transfers for raid operations\n ioat2,3: convert to producer/consumer locking\n ioat: convert to circ_buf\n DMAENGINE: Support for ST-Ericssons DMA40 block v3\n async_tx: use of kzalloc/kfree requires the include of slab.h\n dmaengine: provide helper for setting txstate\n DMAENGINE: generic channel status v2\n DMAENGINE: generic slave control v2\n dma: timb-dma: Update comment and fix compiler warning\n dma: Add timb-dma\n DMAENGINE: COH 901 318 fix bytesleft\n DMAENGINE: COH 901 318 rename confusing vars\n" }, { "commit": "0b28330e39bbe0ffee4c56b09fc415fcec595ea3", "tree": "fcf504879883763557e696eff81427b1ab78f76b", "parents": [ "058276303dbc4ed089c1f7dad0871810b1f5ddf1", "caa20d974c86af496b419eef70010e63b7fab7ac" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon May 17 16:30:58 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon May 17 16:30:58 2010 -0700" }, "message": "Merge branch \u0027ioat\u0027 into dmaengine\n" }, { "commit": "ac1d426e825ab5778995f2f6f053ca2e6b45c622", "tree": "75b91356ca39463e0112931aa6790802fb1e07a2", "parents": [ "fda0e18c8a7a3e02747c2b045b4fcd2c920410b9", "a3685f00652af83f12b63e3b4ef48f29581ba48b" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 17 17:24:04 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 17 17:24:04 2010 +0100" }, "message": "Merge branch \u0027devel-stable\u0027 into devel\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/include/asm/system.h\n\tarch/arm/mm/Kconfig\n" }, { "commit": "72638ddd1422df38d1b1b269038cfc8d66152c10", "tree": "b40bb3d7a3f86c454405d732686269615de180b0", "parents": [ "808d97ccbe8e8251b1435e86c762965fd7e8a75e" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Apr 08 07:40:13 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Apr 14 16:08:18 2010 +0100" }, "message": "ARM: 6034/1: ARM: U300: set f_max to 24 MHz for MMCI\n\nThis employs the frequency setting mechanism introduced to the\nMMCI to specify that this system can actually be clocked at 24 MHz.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "771dc157e06d69fcece0b2c8a29b9010345d8e9a", "tree": "69fb6b536735af812feca84a734d869e57844b47", "parents": [ "8e797a7e4f588fb3b9cfe9860b00dcd3b14f8b60" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Apr 08 07:38:52 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Apr 14 16:08:17 2010 +0100" }, "message": "ARM: 6032/1: ARM: MMCI: support 8bit mode on the ST Micro version\n\nThis adds support for an 8bit wide bus to the card (data lines\nMCIDAT0 through 7 exist) on the ST Micro version and alters the\nU300 platform to support this. Also add some ST_ prefix to the\nST-specific registers.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "0793448187643b50af89d36b08470baf45a3cab4", "tree": "b3313ff58d47e26a8cf707d196177effa1aadfbe", "parents": [ "c3635c78e500a52c9fcd55de381a72928d9e054d" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Fri Mar 26 16:50:49 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Mar 26 16:50:49 2010 -0700" }, "message": "DMAENGINE: generic channel status v2\n\nConvert the device_is_tx_complete() operation on the\nDMA engine to a generic device_tx_status()operation which\ncan return three states, DMA_TX_RUNNING, DMA_TX_COMPLETE,\nDMA_TX_PAUSED.\n\n[dan.j.williams@intel.com: update for timberdale]\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: Maciej Sosnowski \u003cmaciej.sosnowski@intel.com\u003e\nCc: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: Pavel Machek \u003cpavel@ucw.cz\u003e\nCc: Li Yang \u003cleoli@freescale.com\u003e\nCc: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Haavard Skinnemoen \u003chaavard.skinnemoen@atmel.com\u003e\nCc: Magnus Damm \u003cdamm@opensource.se\u003e\nCc: Liam Girdwood \u003clrg@slimlogic.co.uk\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: Roland Dreier \u003crdreier@cisco.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "c3635c78e500a52c9fcd55de381a72928d9e054d", "tree": "87403f402227cd8b5572550e70facf81c9eaa0d9", "parents": [ "0f65169b1bf44220308e1ce1f6666ad03ddc27af" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Fri Mar 26 16:44:01 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Mar 26 16:44:01 2010 -0700" }, "message": "DMAENGINE: generic slave control v2\n\nConvert the device_terminate_all() operation on the\nDMA engine to a generic device_control() operation\nwhich can now optionally support also pausing and\nresuming DMA on a certain channel. Implemented for the\nCOH 901 318 DMAC as an example.\n\n[dan.j.williams@intel.com: update for timberdale]\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: Maciej Sosnowski \u003cmaciej.sosnowski@intel.com\u003e\nCc: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: Pavel Machek \u003cpavel@ucw.cz\u003e\nCc: Li Yang \u003cleoli@freescale.com\u003e\nCc: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Haavard Skinnemoen \u003chaavard.skinnemoen@atmel.com\u003e\nCc: Magnus Damm \u003cdamm@opensource.se\u003e\nCc: Liam Girdwood \u003clrg@slimlogic.co.uk\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: Roland Dreier \u003crdreier@cisco.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "318ae2edc3b29216abd8a2510f3f80b764f06858", "tree": "ce595adde342f57f379d277b25e4dd206988a052", "parents": [ "25cf84cf377c0aae5dbcf937ea89bc7893db5176", "3e58974027b04e84f68b964ef368a6cd758e2f84" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "message": "Merge branch \u0027for-next\u0027 into for-linus\n\nConflicts:\n\tDocumentation/filesystems/proc.txt\n\tarch/arm/mach-u300/include/mach/debug-macro.S\n\tdrivers/net/qlge/qlge_ethtool.c\n\tdrivers/net/qlge/qlge_main.c\n\tdrivers/net/typhoon.c\n" }, { "commit": "9bb676966aa85e56af00b353387d3c274a26e480", "tree": "cafc9a409aa05cc9060eb53f03c35881f41b6cec", "parents": [ "0f2cc4ecd81dc1917a041dc93db0ada28f8356fa", "dd58ffcf5a5352fc10820c8ffbcd5fed416a2c3a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 04 08:20:14 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 04 08:20:14 2010 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (28 commits)\n ioat: cleanup -\u003etimer_fn() and -\u003ecleanup_fn() prototypes\n ioat3: interrupt coalescing\n ioat: close potential BUG_ON race in the descriptor cleanup path\n ioat2: kill pending flag\n ioat3: use ioat2_quiesce()\n ioat3: cleanup, don\u0027t enable DCA completion writes\n DMAENGINE: COH 901 318 lli sg offset fix\n DMAENGINE: COH 901 318 configure channel direction\n DMAENGINE: COH 901 318 remove irq counting\n DMAENGINE: COH 901 318 descriptor pool refactoring\n DMAENGINE: COH 901 318 cleanups\n dma: Add MPC512x DMA driver\n Debugging options for the DMA engine subsystem\n iop-adma: redundant/wrong tests in iop_*_count()?\n dmatest: fix handling of an even number of xor_sources\n dmatest: correct raid6 PQ test\n fsldma: Fix cookie issues\n fsldma: Fix cookie issues\n dma: cases IPU_PIX_FMT_BGRA32, BGR32 and ABGR32 are the same in ipu_ch_param_set_size()\n dma: make Open Firmware device id constant\n ...\n" }, { "commit": "b87108a772e001af3fa79f9cfd87b190375f47a2", "tree": "003099acce3eb98244bbef317b4db52fe9cbe933", "parents": [ "848ad121240f539e14a59eddd69e164aea9560b2" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Tue Mar 02 14:17:20 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Mar 02 14:17:20 2010 -0700" }, "message": "DMAENGINE: COH 901 318 descriptor pool refactoring\n\nThis centralize some spread-out initialization of descriptors into\none function and cleans up the error paths.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "9f33be2c3a80bdc2cc08342dd77fac87652e0548", "tree": "7ad6e825427a15c5ec0fc15540abc0429d7f4bce", "parents": [ "2741ecb4ce5c2d430b5c44b0a169038338c21df5", "eed18b5fa4d297c681b00144e8c6942dd35d39a7" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 25 22:10:38 2010 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 25 22:10:38 2010 +0000" }, "message": "Merge branches \u0027clks\u0027 and \u0027pnx\u0027 into devel\n" }, { "commit": "2741ecb4ce5c2d430b5c44b0a169038338c21df5", "tree": "4aa71d7551184ee88f32c7f3660d821133058c32", "parents": [ "bc85e585c6d0fab4bde12d60964b2f25802c3163", "5de813b6cd06460b337f9da9afe316823cf3ef45" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 25 22:09:41 2010 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 25 22:09:41 2010 +0000" }, "message": "Merge branch \u0027misc2\u0027 into devel\n" }, { "commit": "186f93ea1f274f4cde4a356401c1786c818ff881", "tree": "de28f076c823d5423a5b4780f0d37554c242c982", "parents": [ "3560adf62075829393743667ff338dd8fd26a5c2", "4e6d488af37980d224cbf298224db6173673f362" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 25 22:07:25 2010 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Feb 25 22:07:25 2010 +0000" }, "message": "Merge branch \u0027tmpreg\u0027 into devel\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/mach-ux500/include/mach/debug-macro.S\n" }, { "commit": "cd71f8f48eda141404db78f7b01902ba3f9ab477", "tree": "00401a03cc866b669b28059272946c3705875e2b", "parents": [ "fcfadcaa57be0711ca80e3898243388f4d19928f" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Wed Feb 24 21:49:53 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 24 21:10:17 2010 +0000" }, "message": "ARM: 5958/1: ARM: U300: fix inverted clk round rate\n\nThe clk_round_rate() functions in the U300 clocking will always\nselect the lowest clocking frequency due to inverted rounding\ncomparisons. Fix this.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "fcfadcaa57be0711ca80e3898243388f4d19928f", "tree": "4df86b218b968ce3d2efc22a5c015a994d26ff46", "parents": [ "64de028948f449af17cf387f45a45f36ffd3c960" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Tue Feb 23 23:37:22 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Feb 24 21:10:07 2010 +0000" }, "message": "ARM: 5956/1: misplaced parentheses\n\nThe parentheses appear misplaced.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "c931b4f655a1b86c929384e674eb8c31795f3bd7", "tree": "2787c5ed4bf2918fa6fd96ac0a2a92b43889cf7e", "parents": [ "a7bd08c82e4f74387a39eeebb942712f23967420" ], "author": { "name": "Fenkart/Bostandzhyan", "email": "andreas.fenkart@streamunlimited.com", "time": "Sun Feb 07 21:47:17 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Feb 15 21:40:33 2010 +0000" }, "message": "ARM: 5928/1: Change type of VMALLOC_END to unsigned long.\n\nMakes it consistent with VMALLOC_START\n\nTested-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nSigned-off-by: Andreas Fenkart \u003candreas.fenkart@streamunlimited.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "d40956665dc0c2fe2608268c2e7cff561ddcce11", "tree": "821517f56c8787fcc8818ac2fd17214ebc7649e8", "parents": [ "59778fb6c402d48b1efa154e0e79d5e94726365e" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Sun Feb 14 19:41:35 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Feb 14 23:11:03 2010 +0000" }, "message": "ARM: 5935/1: [U300] Fix the DMA configuration\n\nThis fixes a few bugs in the DMA configuration for the COH 901 318\nDMA engine used in U300. It also removes the directional parameter\nfor each channel: separate DMA engine patches (submitted to the\nDMA engine maintainer) switches that mechanism over to using\ndynamic configuration of this, to handle bidirectional DMA\nchannels.\n\nCc: Dan Williams \u003cdan.j.williams@intel.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "0a0300dc8c4b3f3ce5c9ef5a0a4be5442590398f", "tree": "e9a0a9dc5f195447f44a077f76c8d61e2c955d17", "parents": [ "92dcffb916d309aa01778bf8963a6932e4014d07" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jan 12 12:28:00 2010 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Feb 12 17:32:36 2010 +0000" }, "message": "ARM: Consolidate clks_register() and similar\n\nMost machine classes want some way to register a block of clk_lookup\nstructures, and most do it by implementing a clks_register() type\nfunction which walks an array, or by open-coding a loop.\n\nConsolidate all this into clkdev_add_table().\n\nAcked-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@deeprootsystems.com\u003e\nAcked-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "4e6d488af37980d224cbf298224db6173673f362", "tree": "5e5d7276f321c239c129031892ec08a3ba034c2f", "parents": [ "200b7a8dc09504bc0aedac567a307a6e533f39e5" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Feb 01 23:26:53 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Feb 12 17:27:52 2010 +0000" }, "message": "ARM: 5910/1: ARM: Add tmp register for addruart and loadsp\n\nOtherwise more complicated uart configuration won\u0027t be possible.\nWe can use r1 for tmp register for both head.S and debug.S.\n\nNOTE: This patch depends on another patch to add the the tmp register\ninto all debug-macro.S files. That can be done with:\n\n$ sed -i -e \"s/addruart,rx|addruart, rx/addruart, rx, tmp/\"\n\tarch/arm/*/include/*/debug-macro.S\n\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "3ad2f3fbb961429d2aa627465ae4829758bc7e07", "tree": "f365c513e8f5b477a61336a600ff54f32b7ad6e1", "parents": [ "1537a3638cbf741d3826c1002026cce487a6bee0" ], "author": { "name": "Daniel Mack", "email": "daniel@caiaq.de", "time": "Wed Feb 03 08:01:28 2010 +0800" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Feb 09 11:13:56 2010 +0100" }, "message": "tree-wide: Assorted spelling fixes\n\nIn particular, several occurances of funny versions of \u0027success\u0027,\n\u0027unknown\u0027, \u0027therefore\u0027, \u0027acknowledge\u0027, \u0027argument\u0027, \u0027achieve\u0027, \u0027address\u0027,\n\u0027beginning\u0027, \u0027desirable\u0027, \u0027separate\u0027 and \u0027necessary\u0027 are fixed.\n\nSigned-off-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: Junio C Hamano \u003cgitster@pobox.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "633e81a66b7e6c22a50da860371159cfa2b06d53", "tree": "26a47bcb264407558310e4f84bb33dd2ec90d017", "parents": [ "fc05475f867624dddd5ea7089cf8f434f95fbec5" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Mon Jan 25 07:18:16 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Jan 27 22:00:47 2010 +0000" }, "message": "ARM: 5895/2: Alter name of U300 watchdog resource\n\nThis changes the bus name of the U300 watchdog from just \"wdog\"\nto \"coh901327_wdog\" which is used to match the corresponding\ndriver. This makes the watchdog probe properly.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "08d1e2e68da977956ff10735148ac1de21c85afd", "tree": "4d3c59ae89b79c92f390f26274a5b9350c402bc4", "parents": [ "74d2e4f8d79ae0c4b6ec027958d5b18058662eea" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Dec 17 09:46:24 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Jan 27 22:00:15 2010 +0000" }, "message": "ARM: 5852/1: Add COH 901 318 DMA driver platform config for U300\n\nThis adds platform configuration for the COH 901 318 DMA driver\nfor the U300 series mobile platforms.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "7949456b1b96924c2d9ae5aea5fa7d4c81c946ed", "tree": "819e64dcd686c8b53c698c164aea96a002e8b5f8", "parents": [ "60d9aa758c00f20ade0cb1951f6a934f628dd2d7", "12458ea06efd7b44281e68fe59c950ec7d59c649" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 10:28:56 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 10:28:56 2009 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:\n ppc440spe-adma: adds updated ppc440spe adma driver\n iop-adma.c: use resource_size()\n dmaengine: clarify the meaning of the DMA_CTRL_ACK flag\n sh: stylistic improvements for the DMA driver\n dmaengine: fix dmatest to verify minimum transfer length and test buffer size\n sh: DMA driver has to specify its alignment requirements\n Add COH 901 318 DMA block driver v5\n" }, { "commit": "4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8", "tree": "856ba96302a36014736747e8464f80eeb827bbdd", "parents": [ "f6c4c8195b5e7878823caa1181be404d9e86d369", "d014d043869cdc591f3a33243d3481fa4479c2d0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:43:33 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:43:33 2009 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)\n tree-wide: fix misspelling of \"definition\" in comments\n reiserfs: fix misspelling of \"journaled\"\n doc: Fix a typo in slub.txt.\n inotify: remove superfluous return code check\n hdlc: spelling fix in find_pvc() comment\n doc: fix regulator docs cut-and-pasteism\n mtd: Fix comment in Kconfig\n doc: Fix IRQ chip docs\n tree-wide: fix assorted typos all over the place\n drivers/ata/libata-sff.c: comment spelling fixes\n fix typos/grammos in Documentation/edac.txt\n sysctl: add missing comments\n fs/debugfs/inode.c: fix comment typos\n sgivwfb: Make use of ARRAY_SIZE.\n sky2: fix sky2_link_down copy/paste comment error\n tree-wide: fix typos \"couter\" -\u003e \"counter\"\n tree-wide: fix typos \"offest\" -\u003e \"offset\"\n fix kerneldoc for set_irq_msi()\n spidev: fix double \"of of\" in comment\n comment typo fix: sybsystem -\u003e subsystem\n ...\n" }, { "commit": "d014d043869cdc591f3a33243d3481fa4479c2d0", "tree": "63626829498e647ba058a1ce06419fe7e4d5f97d", "parents": [ "6ec22f9b037fc0c2e00ddb7023fad279c365324d", "6070d81eb5f2d4943223c96e7609a53cdc984364" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Dec 07 18:36:35 2009 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Dec 07 18:36:35 2009 +0100" }, "message": "Merge branch \u0027for-next\u0027 into for-linus\n\nConflicts:\n\n\tkernel/irq/chip.c\n" }, { "commit": "e28edb723e64200554194da17617ee6e82de6690", "tree": "6116b7166054a17c9fbd94ade6db070d31c7c786", "parents": [ "2fc42814d8a9dd757abc7f80fbf11e9247e97d40", "01c62c9b32ec122bf5e3edeecec4d826cb8e81e5", "43234b1ef630388c2cffb34eeeaa84dd731602cc", "183bd50f4fe6cd49c1790a90163e3d1ece80f344", "50dcfa0234753c32e1c838cc0e6d7952dda73201", "045868df2c5eee2330c052f8237b428afa9394fd", "6635529987cd01f9af0c3996cf2e7b9e2bbb4aa7", "870725d9fcdecb23eab696d405fa90df46151865" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Dec 05 10:35:18 2009 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Dec 05 10:35:18 2009 +0000" }, "message": "Merge branches \u0027at91\u0027, \u0027ep93xx\u0027, \u0027etm\u0027, \u0027ks8695\u0027, \u0027nuc\u0027, \u0027u300\u0027 and \u0027u8500\u0027 into devel\n" } ], "next": "6070d81eb5f2d4943223c96e7609a53cdc984364" }