)]}' { "log": [ { "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" }, { "commit": "6070d81eb5f2d4943223c96e7609a53cdc984364", "tree": "d2464159210bded5c7824fea2d4a8744233bd168", "parents": [ "febe29d957c5076ff6a9fa49f39b01f1e48d1c04" ], "author": { "name": "Adam Buchbinder", "email": "adam.buchbinder@gmail.com", "time": "Fri Dec 04 15:47:01 2009 -0500" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Dec 04 23:41:47 2009 +0100" }, "message": "tree-wide: fix misspelling of \"definition\" in comments\n\n\"Definition\" is misspelled \"defintion\" in several comments; this\npatch fixes them. No code changes.\n\nSigned-off-by: Adam Buchbinder \u003cadam.buchbinder@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "61f135b92f4758bc4d4767cd0a5d2da954e27f14", "tree": "388fdc08150e2f8fcb2859f70ca67cdd86616f36", "parents": [ "b419148e567728f6af0c3b01965c1cc141e3e13a" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Nov 19 19:49:17 2009 +0100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Thu Nov 19 23:45:19 2009 -0700" }, "message": "Add COH 901 318 DMA block driver v5\n\nThis patch adds support for the ST-Ericsson COH 901 318 DMA block,\nfound in the U300 series platforms. It registers a DMA slave for\ndevice I/O and also a memcpy slave for memcpy.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nAcked-by: Maciej Sosnowski \u003cmaciej.sosnowski@intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "378ce74bee4cb0183489bc0f850790a2264ca975", "tree": "d1999328c0a7ebabf49b0f25909779fa9e7e5966", "parents": [ "927585f650b51639f0262dad650eafeaf1611197" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Sat Nov 14 01:03:24 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Nov 16 16:15:49 2009 +0000" }, "message": "ARM: 5787/1: U300 COH 901 331 fixes\n\nThis will fix some small issues with the COH 901 331 RTC driver:\n- Interrupt is disabled after alarm so that we don\u0027t fire\n multiple interrupts.\n- We return 0 from the coh901331_alarm_irq_enable() ridding\n a compile warning.\n- We alter the name in the U300 device registry to match that\n of the driver so they sucessfully resolve.\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": "6635529987cd01f9af0c3996cf2e7b9e2bbb4aa7", "tree": "3b13a89922958d039f0c9e6a8353b0b149b2e9f9", "parents": [ "f9e8eefc603c40d57e4579f1b202f784e8367fe4" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Wed Nov 04 00:00:44 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Nov 10 23:47:07 2009 +0000" }, "message": "ARM: 5783/1: Make it possible for U300 LDO D to shut down\n\nThis changes the regulator platform config for U300 so that the\nLDO D regulator can change status and shut down the system and\nthe pm_shutdown() hook in regulator.c starts working.\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": "f9e8eefc603c40d57e4579f1b202f784e8367fe4", "tree": "0be865f9098b9bc853b738e9936e047947495e86", "parents": [ "3d81277b65b5b356d81e54fa71f04868cee739e2" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Sep 24 21:42:44 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Oct 19 17:10:09 2009 +0100" }, "message": "ARM: 5725/2: U300 switch MMCI to use regulator\n\nThis switches the U300 over from using a custom translate_vdd\nfunction (which was just flipping blind bits in the hardware)\nto using the regulator that actually controls the MMC voltage.\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": "3d81277b65b5b356d81e54fa71f04868cee739e2", "tree": "f9bca4055b82c91612a1ca87c636d9ce5e6f65a1", "parents": [ "2fdc246aaf9a7fa088451ad2a72e9119b5f7f029" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Wed Sep 23 15:45:02 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Oct 19 17:10:09 2009 +0100" }, "message": "ARM: 5724/1: U300 AB3100 boardinfo v5\n\nThis defines regulator platform data and board power\nregulator hogs for the ST-Ericsson U300 platform.\n\nCc: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: Liam Girdwood \u003clrg@slimlogic.co.uk\u003e\nCc: Samuel Ortiz \u003csameo@linux.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": "ee17962e249024ebba72acbfe7cf54f8ea5b72f8", "tree": "2e13e55fa2023e5b841b342d942ee358ccb37266", "parents": [ "aa45ee8fc0ee87c1711b5fe8eb3556d06530c39e" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Mon Sep 28 12:36:18 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Oct 01 16:26:15 2009 +0100" }, "message": "ARM: 5731/2: Fix U300 generic GPIO, remove ifdefs from MMCI v3\n\nThe #ifdefs in the MMCI driver were erroneous and just masking\na bug in the U300 generic GPIO implementation. This removes the\nifdefs and fixes the U300 generic GPIO instead.\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": "6ef297f86b62f187c59475784208f75c2ed8ccd8", "tree": "333ea36bfdf0b7382fd810b33e24f58b63fd0707", "parents": [ "4321532cec25e1747961d83fb4f78ec24ea92966" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Tue Sep 22 14:29:36 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Sep 22 20:49:04 2009 +0100" }, "message": "ARM: 5720/1: Move MMCI header to amba include dir\n\nThis moves the mmci platform data definition struct away from\narch/arm/include/asm/mach/mmc.h into the more proper place among\nthe other primecells in include/linux/amba/mmci.h and at the same\ntime renames it to \"mmci.h\", and also the struct in this file\nconfusingly named mmc_platform_data has been renamed\nmmci_platform_data for clarity.\n\nCc: Catalin Marinas \u003ccatalin.marinas@arm.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": "59b69e27ca9f6c6347b1ec07066a9250140cb9e8", "tree": "d8ea8948c92bdfc7f3bdfc03a7b789243ffbaaa8", "parents": [ "9c5e8fecc4a86adbf363f5cf344c0ccccdbb8982", "ee2b805c8eb6459cf541ef141ff70dae17af59ca" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Sep 21 16:03:13 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Sep 21 16:03:13 2009 +0100" }, "message": "Merge branch \u0027u300\u0027 into devel\n" }, { "commit": "ee2b805c8eb6459cf541ef141ff70dae17af59ca", "tree": "ca1e0f1988e71f2285ca336d88c5da2c5efa8c71", "parents": [ "a2ca00ea9398265a26eabb358bba83c8b75c463d" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Sat Aug 15 15:12:05 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Sep 18 22:09:02 2009 +0100" }, "message": "ARM: 5678/1: SSP/SPI PL022 polarity terminology fix\n\nThe definition of the SPI clock phase for the Motorola mode of\nthe PL022 driver was incorrect: the spec had been interpreted as\ndata being recieved on rising or falling edge of the clocks while\nthe correct interpretation is that data can be recieved on the\nfirst or second edge transition, falling or rising depending on\nthe polarity setting.\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": "a2ca00ea9398265a26eabb358bba83c8b75c463d", "tree": "f361475375241dcaa7939ef493e4c23930f9f541", "parents": [ "6be2a0cacc1ed6899a53172e2e9b7a3587be0bea" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Sep 17 13:10:50 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Sep 18 22:09:02 2009 +0100" }, "message": "ARM: 5704/1: U300 sched_clock implementation v2\n\nThis adds the long debated sched_clock() override for the weak\nin-kernel jiffybased sched_clock(). The implementation is more or\nless identical to the one used in arch/arm/plat-omap/common.c\nand at last attempt to merge this the merge was postponed at the\nrequest of Peter Zijlstra due to pending discussions regarding\ngeneralized clocksource-based sched_clock() implementations by\nadding a flag to the clocksource. However that discussion ended\nup with the generic code needing to be rewritten and Paul Mundt\nsee no reason not to proceed with this for the time being as it\ncan be easily converted once the generic code is in place.\n\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\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": "9e6c82cd3e1a739ef48bf8c1decc8e7a7d8de3ac", "tree": "3146dbc92480e9034e138bbff11912ff8936fc0b", "parents": [ "a6a6464a0ecd20c5f1594a4fe5b24af6181b7366" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Mon Sep 14 12:57:11 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Sep 15 22:11:06 2009 +0100" }, "message": "ARM: 5698/1: MMCI pass capabilities in platform data\n\nThis makes it possible to pass down the host controller\ncapabilities for the MMCI driver using the platform data. It\nalso provides the capabilties for the U300 implementation as an\nexample, and makes sure the 4bit wide mode is set if this is\nrequested by the ios() now that we can actually set that\ncapability for a platform.\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": "bc581770cfdd8c17ea17d324dc05e2f9c599e7ca", "tree": "c6d2c2eb82d8a6c6851de0ecc7d8c0e63e026266", "parents": [ "18240904960a39e582ced8ba8ececb10b8c22dd3" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Tue Sep 15 17:30:37 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Sep 15 22:11:05 2009 +0100" }, "message": "ARM: 5580/2: ARM TCM (Tightly-Coupled Memory) support v3\n\nThis adds the TCM interface to Linux, when active, it will\ndetect and report TCM memories and sizes early in boot if\npresent, introduce generic TCM memory handling, provide a\ngeneric TCM memory pool and select TCM memory for the U300\nplatform.\n\nSee the Documentation/arm/tcm.txt for documentation.\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": "87d721ad7a37b7650dd710c88dd5c6a5bf9fe996", "tree": "869d633803eb7c429624d3bd16a6117816849763", "parents": [ "ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3", "b7cfda9fc3d7aa60cffab5367f2a72a4a70060cd" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Sat Sep 12 12:04:37 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Sep 12 12:04:37 2009 +0100" }, "message": "Merge branch \u0027master\u0027 into devel\n" }, { "commit": "ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3", "tree": "d827bca3fc825a0ac33efbcd493713be40fcc812", "parents": [ "cf7a2b4fb6a9b86779930a0a123b0df41aa9208f", "f17a1f06d2fa93f4825be572622eb02c4894db4e" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Sat Sep 12 12:02:26 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Sep 12 12:02:26 2009 +0100" }, "message": "Merge branch \u0027devel-stable\u0027 into devel\n\nConflicts:\n\tMAINTAINERS\n\tarch/arm/mm/fault.c\n" }, { "commit": "cf7a2b4fb6a9b86779930a0a123b0df41aa9208f", "tree": "a5542d40aa2e321b7479c676a8234fee31b4c351", "parents": [ "b736b89f8a001cb73f020ca90a6fac77861cddf6", "8c3cbd5a2b2cc244277f6089dae83f09f1e7a27b", "57a473f2f97cf3bca78df08aac2f438ddef03bee", "af1057abd7d5f97e17ab96e34d1920746188ddcb", "c1cb6b7fb5190ad55b31aa3289d48fedd288ddaa", "65cec8e3db606608fd1f8dfc4a1c7c37bfba9173", "8e22676e56673494a15ba95b57af21eb47d8b98a" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Sat Sep 12 12:01:34 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Sep 12 12:01:34 2009 +0100" }, "message": "Merge branches \u0027arm\u0027, \u0027at91\u0027, \u0027bcmring\u0027, \u0027ep93xx\u0027, \u0027mach-types\u0027, \u0027misc\u0027 and \u0027w90x900\u0027 into devel\n" }, { "commit": "a2bb9f4d6a5a589b481595207ac3588cc08d1b60", "tree": "52b56450a8b81c1517d915828bbaf8b9ccfcd0a4", "parents": [ "824df399a31fe92d88eb8caf86768cc8c7c72a06" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Aug 13 21:57:22 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Aug 15 15:36:52 2009 +0100" }, "message": "ARM: 5673/1: U300 fix initsection compile warning\n\nThe u300_init_check_chip() function was not properly tagged with\nthe __init macro and provided a initsection mismatch on\ncompilation.\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": "6be2a0cacc1ed6899a53172e2e9b7a3587be0bea", "tree": "2b68c9b5e06c8f7601f3145ea0c3eb34811c6dff", "parents": [ "c7c8c78fdf6e9bd65d8ee879115dc2cd5d9fd0dc" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Aug 13 21:42:01 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Aug 15 15:36:29 2009 +0100" }, "message": "ARM: 5668/2: U300 I2C board setup\n\nThis sets up the U300 I2C subdevices so that the AB3100\nanalog baseband ASIC is properly detected and also the\ncamera devices in the U335 reference design get properly\nregistered.\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": "c7c8c78fdf6e9bd65d8ee879115dc2cd5d9fd0dc", "tree": "91f59159fed1c22277c72e2529317561778657b9", "parents": [ "df1e0520f9434b5b771c854a13dd928727d8673a" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Fri Aug 14 10:59:05 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Aug 15 15:36:29 2009 +0100" }, "message": "ARM: 5667/3: U300 SSP/SPI board setup and test\n\nThis adds a U300 board configuration for the PL022 SSP/SPI\nPrimeCell driver recently merged to the 2.6.31-rc series.\nFurther it adds a dummy loopback SPI chip that can be used\nfor testing the SPI functionality on a running system using\nthe loopback mode of PL022.\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": "df1e0520f9434b5b771c854a13dd928727d8673a", "tree": "5d48442a1c8e43122511fd0c73596ac3917f8483", "parents": [ "5ad73d07173e7b76c16bcb8b6cf64d8386019689" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Mon Aug 10 12:52:40 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Aug 15 15:36:28 2009 +0100" }, "message": "ARM: 5666/1: Revamped U300 padmux API\n\nThis abstracts the hackish padmux API on the U300 platform into\nsomething more manageable. It provides a way for drivers to\nactivate/deactivate a certain padmux setting. It will also switch\nthe users of the old API over to using the new style, pushing\nmuxing into the apropriate setup files.\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": "5ad73d07173e7b76c16bcb8b6cf64d8386019689", "tree": "7c8a22e7a4686d4979a418b6985f87fac9c7e3d8", "parents": [ "28d0325ce6e0a52f53d8af687e6427fee59004d3" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Mon Aug 10 12:51:56 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Aug 15 15:36:28 2009 +0100" }, "message": "ARM: 5665/1: U300 syscon register updates\n\nThis adds in a few new register and defines for improved padmux\nsupport and some figures that were plain wrong on the targeted\nU300 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": "6860107a46c8762d35eb7bf71bcf6c6510793b76", "tree": "0e674aa38ee238b89baaf0298e651d90072e09cc", "parents": [ "a0b98ec87d7a293a7d9ab8e45935c53a68f3094a" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Mon Jul 06 18:04:28 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 09 16:15:46 2009 +0100" }, "message": "[ARM] 5594/1: Correct U300 VIC init PM setting\n\nThis makes the VIC resume from suspend flagged IRQ:s identical to\nthe flags indicating all possible interrupts. This is perhaps not\nthe optimal setting but setting it to 0 makes the system suspend\nand never come back again (all IRQ sources masked off).\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": "7fb2bbf4d9e7e62057184f1e061566459eef6c79", "tree": "e67c4c6780246bca649fac652f83116785ee855e", "parents": [ "012b7d339ce8c42d41e35b35c4acc3dd29501d52" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Thu Jul 09 15:15:12 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 09 15:15:12 2009 +0100" }, "message": "MMC: MMCI: allow GPIOs to be passed\n\nAdd and initialize the gpio_wp and gpio_cd members. We need to\nensure that all users are covered, because GPIO 0 may be valid.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\n" }, { "commit": "4ebfc3dba59fb84b315ebb0059347dc9342a32f1", "tree": "352f72b50e788a3846f5a6e408315457d3485706", "parents": [ "9be4b17c4c900f634ab9be3d13e116aa31edb7cb" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Jul 02 00:27:57 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 02 17:24:39 2009 +0100" }, "message": "[ARM] 5581/1: U300 clock updates\n\nThis adds a few default locks to the clocks (the clocks were used\nbefore the locks were initialized by code), then renames the clocks\na bit to fit with the latest driver names (some changed during\nreview). Lastly it moves the initialization of the clock debugfs\nentry to module_init() initcall level since the debugfs isn\u0027t up\nin core_initcall().\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": "b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc", "tree": "c65b81ef9ae5076d2137034accfa2610f45a13de", "parents": [ "06099961002a813324d057a91695af7c72939da6", "7666c17e2b0986a079da46122d8658544416c2cf" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Sun Jun 14 11:01:44 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Jun 14 11:01:44 2009 +0100" }, "message": "Merge branch \u0027u300\u0027 into devel\n\nConflicts:\n\tarch/arm/Makefile\nUpdates:\n\tarch/arm/mach-u300/core.c\n\tarch/arm/mach-u300/timer.c\n" }, { "commit": "7666c17e2b0986a079da46122d8658544416c2cf", "tree": "0f045f8b55aac9ec384524b7b9298cbc9e033d67", "parents": [ "eb366d4c95f546bb46a536387a4aca00ed2eda6a" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Mon Jun 01 14:27:26 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jun 04 17:47:36 2009 +0100" }, "message": "[ARM] 5535/1: U300 Makefile.boot\n\nThe Makefile.boot file for the U300 port. This will compile the\nkernel for different ZRELADDR depending on the location of\nphysical RAM in the chosen configuration.\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": "ed31b2dfad01d23446860c983ff94460d7971c48", "tree": "6bf864c02bbf06752134e5a6a16ddfeaab35e791", "parents": [ "f7a9a4d782628b4bd2392d931b95bd49732a2918" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Sun May 31 15:08:11 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun May 31 15:08:11 2009 +0100" }, "message": "[ARM] make U300 clk_set_rate() return a _real_ errno\n\nAnother stupid instance of \"return -1\"-ism.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "f7a9a4d782628b4bd2392d931b95bd49732a2918", "tree": "ff8289780c6f9de55d118486c16a1220eb530d0b", "parents": [ "d98aac7592114241f378bc8d5b3e424cced7ded2" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Fri May 08 08:59:51 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon May 18 16:48:55 2009 +0100" }, "message": "[ARM] 5510/1: U300 GPIO debug and init fixes\n\nThis moves the GPIO driver away from using __devinit and __devexit\nIt also removes all printk() in favor of using dev_* print macros\non pdev-\u003edev struct instead. Surplus prints are removed, and the\nplatform_device_probe() function is used instead of putting a\n.probe function in the platform driver struct.\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": "bb3cee2b35d2b9edab71997bd06040ff37483e08", "tree": "59fbdd7076981906e705e63d09b3d42ff8873242", "parents": [ "cd27e485410aa7e7464b0126d968fe8c2a5c045b" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Apr 23 10:22:13 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Apr 28 22:44:15 2009 +0100" }, "message": "[ARM] 5473/1: U300 core machine support\n\nThis adds core support for the ST-Ericsson U300 series\nplatforms: U300, U330, U335 and U365. Supports memory\nmappings, interrupt controller, system timer (clocksource\nand clockevents), and binds to the existing drivers for\nthe PrimeCells used in this design: PL190 (VIC), PL180\n(MMC/SD host) and PL011 (UART). This is intented to serve\nas starting point for our mainling work, more patches to\nfollow.\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": "cd27e485410aa7e7464b0126d968fe8c2a5c045b", "tree": "7285da0a3800e3729c37061af8a59189ccc61cd1", "parents": [ "bd41b99d4661e775ff152f2842782c43dbb30a59" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Apr 23 10:21:30 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Apr 28 22:44:12 2009 +0100" }, "message": "[ARM] 5474/1: U300 clocking framework\n\nThis adds the clocking framework and hooks into the clkdevice\nfor U300 series 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": "bd41b99d4661e775ff152f2842782c43dbb30a59", "tree": "3cbf711bd296286ea57235baba79ececd253edb9", "parents": [ "fa59440d0c7b5a2bcdc9e35f25fdac693e54c86a" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Apr 23 21:15:04 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Apr 28 22:44:09 2009 +0100" }, "message": "[ARM] 5471/2: U300 GPIO and PADMUX support\n\nThis adds GPIO and PADMUX headers and implementation for\nthe U300 platform. This is an implementation in isolation\nthat depend on later patches in this series to plug into\nthe framework.\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": "fa59440d0c7b5a2bcdc9e35f25fdac693e54c86a", "tree": "4856086aecdd7d74372a062c0e319400e0fbdaa3", "parents": [ "b4175b89921fefb2f352472fa6dccb0fc4fb37d9" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Apr 23 10:19:58 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Apr 28 22:44:05 2009 +0100" }, "message": "[ARM] 5470/1: U300 register definitions\n\nThis adds registers, interrupt numbers and IO mappings\nfor the U300 series platforms core support, including\nbasic block offsets and registers definitions for the\nsystem controller.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" } ] }