)]}' { "log": [ { "commit": "9320f7cbbdd5febf013b0e91db29189724057738", "tree": "8ba7a24a1c7dfe696bfadf4035f39011eba8d49a", "parents": [ "06fe577f841f383b2d4f743cfb74fac7f6468353" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Thu Sep 23 16:22:05 2010 +0200" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Sun Sep 26 16:27:05 2010 -0400" }, "message": "mmc: sdhci-s3c: fix NULL ptr access in sdhci_s3c_remove\n\nIf not all clocks have been defined in platform data, the driver will\ncause a null pointer dereference when it is removed. This patch fixes\nthis issue.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "06fe577f841f383b2d4f743cfb74fac7f6468353", "tree": "8e2a54b3e99e2eb30617f7d5803038d66c89aa2e", "parents": [ "245feaa61dbdabffafd47b973595e06abb1288f4" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Mon Sep 20 15:03:42 2010 +0200" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Sun Sep 26 16:27:02 2010 -0400" }, "message": "mmc: sdhci-s3c: fix incorrect spinlock usage after merge\n\nIn the commit f522886e202a34a2191dd5d471b3c4d46410a9a0 a merge conflict\nin the sdhci-s3c driver been fixed. However the fix used incorrect\nspinlock operation - it caused a race with sdhci interrupt service. The\ncorrect way to solve it is to use spin_lock_irqsave/irqrestore() calls.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "7c5367f205f7d53659fb19b9fdf65b7bc1a592c6", "tree": "fc2ad7d823f32df9d33ae2dd4f3ae6d09125e3d9", "parents": [ "e7cb756fc3c7c32040283963572258381b342dff" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Thu Sep 09 16:37:50 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 09 18:57:23 2010 -0700" }, "message": "drivers/mmc/host/imxmmc.c: adjust confusing if indentation\n\nMove the second if (reg \u0026 ...) test into the branch indicated by its\nindentation. The test was previously always executed after the if\ncontaining that branch, but it was always false unless the if branch was\ntaken.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r disable braces4@\nposition p1,p2;\nstatement S1,S2;\n@@\n\n(\nif (...) { ... }\n|\nif (...) S1@p1 S2@p2\n)\n\n@script:python@\np1 \u003c\u003c r.p1;\np2 \u003c\u003c r.p2;\n@@\n\nif (p1[0].column \u003d\u003d p2[0].column):\n cocci.print_main(\"branch\",p1)\n cocci.print_secs(\"after\",p2)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\nCc: Pavel Pisa \u003cppisa@pikron.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e7cb756fc3c7c32040283963572258381b342dff", "tree": "59d4353875093251f4ed0bd9f01ba18086ea49b7", "parents": [ "23ef309a6e070490da0a37b9b6383819f8170ea3" ], "author": { "name": "Ethan Du", "email": "ethan.too@gmail.com", "time": "Thu Sep 09 16:37:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 09 18:57:23 2010 -0700" }, "message": "omap hsmmc: fix a racing case between kmmcd and omap_hsmmc_suspend\n\nIf suspend called when kmmcd is doing host-\u003eops-\u003edisable, as kmmcd already\nincreased host-\u003een_dis_recurs to 1, the mmc_host_enable in suspend\nfunction will return directly without increase the nesting_cnt, which will\ncause the followed register access carried out to the disabled host.\n\nmmc_suspend_host will enable host itself. No need to enable host before\nit. Also works on kmmcd will get flushed in mmc_suspend_host, enable host\nafter it will be safe. So make the mmc_host_enable after it.\n\n[cjb: rebase against current Linus]\nSigned-off-by: Ethan \u003cethan.too@gmail.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\nAcked-by: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nAcked-by: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "23ef309a6e070490da0a37b9b6383819f8170ea3", "tree": "aada96475947375079527714609245d1a32db043", "parents": [ "16d9b130783c54c30cab80e24810ab1ab9596e11" ], "author": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Thu Sep 09 16:37:48 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 09 18:57:23 2010 -0700" }, "message": "mmc: at91_mci: add missing linux/highmem.h include\n\nFix the following error:\n\nat91_mci.c: In function \u0027at91_mci_sg_to_dma\u0027:\nat91_mci.c:236: error: implicit declaration of function \u0027kmap_atomic\u0027\nat91_mci.c:236: error: \u0027KM_BIO_SRC_IRQ\u0027 undeclared (first use in this function)\nat91_mci.c:236: error: (Each undeclared identifier is reported only once\nat91_mci.c:236: error: for each function it appears in.)\nat91_mci.c:236: warning: assignment makes pointer from integer without a cast\nat91_mci.c:252: error: implicit declaration of function \u0027kunmap_atomic\u0027\nat91_mci.c: In function \u0027at91_mci_post_dma_read\u0027:\nat91_mci.c:302: error: \u0027KM_BIO_SRC_IRQ\u0027 undeclared (first use in this function)\nat91_mci.c:302: warning: assignment makes pointer from integer without a cast\nat91_mci.c:317: error: implicit declaration of function \u0027flush_kernel_dcache_page\u0027\n\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\nCc: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: Andrew Victor \u003cavictor.za@gmail.com\u003e\nCc: Wolfgang Muees \u003cwolfgang.mues@auerswald.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "16d9b130783c54c30cab80e24810ab1ab9596e11", "tree": "13b1c4b5e687fb7b3f8a212697b537427e55d907", "parents": [ "60c2c0d5658082468b569d039f4d0dc24f92c66b" ], "author": { "name": "Sergio Aguirre", "email": "saaguirre@ti.com", "time": "Thu Sep 09 16:37:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 09 18:57:23 2010 -0700" }, "message": "omap_hsmmc: remove unused local `state\u0027\n\nThis fixes the following warning:\n\ndrivers/mmc/host/omap_hsmmc.c: In function \u0027omap_hsmmc_suspend\u0027:\ndrivers/mmc/host/omap_hsmmc.c:2275: warning: unused variable \u0027state\u0027\n\nIntroduced by commit ID:\n\n commit 1a13f8fa76c880be41d6b1e6a2b44404bcbfdf9e\n Author: Matt Fleming \u003cmatt@console-pimps.org\u003e\n Date: Wed May 26 14:42:08 2010 -0700\n\n mmc: remove the \"state\" argument to mmc_suspend_host()\n\nThe unique usage of this var was removed there, and missed\nremoving the respective declaration aswell.\n\nSigned-off-by: Sergio Aguirre \u003csaaguirre@ti.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\nAcked-by: Matt Fleming \u003cmatt@console-pimps.org\u003e\nCc: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "60c2c0d5658082468b569d039f4d0dc24f92c66b", "tree": "78c53d1de3b0339a9356f3ebbe6d7f76e20f5801", "parents": [ "5600efb1bc2745d93ae0bc08130117a84f2b9d69" ], "author": { "name": "Jiri Pinkava", "email": "jiri.pinkava@vscht.cz", "time": "Tue May 25 09:48:58 2010 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 09 18:57:23 2010 -0700" }, "message": "ARM: SAMSUNG: MMC: fix build error when both DMA and PIO mode selected\n\n[cjb: fix line-wrapped patch]\nSigned-off-by: Jiri Pinkava \u003cjiri.pinkava@vscht.cz\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\nCc: Matt Fleming \u003cmatt@console-pimps.org\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5600efb1bc2745d93ae0bc08130117a84f2b9d69", "tree": "a755ad13e4d11d3e631590fca3babba22ffe7233", "parents": [ "b78d6c5f51935ba89df8db33a57bacb547aa7325" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Thu Sep 09 16:37:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 09 18:57:23 2010 -0700" }, "message": "mmc: fix the use of kunmap_atomic() in tmio_mmc.h\n\nkunmap_atomic() takes the cookie, returned by the kmap_atomic() as its\nargument and not the page address, used as an argument to kmap_atomic().\nThis patch fixes the compile error:\n\nIn file included from drivers/mmc/host/tmio_mmc.c:37:\ndrivers/mmc/host/tmio_mmc.h: In function \u0027tmio_mmc_kunmap_atomic\u0027:\ndrivers/mmc/host/tmio_mmc.h:192: error: negative width in bit-field \u0027\u003canonymous\u003e\u0027\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nAcked-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nTested-by: Magnus Damm \u003cdamm@opensource.se\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b78d6c5f51935ba89df8db33a57bacb547aa7325", "tree": "7cd4c5bb1d9f7d5f3c0815705ce8d52d4c81463a", "parents": [ "31583bb0cf6cc40f2a468a4d2f3b9cbefd24f891" ], "author": { "name": "Yusuke Goda", "email": "yusuke.goda.sx@renesas.com", "time": "Thu Sep 09 16:37:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 09 18:57:23 2010 -0700" }, "message": "tmio_mmc: don\u0027t clear unhandled pending interrupts\n\nPreviously, it was possible for ack_mmc_irqs() to clear pending interrupt\nbits in the CTL_STATUS register, even though the interrupt handler had not\nbeen called. This was because of a race that existed when doing a\nread-modify-write sequence on CTL_STATUS. After the read step in this\nsequence, if an interrupt occurred (causing one of the bits in CTL_STATUS\nto be set) the write step would inadvertently clear it.\n\nObserved with the TMIO_STAT_RXRDY bit together with CMD53 on AR6002 and\nBCM4318 SDIO cards in polled mode.\n\nThis patch eliminates this race by only writing to CTL_STATUS and clearing\nthe interrupts that were passed as an argument to ack_mmc_irqs().\"\n\n[matt@console-pimps.org: rewrote changelog]\nSigned-off-by: Yusuke Goda \u003cyusuke.goda.sx@renesas.com\u003e\nAcked-by: Magnus Damm \u003cdamm@opensource.se\u003e\"\nTested-by: Arnd Hannemann \u003carnd@arndnet.de\u003e\"\nAcked-by: Ian Molton \u003cian@mnementh.co.uk\u003e\nCc: Matt Fleming \u003cmatt@console-pimps.org\u003e\nCc: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f3c65b2870f2481f3646bc410a58a12989ecc704", "tree": "ef33d62ee503a43645aae49119a94dc0339fe4b0", "parents": [ "152831be91dfe864e06c3b3ff2bf994e04df4cdf" ], "author": { "name": "David Vrabel", "email": "david.vrabel@csr.com", "time": "Thu Sep 09 16:37:24 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 09 18:57:22 2010 -0700" }, "message": "mmc: avoid getting CID on SDIO-only cards\n\nThe introduction of support for SD combo cards breaks the initialization\nof all CSR SDIO chips. The GO_IDLE (CMD0) in mmc_sd_get_cid() causes CSR\nchips to be reset (this is non-standard behavior).\n\nWhen initializing an SDIO card check for a combo card by using the memory\npresent bit in the R4 response to IO_SEND_OP_COND (CMD5). This avoids the\ncall to mmc_sd_get_cid() on an SDIO-only card.\n\nSigned-off-by: David Vrabel \u003cdavid.vrabel@csr.com\u003e\nAcked-by: Michal Mirolaw \u003cmirq-linux@rere.qmqm.pl\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f522886e202a34a2191dd5d471b3c4d46410a9a0", "tree": "1ce0fcadd9bc584337146955f8aa2c9a5eaa463c", "parents": [ "5193250168ccdf87364e35a11965336dc088578c" ], "author": { "name": "Kyungmin Park", "email": "kyungmin.park@samsung.com", "time": "Thu Aug 19 14:13:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 20 09:34:55 2010 -0700" }, "message": "drivers/mmc/host/sdhci-s3c.c: use the correct mutex and card detect function\n\nThere\u0027s some merge problem between sdhic core and sdhci-s3c host. After\nmutex is changed to spinlock. It needs to use use spin lock functions and\nuse the correct card detection function.\n\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5193250168ccdf87364e35a11965336dc088578c", "tree": "30bf8a281f27020f413033a7acc3be65d63c8377", "parents": [ "930a6f70fa3b9c79a57dd6850ef9cb1efa470575" ], "author": { "name": "Kyungmin Park", "email": "kyungmin.park@samsung.com", "time": "Thu Aug 19 14:13:35 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 20 09:34:55 2010 -0700" }, "message": "sdhci: add no hi-speed bit quirk support\n\nSome SDHCI controllers like s5pc110 don\u0027t have an HISPD bit in the HOSTCTL\nregister.\n\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "930a6f70fa3b9c79a57dd6850ef9cb1efa470575", "tree": "62b12caea3d3a283c4700b7dfe32567e65b61e22", "parents": [ "944645c33e4ada914f4c045525a9293610085ccd" ], "author": { "name": "Kyungmin Park", "email": "kyungmin.park@samsung.com", "time": "Thu Aug 19 14:13:35 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 20 09:34:55 2010 -0700" }, "message": "s5pc110: SDHCI-s3c support on s5pc110\n\ns5pc110 (aka s5pv210) uses the same SDHCI IP.\n\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "81ca03a0e2ea0207b2df80e0edcf4c775c07a505", "tree": "090dfd9cea5bf5f019c7cfb84b1d3cec18bf8bca", "parents": [ "1ca72feb9343d10a620c3076b0aa6e80d613fcf7" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Wed Aug 18 09:25:38 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 18 09:34:05 2010 -0700" }, "message": "mmc: build fix: mmc_pm_notify is only available with CONFIG_PM\u003dy\n\nThis fixes a build breakage introduced by commit 4c2ef25fe0b8 (\"mmc: fix\nall hangs related to mmc/sd card insert/removal during suspend/resume\")\n\nCc: David Brownell \u003cdavid-b@pacbell.net\u003e\nCc: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCc: linux-mmc@vger.kernel.org\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nAcked-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nAcked-by: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nAcked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b171aa27700c78511086a759383b033949c9d7f0", "tree": "2775b0682ea342dd49c5b997de248da73ec83049", "parents": [ "11ac552477e32835cb6970bf0a70c210807f5673", "b4225885deb569f7afcf1f3a9f069f74cc9db591" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 14 11:54:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 14 11:54:09 2010 -0700" }, "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/amba_pl022: Fix probe and remove hook section annotations.\n spi/mpc5121: change annotations for probe and remove functions\n spi/bitbang: reinitialize transfer parameters for every message\n spi/spi-gpio: add support for controllers without MISO or MOSI pin\n spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes\n SPI100k: Fix 8-bit and RX-only transfers\n spi/mmc_spi: mmc_spi adaptations for SPI bus locking API\n spi/mmc_spi: SPI bus locking API, using mutex\n\nFix trivial conflict in drivers/spi/mpc512x_psc_spi.c due to \u0027struct\nof_device\u0027 \u003d\u003e \u0027struct platform_device\u0027 rename and __init/__exit to\n__devinit/__devexit fix.\n" }, { "commit": "eb3bbf805f8509f03ee479becf8c2f00737e1efb", "tree": "90ea306a044f4a1788dc87f94411d8572856279d", "parents": [ "5e8530810805858892959b8ebbcec1009ea8c12d", "eba3f13716740c8a4bc12a987d3391a3c1f79e66" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 18:06:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 18:06:37 2010 -0700" }, "message": "Merge branch \u0027msm-mmc_sdcc\u0027 of git://codeaurora.org/quic/kernel/dwalker/linux-msm\n\n* \u0027msm-mmc_sdcc\u0027 of git://codeaurora.org/quic/kernel/dwalker/linux-msm:\n mmc: msm_sdcc: Rename config MMC_MSM7X00A to MMC_MSM\n mmc: msm_sdcc: Compile the driver for msm7x30\n mmc: msm: fix up build breakage on !PM\n" }, { "commit": "ce4327d372af7e2f2d403286e9904ab012e72827", "tree": "aa95c33aa9277d3ecb4d7c46cee13c8b59611c7c", "parents": [ "4032816dca04141e3d49ec4ed717c9f7cc5444c5", "b5d643de3ea28d7844a3a1a00a0a6f50897a2a6b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:07:32 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:07:32 2010 -0700" }, "message": "Merge branch \u0027msm-core\u0027 of git://codeaurora.org/quic/kernel/dwalker/linux-msm\n\n* \u0027msm-core\u0027 of git://codeaurora.org/quic/kernel/dwalker/linux-msm:\n msm: mmc: Add msm prefix to platform data structure\n msm: trout: Remove extern declaration from source file\n arm: msm: Fix section mismatch in smd.c.\n arm: msm: trout add mmc support\n arm: msm: trout: add trout specific gpio interrupts\n arm: msm: remove unused #include \u003clinux/version.h\u003e\n" }, { "commit": "58d4ea65b98f154f3326b038eecda32f90b46ea8", "tree": "636aed413349dece12c08a4bd3d1fea0254976d8", "parents": [ "26f0cf91813bdc8e61595f8ad6660251e2ee9cf6", "fbe0f8348fd6c3d016a3f48756eb729b41a67c22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:11:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:11:31 2010 -0700" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6:\n mmc_spi: Fix unterminated of_match_table\n of/sparc: fix build regression from of_device changes\n of/device: Replace struct of_device with struct platform_device\n" }, { "commit": "fec4dcce237c7185ff7129e704bc508850b6e3f0", "tree": "018b868ff5a1a66ac5dfcbc8704362295987f4f6", "parents": [ "64f7120d890b892ed2c82c87bed958902e809075" ], "author": { "name": "Adrian Hunter", "email": "adrian.hunter@nokia.com", "time": "Wed Aug 11 14:17:51 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 08:43:31 2010 -0700" }, "message": "mmc_test: fix large memory allocation\n\n- Fix mmc_test_alloc_mem.\n\n- Use nr_free_buffer_pages() instead of sysinfo.totalram to determine\n total lowmem pages.\n\n- Change variables containing memory sizes to unsigned long.\n\n- Limit maximum test area size to 128MiB because that is the maximum MMC\n high capacity erase size (the maxmium SD allocation unit size is just\n 4MiB)\n\nSigned-off-by: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "64f7120d890b892ed2c82c87bed958902e809075", "tree": "b90a6254f7436d3883787d21849b0f4eb4505e73", "parents": [ "4980454868af4b2f84f1f15f4b76512eecb37e1d" ], "author": { "name": "Adrian Hunter", "email": "adrian.hunter@nokia.com", "time": "Wed Aug 11 14:17:51 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 08:43:30 2010 -0700" }, "message": "mmc_test: add performance tests\n\nmmc_test provides tests aimed at testing SD/MMC hosts. This patch adds\nperformance tests.\n\nIt is advantageous to have performance tests in a kernel\nmodule like mmc_test for the following reasons:\n\t- transfer times can be measured very accurately\n\t- arbitrarily large transfers are possible\n\t- the effect of contiguous vs scattered pages\n\tcan be determined\n\nThe new tests are:\n\n\t23. Best-case read performance\n\t24. Best-case write performance\n\t25. Best-case read performance into scattered pages\n\t26. Best-case write performance from scattered pages\n\t27. Single read performance by transfer size\n\t28. Single write performance by transfer size\n\t29. Single trim performance by transfer size\n\t30. Consecutive read performance by transfer size\n\t31. Consecutive write performance by transfer size\n\t32. Consecutive trim performance by transfer size\n\nSigned-off-by: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4980454868af4b2f84f1f15f4b76512eecb37e1d", "tree": "c8480c25797558d44f39fdbec2e8a4b22f47c729", "parents": [ "8d57a98ccd0b4489003473979da8f5a1363ba7a3" ], "author": { "name": "Adrian Hunter", "email": "adrian.hunter@nokia.com", "time": "Wed Aug 11 14:17:50 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 08:43:30 2010 -0700" }, "message": "mmc_block: add support for secure discard\n\nSecure discard is implemented by Secure Trim if the discard is unaligned\nor Secure Erase otherwise.\n\nSigned-off-by: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nAcked-by: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Kyungmin Park \u003ckmpark@infradead.org\u003e\nCc: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Ben Gardiner \u003cbengardiner@nanometrics.ca\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "93caf8e69eac763f6a20cf253ace8e7fc1ab7953", "tree": "0c8e4832caba4c3c5caa6b64ba54aac194637b80", "parents": [ "bd788c9665fb7c543aac21317059375632343337" ], "author": { "name": "Adrian Hunter", "email": "adrian.hunter@nokia.com", "time": "Wed Aug 11 14:17:48 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 08:43:30 2010 -0700" }, "message": "omap_hsmmc: add erase capability\n\nDisable the data (busy) timeout for erases and set the MMC_CAP_ERASE\ncapability.\n\nSigned-off-by: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nAcked-by: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Kyungmin Park \u003ckmpark@infradead.org\u003e\nCc: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Ben Gardiner \u003cbengardiner@nanometrics.ca\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bd788c9665fb7c543aac21317059375632343337", "tree": "8d4a2a629cafefa2e0f2a9a44a558d10d3c7bddd", "parents": [ "dfe86cba7676d58db8de7e623f5e72f1b0d3ca35" ], "author": { "name": "Adrian Hunter", "email": "adrian.hunter@nokia.com", "time": "Wed Aug 11 14:17:47 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 08:43:30 2010 -0700" }, "message": "mmc_block: add discard support\n\nEnable MMC to service discard requests. In the case of SD and MMC cards\nthat do not support trim, discards become erases. In the case of cards\n(MMC) that only allow erases in multiples of erase group size, round to\nthe nearest completely discarded erase group.\n\nSigned-off-by: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nAcked-by: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Kyungmin Park \u003ckmpark@infradead.org\u003e\nCc: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Ben Gardiner \u003cbengardiner@nanometrics.ca\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dfe86cba7676d58db8de7e623f5e72f1b0d3ca35", "tree": "ed7e6a267c50e0ba2374dc6895515d7a100961a3", "parents": [ "81d73a32d775ae9674ea6edf0b5b721fc3bc57d9" ], "author": { "name": "Adrian Hunter", "email": "adrian.hunter@nokia.com", "time": "Wed Aug 11 14:17:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 08:43:30 2010 -0700" }, "message": "mmc: add erase, secure erase, trim and secure trim operations\n\nSD/MMC cards tend to support an erase operation. In addition, eMMC v4.4\ncards can support secure erase, trim and secure trim operations that are\nall variants of the basic erase command.\n\nSD/MMC device attributes \"erase_size\" and \"preferred_erase_size\" have been\nadded.\n\n\"erase_size\" is the minimum size, in bytes, of an erase operation. For\nMMC, \"erase_size\" is the erase group size reported by the card. Note that\n\"erase_size\" does not apply to trim or secure trim operations where the\nminimum size is always one 512 byte sector. For SD, \"erase_size\" is 512\nif the card is block-addressed, 0 otherwise.\n\nSD/MMC cards can erase an arbitrarily large area up to and\nincluding the whole card. When erasing a large area it may\nbe desirable to do it in smaller chunks for three reasons:\n\n 1. A single erase command will make all other I/O on the card\n wait. This is not a problem if the whole card is being erased, but\n erasing one partition will make I/O for another partition on the\n same card wait for the duration of the erase - which could be a\n several minutes.\n\n 2. To be able to inform the user of erase progress.\n\n 3. The erase timeout becomes too large to be very useful.\n Because the erase timeout contains a margin which is multiplied by\n the size of the erase area, the value can end up being several\n minutes for large areas.\n\n\"erase_size\" is not the most efficient unit to erase (especially for SD\nwhere it is just one sector), hence \"preferred_erase_size\" provides a good\nchunk size for erasing large areas.\n\nFor MMC, \"preferred_erase_size\" is the high-capacity erase size if a card\nspecifies one, otherwise it is based on the capacity of the card.\n\nFor SD, \"preferred_erase_size\" is the allocation unit size specified by\nthe card.\n\n\"preferred_erase_size\" is in bytes.\n\nSigned-off-by: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nAcked-by: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Kyungmin Park \u003ckmpark@infradead.org\u003e\nCc: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Ben Gardiner \u003cbengardiner@nanometrics.ca\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "568133ebda39f7507759a744fa9cf4d5097bad2f", "tree": "0a5cfe67eabe23bcbd9bb4b60a56e00500496536", "parents": [ "447bd479105c34416dad01c374873c34d8e25cfd" ], "author": { "name": "Pablo Castillo", "email": "CyberCastle@gmail.com", "time": "Tue Aug 10 18:02:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:05 2010 -0700" }, "message": "mmc: add ricoh e822 pci id\n\nSigned-off-by: Pablo Castillo \u003cCyberCastle@gmail.com\u003e\nSigned-off-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nTested-by: Gregg Lebovitz \u003cgregg@lebovitz.net\u003e\nCc: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c4512f79dcb236c8dc2afae176a0dc520096f0bc", "tree": "4aced8cb26bae4256e538c6a35679d31c60d7dc2", "parents": [ "9bea3c850dbff2296892298614388bdc71ad2170" ], "author": { "name": "Jerry Huang", "email": "Chang-Ming.Huang@freescale.com", "time": "Tue Aug 10 18:01:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:05 2010 -0700" }, "message": "sdhci: add auto CMD12 support for eSDHC driver\n\nAdd auto CMD12 command support for eSDHC driver. This is needed by P4080\nand P1022 for block read/write. Manual asynchronous CMD12 abort operation\ncauses protocol violations on these silicons.\n\nSigned-off-by: Jerry Huang \u003cChang-Ming.Huang@freescale.com\u003e\nSigned-off-by: Roy Zang \u003ctie-fei.zang@freescale.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Kumar Gala \u003cgalak@gate.crashing.org\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9bea3c850dbff2296892298614388bdc71ad2170", "tree": "bc5050601ec6349441ef3d35cbda2775808eee20", "parents": [ "17866e14f3a4f219e94f1374ece7226479418ff8" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue Aug 10 18:01:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:05 2010 -0700" }, "message": "sdhci: add regulator support\n\nThis patch adds support for regulator API to sdhci core driver.\nRegulators can be used to disable power in suspended state to reduce\ndissipated energy.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "17866e14f3a4f219e94f1374ece7226479418ff8", "tree": "4e1a618f9dbcdc982bac4289eec30a87c764c33c", "parents": [ "a1d5646005af1247d6ae78434bb4db15b07a07b2" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue Aug 10 18:01:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:05 2010 -0700" }, "message": "sdhci-s3c: add support for new card detection methods\n\nOn some Samsung SoCs not all SDHCI controllers have card detect (CD) line.\n For some embedded designs it is not even needed, because ususally the\ndevice (like SDIO flash memory or wifi controller) is permanently wired to\nthe controller. There are also systems which have a card detect line\nconnected to some of the external interrupt lines or the presence of the\ncard depends on some other actions (like enabling a power regulator).\n\nThis patch adds support for all these cases. The following card detection\nmethods are possible:\n\n1. internal sdhci host card detect line\n2. external event\n3. external gpio interrupt\n4. no card detect line, controller will poll for the card\n5. no card detect line, card is permanently wired to the controller\n(once detected host won\u0027t poll it any more)\n\nBy default, all existing code would use method #1, what is compatible with\nthe previous version of the driver.\n\nIn case of external event, two callbacks must be provided in platdata:\next_cd_init and ext_cd_cleanup. Both of them get a callback to a function\nthat notifies the s3c-sdhci host contoller as their argument. That\ncallback function should be called from the even dispatcher to let host\nnotice the card insertion/removal.\n\nIn case of external gpio interrupt, a gpio pin number must be provided in\nplatdata (ext_cd_gpio parameter), as well as the information about the\npolarity of that gpio pin (ext_cd_gpio_invert). By default\n(ext_cd_gpio_invert \u003d\u003d 0) gpio value 0 means \u0027card has been removed\u0027, but\nthis can be changed to \u0027card has been removed\u0027 when ext_cd_gpio_invert \u003d\u003d\n1.\n\nThis patch adds all required changes to sdhci-s3c driver.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a1d5646005af1247d6ae78434bb4db15b07a07b2", "tree": "7df620c8af7941df3f46ccfce705bc4caff48011", "parents": [ "ce5f036bbbfc6c21d7b55b8fdaa2e2bd56392d94" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue Aug 10 18:01:57 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:05 2010 -0700" }, "message": "sdhci-s3c: enable SDHCI_QUIRK_NO_HISPD_BIT quirk\n\nThis patch enables SDHCI_QUIRK_NO_HISPD_BIT on Samsung SDHCI driver. This\nsolves detection problems with some external SD cards. This change has\nbeen tested on S5PC100 and S5PC110. It has no inpact on driver speed.\n\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ce5f036bbbfc6c21d7b55b8fdaa2e2bd56392d94", "tree": "9567c61e6df52664b86c0d0da9f0cdb5a52de4b6", "parents": [ "3fe42e077f65351503f5004031549db330bb105e" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue Aug 10 18:01:56 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:05 2010 -0700" }, "message": "sdhci-s3c: add support for the non standard minimal clock value\n\nS3C SDHCI host controller can change the source for generating mmc clock.\nBy default host bus clock is used, what causes some problems on machines\nwith 133MHz bus, because the SDHCI divider cannot be as high get proper\nclock value for identification mode. This is not a problem for the\ncontroller, because it can generate lower frequencies from other clock\nsources. This patch changes sdhci driver to use get_min_clock() call if\nit has been provided.\n\nThis fixes the flood of the following warnings on Samsung S5PV210 SoCs:\nmmc0: Minimum clock frequency too high for identification mode\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3fe42e077f65351503f5004031549db330bb105e", "tree": "f05f0090d72573d9092d2f784a707819eb760fce", "parents": [ "f3584e5e6fd7abda4ef4a7aec9acd9d46387b8ab" ], "author": { "name": "Hyuk Lee", "email": "hyuk1.lee@samsung.com", "time": "Tue Aug 10 18:01:55 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:05 2010 -0700" }, "message": "sdhci-s3c: add SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK quirk\n\nOn Samsung\u0027s SDMMC hosts the timeout clock is derivied from the SD Clock\nwhich is set dynamically. So checked SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK\nquirk and removed \u0027sdhci_s3c_get_timeout_clk\u0027 callback which doesn\u0027t need\nany more.\n\nSigned-off-by: Hyuk Lee \u003chyuk1.lee@samsung.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f3584e5e6fd7abda4ef4a7aec9acd9d46387b8ab", "tree": "9d56c5f9434e999ab361ad50499b0987211f4c38", "parents": [ "762333e344144283a9da97a34b5dded51ff61b27" ], "author": { "name": "Venkatraman S", "email": "svenkatr@ti.com", "time": "Tue Aug 10 18:01:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:04 2010 -0700" }, "message": "omap hsmmc: fix processing of all dma interrupts as block completion\n\nIf other informative interrupts are enabled for the DMA channel used by\nhsmmc, those are incorrectly treated as block completion. This patch lets\nonly the block completion interrupt to be processed.\n\nSigned-off-by: Venkatraman S \u003csvenkatr@ti.com\u003e\nAcked-by: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "762333e344144283a9da97a34b5dded51ff61b27", "tree": "8bc2af8a99e66cbbcba359f7bd8ca76cd332ec34", "parents": [ "ed199f7e7346ba508f803180ecc6830e92558a1e" ], "author": { "name": "Christian Dietrich", "email": "qy03fugy@stud.informatik.uni-erlangen.de", "time": "Tue Aug 10 18:01:53 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:04 2010 -0700" }, "message": "drivers/mmc/host/msm-sdcc: remove dead config options\n\nCONFIG_MMC_MSM7X00A_RESUME_IN_WQ and CONFIG_MMC_EMBEDDED_SDIO don\u0027t exist\nin Kconfig and is never defined anywhere else, therefore removing all\nreferences for it from the source code.\n\nSigned-off-by: Christian Dietrich \u003cqy03fugy@stud.informatik.uni-erlangen.de\u003e\nAcked-by: David Brown \u003cdavidb@codeaurora.org\u003e\nCc: Daniel Walker \u003cdwalker@codeaurora.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4816858cce279b5e8d1eab0b4832d89d8f2ca58c", "tree": "81da0dc2193db08910ba5d1c7a55e03dcd7274a9", "parents": [ "6f51be3d37dff73cf8db771df4169f4c2f1cbf66" ], "author": { "name": "Grazvydas Ignotas", "email": "notasas@gmail.com", "time": "Tue Aug 10 18:01:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:04 2010 -0700" }, "message": "omap_hsmmc: add init_card pass-through callback\n\nThis will allow us to set up special cards in machine drivers just after\nthey are detected by MMC core.\n\nSigned-off-by: Grazvydas Ignotas \u003cnotasas@gmail.com\u003e\nCc: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nCc: Tony Lindgren \u003ctony@atomide.com\u003e\nCc: Bob Copeland \u003cme@bobcopeland.com\u003e\nCc: Kalle Valo \u003ckvalo@adurom.com\u003e\nCc: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nCc: Kishore Kadiyala \u003ckishore.kadiyala@ti.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6f51be3d37dff73cf8db771df4169f4c2f1cbf66", "tree": "0d79099cab112a4bd694d2868fbd9c35fd3cdd3a", "parents": [ "20b1597bcf4a76ccab232fa032f5f9ad30069167" ], "author": { "name": "Grazvydas Ignotas", "email": "notasas@gmail.com", "time": "Tue Aug 10 18:01:50 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:04 2010 -0700" }, "message": "sdio: allow non-standard SDIO cards\n\nThere are some chips (like TI WL12xx series) that can be interfaced over\nSDIO but don\u0027t support the SDIO specification, meaning that they are\nmissing CIA (Common I/O Area) with all it\u0027s registers. Current Linux SDIO\nimplementation relies on those registers to identify and configure the\ncard, so non-standard cards can not function and cause lots of warnings\nfrom the core when it reads invalid data from non-existent registers.\n\nAfter this patch, init_card() host callback can now set new quirk\nMMC_QUIRK_NONSTD_SDIO, which means that SDIO core should not try to access\nany standard SDIO registers and rely on init_card() to fill all SDIO\nstructures instead. As those cards are usually embedded chips, all the\nrequired information can be obtained from machine board files by the host\ndriver when it\u0027s called through init_card() callback.\n\nSigned-off-by: Grazvydas Ignotas \u003cnotasas@gmail.com\u003e\nCc: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nCc: Tony Lindgren \u003ctony@atomide.com\u003e\nCc: Bob Copeland \u003cme@bobcopeland.com\u003e\nCc: Kalle Valo \u003ckvalo@adurom.com\u003e\nCc: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nCc: Kishore Kadiyala \u003ckishore.kadiyala@ti.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "20b1597bcf4a76ccab232fa032f5f9ad30069167", "tree": "37ff80d3df4d7d10a35276080f319bb340e4ea2b", "parents": [ "845e3f4f06f9b1d34f39601cb6b7abfb8f40653c" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@mvista.com", "time": "Tue Aug 10 18:01:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "sdhci-pltfm: add support for CNS3xxx SoC devices\n\nThere\u0027s nothing special, just SoC-specific ops and quirks.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@mvista.com\u003e\nCc: Ben Dooks \u003cben@simtec.co.uk\u003e\nCc: Richard R?jfors \u003crichard.rojfors@pelagicore.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "845e3f4f06f9b1d34f39601cb6b7abfb8f40653c", "tree": "a8c8340f2210c99fbc2d3cb3f50fcff40274a21f", "parents": [ "515033f97c0b5a1bce13fa93e09704d95b44f376" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@mvista.com", "time": "Tue Aug 10 18:01:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "sdhci-pltfm: reorganize Makefile entries to support SoC devices\n\nDue to build system limitations, intermediate and final objects can\u0027t have\nthe same names. And as we\u0027re going to start building SoC-specific\nobjects, let\u0027s rename the module to sdhci-platform, into which we\u0027ll link\nsdhci-pltfm and SoC-specifc objects.\n\nThere should be no issue in renaming as the driver uses modalias\nmechanism.\n\nThis is exactly the same approach as in sdhci-of driver.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@mvista.com\u003e\nCc: Ben Dooks \u003cben@simtec.co.uk\u003e\nCc: Richard R?jfors \u003crichard.rojfors@pelagicore.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "515033f97c0b5a1bce13fa93e09704d95b44f376", "tree": "c3cf267cbe660920682f3f996fded61afadd412f", "parents": [ "27151dc9e363c0033d7375863c0d284f8c4b636a" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@mvista.com", "time": "Tue Aug 10 18:01:47 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "sdhci-pltfm: switch to module device table matching\n\nSometimes want to place SoC-specific parts alongside with the generic\ndriver, and to do so, we have to switch the driver over to the module\ndevice table matching.\n\nNote that drivers/mmc/host/sdhci-pltfm.h is so far empty, but it\u0027ll hold\nSoC-specific driver data handlers soon.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@mvista.com\u003e\nCc: Ben Dooks \u003cben@simtec.co.uk\u003e\nCc: Richard R?jfors \u003crichard.rojfors@pelagicore.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "27151dc9e363c0033d7375863c0d284f8c4b636a", "tree": "401329dc2634b84f427bb4338e9f556912f4ee7a", "parents": [ "fc8a0985c2846292312556cba10b8a4182f55967" ], "author": { "name": "Kishore Kadiyala", "email": "kishore.kadiyala@ti.com", "time": "Tue Aug 10 18:01:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "mmc: omap: fix for bus width which improves SD card\u0027s peformance.\n\nThis patch improves low speeds for SD cards.\n\nOMAP-MMC controller\u0027s can support maximum bus width of \u00278\u0027. when bus\nwidth is mentioned as \"8\" in controller data,the SD stack will check\nwhether bus width is \"4\" and if not it will set bus width to \"1\" and there\nby degrading performance. This patch fixes the issue and improves the\nperformance of SD cards.\n\nSigned-off-by: Kishore Kadiyala \u003ckishore.kadiyala@ti.com\u003e\nSigned-off-by: Venkatraman S \u003csvenkatr@ti.com\u003e\nSigned-off-by: Nishanth Menon \u003cnm@ti.com\u003e\nAcked-by: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nTested-by: Jarkko Nikula \u003cjhnikula@gmail.com\u003e\nCc: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nCc: Matt Fleming \u003cmatt@console-pimps.org\u003e\nCc: Tony Lindgren \u003ctony@atomide.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fc8a0985c2846292312556cba10b8a4182f55967", "tree": "951c4774239bd406271d18acd8574a76e1bbdea8", "parents": [ "c1f5977c6a136acbf525c634c8511e19d0c1f195" ], "author": { "name": "Hanumath Prasad", "email": "hanumath.prasad@stericsson.com", "time": "Tue Aug 10 18:01:45 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "mmc: only set blockaddressed for \u003e 2GiB cards\n\nA non-zero value of SEC_COUNT does not indicate that the card is sector\naddressed. According to the MMC specification, cards with a density\ngreater than 2GiB are sector addressed.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Hanumath Prasad \u003chanumath.prasad@stericsson.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c1f5977c6a136acbf525c634c8511e19d0c1f195", "tree": "404ef41ded924ff55fae708933c7fb80c2117328", "parents": [ "ae6d6c92212e94b12ab9365c23fb73acc2c3c2e7" ], "author": { "name": "Kyungmin Park", "email": "kyungmin.park@samsung.com", "time": "Tue Aug 10 18:01:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "sdhci: don\u0027t assign mmc-\u003ecaps at SDHCI directly\n\nSome host controllers can set mmc-\u003ecaps before sdhci_add_host().\n\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ae6d6c92212e94b12ab9365c23fb73acc2c3c2e7", "tree": "ab0337dcb0528d39c8c34cecb845c22b42e50c51", "parents": [ "cfd1f82f20e0c557a061189f7d8c30d623fbe313" ], "author": { "name": "Kyungmin Park", "email": "kyungmin.park@samsung.com", "time": "Tue Aug 10 18:01:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "sdhci: 8-bit data transfer width support\n\nSome host controllers such as s5pc110 support the WIDE8 feature.\n\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cfd1f82f20e0c557a061189f7d8c30d623fbe313", "tree": "176c0ebd310c963c3837968d3b0f63c744076a27", "parents": [ "ccc92c23240cdf952ef7cc39ba563910dcbc9cbe" ], "author": { "name": "Kyungmin Park", "email": "kyungmin.park@samsung.com", "time": "Tue Aug 10 18:01:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "sdhci: remove useless set_clock() check\n\nWhen using QUIRK_NONSTANDARD_CLOCK, it checks the set_clock() function\nwhich is not used actually. So delete it.\n\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ccc92c23240cdf952ef7cc39ba563910dcbc9cbe", "tree": "d656aad9e86fff59c1a5cbece4a5ccb019c35011", "parents": [ "4c2ef25fe0b847d2ae818f74758ddb0be1c27d8e" ], "author": { "name": "Maxim Levitsky", "email": "maximlevitsky@gmail.com", "time": "Tue Aug 10 18:01:42 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "mmc: make sdhci work with ricoh mmc controller\n\nThe current way of disabling it is not well tested by vendor and has all\nkinds of bugs that show up on resume from ram/disk. A very good example\nis a dead SDHCI controller.\n\nOld way of disabling is still supported by continuing to use\nCONFIG_MMC_RICOH_MMC.\n\nBased on \u0027http://list.drzeus.cx/pipermail/sdhci-devel/2007-December/002085.html\u0027\nTherefore most of the credit for this goes to Andrew de Quincey\n\nSigned-off-by: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nCc: Andrew de Quincey \u003cadq_dvb@lidskialf.net\u003e\nAcked-by: Philip Langdale \u003cphilipl@overt.org\u003e\nCc: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4c2ef25fe0b847d2ae818f74758ddb0be1c27d8e", "tree": "76dd136c6248c7bfffbf6663951e9e6b38238f20", "parents": [ "7310ece86ad7da027f85a37a0638164118a5d12f" ], "author": { "name": "Maxim Levitsky", "email": "maximlevitsky@gmail.com", "time": "Tue Aug 10 18:01:41 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "mmc: fix all hangs related to mmc/sd card insert/removal during suspend/resume\n\nIf you don\u0027t use CONFIG_MMC_UNSAFE_RESUME, as soon as you attempt to\nsuspend, the card will be removed, therefore this patch doesn\u0027t change the\nbehavior of this option.\n\nHowever the removal will be done by pm notifier, which runs while\nuserspace is still not frozen and thus can freely use del_gendisk, without\nthe risk of deadlock which would happen otherwise.\n\nCard detect workqueue is now disabled while userspace is frozen, Therefore\nif you do use CONFIG_MMC_UNSAFE_RESUME, and remove the card during\nsuspend, the removal will be detected as soon as userspace is unfrozen,\nagain at the moment it is safe to call del_gendisk.\n\nTested with and without CONFIG_MMC_UNSAFE_RESUME with suspend and hibernate.\n\n[akpm@linux-foundation.org: clean up function prototype]\n[akpm@linux-foundation.org: fix CONFIG_PM-n linkage, small cleanups]\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nCc: David Brownell \u003cdavid-b@pacbell.net\u003e\nCc: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7310ece86ad7da027f85a37a0638164118a5d12f", "tree": "122fd13237eba533876b08aadeee4b7128d9feb0", "parents": [ "71578a1eaa7b8b9bd3efc9c97d77ef2b63d5dc2b" ], "author": { "name": "Michal Miroslaw", "email": "mirq-linux@rere.qmqm.pl", "time": "Tue Aug 10 18:01:40 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:03 2010 -0700" }, "message": "mmc: implement SD-combo (IO+mem) support\n\nSigned-off-by: Michal Miroslaw \u003cmirq-linux@rere.qmqm.pl\u003e\nCc: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nCc: Chris Ball \u003ccjb@laptop.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "71578a1eaa7b8b9bd3efc9c97d77ef2b63d5dc2b", "tree": "1245fd417521d700ba466809a3f5ab282506c255", "parents": [ "6da24b786ed1963a7f872c1899627968c76d17d7" ], "author": { "name": "Michal Miroslaw", "email": "mirq-linux@rere.qmqm.pl", "time": "Tue Aug 10 18:01:40 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:02 2010 -0700" }, "message": "mmc: split mmc_sd_init_card()\n\nThis series adds support for SD combo cards to MMC/SD driver stack.\n\nSD combo consists of SD memory and SDIO parts in one package. Since the\nparts have a separate SD command sets, after initialization, they can be\ntreated as independent cards on one bus.\n\nChanges are divided into two patches. First is just moving initialization\ncode around so that SD memory part init can be called from SDIO init.\nSecond patch is a proper change enabling SD memory along SDIO. I tried to\nmove as much no-op changes to the first patch so that it\u0027s easier to\nfollow the required changes to initialization flow for SDIO cards.\n\nThis is based on Simplified SDIO spec v.2.00. The init sequence is\nslightly modified to follow current SD memory init implementation.\nCommand sequences, assuming SD memory and SDIO indeed ignore unknown\ncommands, are the same as before for both parts.\n\nThis patch:\n\nPrepare for SD-combo (IO+mem) support by splitting SD memory\ncard init and related functions.\n\nSigned-off-by: Michal Miroslaw \u003cmirq-linux@rere.qmqm.pl\u003e\nCc: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nCc: Chris Ball \u003ccjb@laptop.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6da24b786ed1963a7f872c1899627968c76d17d7", "tree": "992e2800e6aa88218f521ddd2f1cad879dcae380", "parents": [ "a892e2d7dcdfa6c76e60c50a8c7385c65587a2a6" ], "author": { "name": "Kyungmin Park", "email": "kmpark@infradead.org", "time": "Tue Aug 10 18:01:36 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:02 2010 -0700" }, "message": "mmc: recognize CSD structure\n\nThe eMMC spec 4.4 and 4.3 + additional feature chips has CSD structure\nversion 3 and version 3 have to check the CSD_STRUCTURE byte in the\nEXT_CSD register.\n\nAlso fix EXT_CSD revision message.\n\n[akpm@linux-foundation.org: fix comment, per Chris Ball]\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nCc: Chris Ball \u003ccjb@laptop.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2f9e825d3e0e2b407ae8f082de5c00afcf7378fb", "tree": "f8b3ee40674ce4acd5508a0a0bf52a30904caf6c", "parents": [ "7ae0dea900b027cd90e8a3e14deca9a19e17638b", "de75d60d5ea235e6e09f4962ab22541ce0fe176a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 10 15:22:42 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 10 15:22:42 2010 -0700" }, "message": "Merge branch \u0027for-2.6.36\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.36\u0027 of git://git.kernel.dk/linux-2.6-block: (149 commits)\n block: make sure that REQ_* types are seen even with CONFIG_BLOCK\u003dn\n xen-blkfront: fix missing out label\n blkdev: fix blkdev_issue_zeroout return value\n block: update request stacking methods to support discards\n block: fix missing export of blk_types.h\n writeback: fix bad _bh spinlock nesting\n drbd: revert \"delay probes\", feature is being re-implemented differently\n drbd: Initialize all members of sync_conf to their defaults [Bugz 315]\n drbd: Disable delay probes for the upcomming release\n writeback: cleanup bdi_register\n writeback: add new tracepoints\n writeback: remove unnecessary init_timer call\n writeback: optimize periodic bdi thread wakeups\n writeback: prevent unnecessary bdi threads wakeups\n writeback: move bdi threads exiting logic to the forker thread\n writeback: restructure bdi forker loop a little\n writeback: move last_active to bdi\n writeback: do not remove bdi from bdi_list\n writeback: simplify bdi code a little\n writeback: do not lose wake-ups in bdi threads\n ...\n\nFixed up pretty trivial conflicts in drivers/block/virtio_blk.c and\ndrivers/scsi/scsi_error.c as per Jens.\n" }, { "commit": "eba3f13716740c8a4bc12a987d3391a3c1f79e66", "tree": "22a38e70ca1aef65798b7b4b74a75aea0e271bed", "parents": [ "edd4dd0e987919ed672376c5c73c32aacfc24f39" ], "author": { "name": "Sahitya Tummala", "email": "stummala@codeaurora.org", "time": "Thu Jul 29 16:58:01 2010 +0530" }, "committer": { "name": "Daniel Walker", "email": "dwalker@codeaurora.org", "time": "Mon Aug 09 16:06:04 2010 -0700" }, "message": "mmc: msm_sdcc: Rename config MMC_MSM7X00A to MMC_MSM\n\nSD/MMC host controller driver is same for all MSM and QSD\nplatforms. Hence, rename the config to reflect the same.\n\nSigned-off-by: Sahitya Tummala \u003cstummala@codeaurora.org\u003e\nSigned-off-by: Daniel Walker \u003cdwalker@codeaurora.org\u003e\n" }, { "commit": "edd4dd0e987919ed672376c5c73c32aacfc24f39", "tree": "176c0d8d79a627fdeedaf41f50244de4949f8f22", "parents": [ "08ecfde47534ced67c3c16a15845456e83bd31d1" ], "author": { "name": "Sahitya Tummala", "email": "stummala@codeaurora.org", "time": "Thu Jul 29 16:57:41 2010 +0530" }, "committer": { "name": "Daniel Walker", "email": "dwalker@codeaurora.org", "time": "Mon Aug 09 16:05:20 2010 -0700" }, "message": "mmc: msm_sdcc: Compile the driver for msm7x30\n\nThe controller base address is referred from platform\nresource instead of using #defines. This fixes the\ncompilation error when driver is compiled for msm7x30.\n\nSigned-off-by: Sahitya Tummala \u003cstummala@codeaurora.org\u003e\nSigned-off-by: Daniel Walker \u003cdwalker@codeaurora.org\u003e\n" }, { "commit": "b5d643de3ea28d7844a3a1a00a0a6f50897a2a6b", "tree": "1c3cf983d43b386a64c930332862fd306395015f", "parents": [ "28d6c3db679dc83a0e77b5a540afb0594bdb7056" ], "author": { "name": "Sahitya Tummala", "email": "stummala@codeaurora.org", "time": "Thu Jul 29 16:55:34 2010 +0530" }, "committer": { "name": "Daniel Walker", "email": "dwalker@codeaurora.org", "time": "Mon Aug 09 15:48:23 2010 -0700" }, "message": "msm: mmc: Add msm prefix to platform data structure\n\nRename mmc_platform_data to msm_mmc_platform_data as it is used\nonly by MSM platform.\n\nSigned-off-by: Sahitya Tummala \u003cstummala@codeaurora.org\u003e\nSigned-off-by: Daniel Walker \u003cdwalker@codeaurora.org\u003e\n" }, { "commit": "fbe0f8348fd6c3d016a3f48756eb729b41a67c22", "tree": "2ebae9492ecedf94a6d0a016ca8ce31828092aa6", "parents": [ "19e4875fb21a69fbf620e84769a74d189c69c58d" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@mvista.com", "time": "Sun Aug 08 18:14:22 2010 +0400" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sun Aug 08 08:57:24 2010 -0600" }, "message": "mmc_spi: Fix unterminated of_match_table\n\ncommit 2ffe8c5f323c3b9749bf7bc2375d909d20bdbb15 (\"of: refactor\nof_modalias_node() and remove explicit match table\"), introduced\nan unterminated of_match_table, which may cause kernel to oops.\n\nThis patch fixes the issue by adding an empty device ID.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@mvista.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "6e9624b8caec290d28b4c6d9ec75749df6372b87", "tree": "47225b544e1da82742795553dc4e8aa70c17afdc", "parents": [ "8a6cfeb6deca3a8fefd639d898b0d163c0b5d368" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Aug 07 18:25:34 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Aug 07 18:25:34 2010 +0200" }, "message": "block: push down BKL into .open and .release\n\nThe open and release block_device_operations are currently\ncalled with the BKL held. In order to change that, we must\nfirst make sure that all drivers that currently rely\non this have no regressions.\n\nThis blindly pushes the BKL into all .open and .release\noperations for all block drivers to prepare for the\nnext step. The drivers can subsequently replace the BKL\nwith their own locks or remove it completely when it can\nbe shown that it is not needed.\n\nThe functions blkdev_get and blkdev_put are the only\nremaining users of the big kernel lock in the block\nlayer, besides a few uses in the ioctl code, none\nof which need to serialize with blkdev_{get,put}.\n\nMost of these two functions is also under the protection\nof bdev-\u003ebd_mutex, including the actual calls to\n-\u003eopen and -\u003erelease, and the common code does not\naccess any global data structures that need the BKL.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "00fff26539bfe3fad21c164fc4002d9ede056fb0", "tree": "4909c8eed03133b1d46f689e465ed1f579b8e282", "parents": [ "afc23068103ccfbf1917eb2a007bc15ab5418cc9" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Sat Jul 03 17:45:40 2010 +0900" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Aug 07 18:24:15 2010 +0200" }, "message": "block: remove q-\u003eprepare_flush_fn completely\n\nThis removes q-\u003eprepare_flush_fn completely (changes the\nblk_queue_ordered API).\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "33659ebbae262228eef4e0fe990f393d1f0ed941", "tree": "fcb537f09359c8dad3a6f6e16dc4319562dc42cc", "parents": [ "7e005f79791dcd58436c88ded4a7f5aed1b82147" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Sat Aug 07 18:17:56 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Aug 07 18:17:56 2010 +0200" }, "message": "block: remove wrappers for request type/flags\n\nRemove all the trivial wrappers for the cmd_type and cmd_flags fields in\nstruct requests. This allows much easier grepping for different request\ntypes instead of unwinding through macros.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "1685e633b396b0f3dabbc9fa5d65dfefe6435250", "tree": "ee83e26e2468ca1518a1b065c690159e12c8def9", "parents": [ "1cfd2bda8c486ae0e7a8005354758ebb68172bca", "127c03cdbad9bd5af5d7f33bd31a1015a90cb77f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 12:25:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 12:25:06 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:\n pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq\n pcmcia: do not request windows if you don\u0027t need to\n pcmcia: insert PCMCIA device resources into resource tree\n pcmcia: export resource information to sysfs\n pcmcia: use struct resource for PCMCIA devices, part 2\n pcmcia: remove memreq_t\n pcmcia: move local definitions out of include/pcmcia/cs.h\n pcmcia: do not use io_req_t when calling pcmcia_request_io()\n pcmcia: do not use io_req_t after call to pcmcia_request_io()\n pcmcia: use struct resource for PCMCIA devices\n pcmcia: clean up cs.h\n pcmcia: use pcmica_{read,write}_config_byte\n pcmcia: remove cs_types.h\n pcmcia: remove unused flag, simplify headers\n pcmcia: remove obsolete CS_EVENT_ definitions\n pcmcia: split up central event handler\n pcmcia: simplify event callback\n pcmcia: remove obsolete ioctl\n\nConflicts in:\n - drivers/staging/comedi/drivers/*\n - drivers/staging/wlags49_h2/wl_cs.c\ndue to dev_info_t and whitespace changes\n" }, { "commit": "2dc11581376829303b98eadb2de253bee065a56a", "tree": "dbce62559c822cd720d1819a50c488bfecdfa945", "parents": [ "fc1caf6eafb30ea185720e29f7f5eccca61ecd60" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Aug 06 09:25:50 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Aug 06 09:25:50 2010 -0600" }, "message": "of/device: Replace struct of_device with struct platform_device\n\nof_device is just an alias for platform_device, so remove it entirely. Also\nreplace to_of_device() with to_platform_device() and update comment blocks.\n\nThis patch was initially generated from the following semantic patch, and then\nedited by hand to pick up the bits that coccinelle didn\u0027t catch.\n\n@@\n@@\n-struct of_device\n+struct platform_device\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nReviewed-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "03c0c29aff7e56b722eb6c47eace222b140d0377", "tree": "47267a19b523159cf36a050ef3c35f4dbdb33016", "parents": [ "c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4", "7fb8f881c54beb05dd4d2c947dada1c636581d87" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 15:57:35 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 15:57:35 2010 -0700" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6: (63 commits)\n of/platform: Register of_platform_drivers with an \"of:\" prefix\n of/address: Clean up function declarations\n of/spi: call of_register_spi_devices() from spi core code\n of: Provide default of_node_to_nid() implementation.\n of/device: Make of_device_make_bus_id() usable by other code.\n of/irq: Fix endian issues in parsing interrupt specifiers\n of: Fix phandle endian issues\n of/flattree: fix of_flat_dt_is_compatible() to match the full compatible string\n of: remove of_default_bus_ids\n of: make of_find_device_by_node generic\n microblaze: remove references to of_device and to_of_device\n sparc: remove references to of_device and to_of_device\n powerpc: remove references to of_device and to_of_device\n of/device: Replace of_device with platform_device in includes and core code\n of/device: Protect against binding of_platform_drivers to non-OF devices\n of: remove asm/of_device.h\n of: remove asm/of_platform.h\n of/platform: remove all of_bus_type and of_platform_bus_type references\n of: Merge of_platform_bus_type with platform_bus_type\n drivercore/of: Add OF style matching to platform bus\n ...\n\nFix up trivial conflicts in arch/microblaze/kernel/Makefile due to just\nsome obj-y removals by the devicetree branch, while the microblaze\nupdates added a new file.\n" }, { "commit": "c3d1f1746b966907ba5ad2f75ddca24db8b21147", "tree": "548a25e104d8bdb906030b8d3bf78fbfde0e5817", "parents": [ "66eddbfcc1f6610fa7c73c8d20a57eaf8e284e2f", "0d365753d0b7c26043fdfa97790411606fb40112" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 08:53:20 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 08:53:20 2010 -0700" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/upstream-linus\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/upstream-linus: (150 commits)\n MIPS: PowerTV: Separate PowerTV USB support from non-USB code\n MIPS: strip the un-needed sections of vmlinuz\n MIPS: Clean up the calculation of VMLINUZ_LOAD_ADDRESS\n MIPS: Clean up arch/mips/boot/compressed/decompress.c\n MIPS: Clean up arch/mips/boot/compressed/ld.script\n MIPS: Unify the suffix of compressed vmlinux.bin\n MIPS: PowerTV: Add Gaia platform definitions.\n MIPS: BCM47xx: Fix nvram_getenv return value.\n MIPS: Octeon: Allow more than 3.75GB of memory with PCIe\n MIPS: Clean up notify_die() usage.\n MIPS: Remove unused task_struct.trap_no field.\n Documentation: Mention that KProbes is supported on MIPS\n SAMPLES: kprobe_example: Make it print something on MIPS.\n MIPS: kprobe: Add support.\n MIPS: Add instrunction format for BREAK and SYSCALL\n MIPS: kprobes: Define regs_return_value()\n MIPS: Ritually kill stupid printk.\n MIPS: Octeon: Disallow MSI-X interrupt and fall back to MSI interrupts.\n MIPS: Octeon: Support 256 MSI on PCIe\n MIPS: Decode core number for R2 CPUs.\n ...\n" }, { "commit": "61bfbdb856879cff583fe53b2ab6ae907faedee7", "tree": "6c7f58f04ea51e0a944f4bd50be597ee223a10a3", "parents": [ "ba01d6ec04f6d1d983101eb527caa96318fc1017" ], "author": { "name": "Lars-Peter Clausen", "email": "lars@metafoo.de", "time": "Thu Jul 15 20:06:04 2010 +0000" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Thu Aug 05 13:26:18 2010 +0100" }, "message": "MMC: Add support for the controller on JZ4740 SoCs.\n\nSigned-off-by: Lars-Peter Clausen \u003clars@metafoo.de\u003e\nAcked-by: Matt Fleming \u003cmatt@console-pimps.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Matt Fleming \u003cmatt@console-pimps.org\u003e\nCc: linux-mmc@vger.kernel.org\nCc: linux-mips@linux-mips.org\nCc: linux-kernel@vger.kernel.org\nPatchwork: https://patchwork.linux-mips.org/patch/1463/\nPatchwork: https://patchwork.linux-mips.org/patch/1523/\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "be82ae0238b0453afcf4a76f0512b7dde34ba500", "tree": "aaa3f5f11fd51fd73365ee1a2164aad9a03de060", "parents": [ "4b4fd27c0b5ec638a1f06ced9226fd95229dbbf0", "7b70c4275f28702b76b273c8534c38f8313812e9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 03 14:31:24 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 03 14:31:24 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: (291 commits)\n ARM: AMBA: Add pclk support to AMBA bus infrastructure\n ARM: 6278/2: fix regression in RealView after the introduction of pclk\n ARM: 6277/1: mach-shmobile: Allow users to select HZ, default to 128\n ARM: 6276/1: mach-shmobile: remove duplicate NR_IRQS_LEGACY\n ARM: 6246/1: mmci: support larger MMCIDATALENGTH register\n ARM: 6245/1: mmci: enable hardware flow control on Ux500 variants\n ARM: 6244/1: mmci: add variant data and default MCICLOCK support\n ARM: 6243/1: mmci: pass power_mode to the translate_vdd callback\n ARM: 6274/1: add global control registers definition header file for nuc900\n mx2_camera: fix type of dma buffer virtual address pointer\n mx2_camera: Add soc_camera support for i.MX25/i.MX27\n arm/imx/gpio: add spinlock protection\n ARM: Add support for the LPC32XX arch\n ARM: LPC32XX: Arch config menu supoport and makefiles\n ARM: LPC32XX: Phytec 3250 platform support\n ARM: LPC32XX: Misc support functions\n ARM: LPC32XX: Serial support code\n ARM: LPC32XX: System suspend support\n ARM: LPC32XX: GPIO, timer, and IRQ drivers\n ARM: LPC32XX: Clock driver\n ...\n" }, { "commit": "7b70c4275f28702b76b273c8534c38f8313812e9", "tree": "1df2229ca02466bd1adda814ac5c37aa0a597db1", "parents": [ "ceb0885d3b01bb2e2f18765770e212914f2864be", "a20df564d15bd28e3df24e1c65b885bd74d23f17" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 14:20:16 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 31 14:20:16 2010 +0100" }, "message": "Merge branch \u0027devel-stable\u0027 into devel\n\nConflicts:\n\tarch/arm/kernel/entry-armv.S\n\tarch/arm/kernel/setup.c\n\tarch/arm/mm/init.c\n" }, { "commit": "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": "74bc80931c8bc34d24545f992a35349ad548897c", "tree": "402cb830059e78812ba32d3aa9245cc82c3a8ca3", "parents": [ "831e8047eb2af310184a9d4d9e749f3de119ae39" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:58:59 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jul 30 23:16:32 2010 +0100" }, "message": "ARM: Fix Versatile/Realview/VExpress MMC card detection sense\n\nThe MMC card detection sense has become really confused with negations\nat various levels, leading to some platforms not detecting inserted\ncards. Fix this by converting everything to positive logic throughout,\nthereby getting rid of these negations.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "ac8b422838046ffc26be4874a3cbae0d313f4209", "tree": "936c8fc9a45ca7a2973c878fc0e20bbae288e5f0", "parents": [ "ce3f9d71bd9c4268698109ad425625a2a8f51e22" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Jul 21 22:38:13 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Jul 30 21:07:39 2010 +0200" }, "message": "pcmcia: remove cs_types.h\n\nRemove cs_types.h which is no longer needed: Most definitions aren\u0027t\nused at all, a few can be made away with, and two remaining definitions\n(typedefs, unfortunatley) may be moved to more specific places.\n\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e (for drivers/bluetooth/)\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "d50f58bbd979e86378dfdec982452041f0e604ef", "tree": "511938033b3346983175c70dd4d0afeb00b59b82", "parents": [ "129961ecaf21c9ee899ad9067d917c1aa172fb7a", "79d3c2c2395a89a70d25f0c77c11afc87efab89b" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:48:37 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:48:37 2010 +0100" }, "message": "Merge branch \u0027for-rmk\u0027 of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable\n" }, { "commit": "08458ef6eede6cf7d5a33c3a7c8bcdc3943012c2", "tree": "c812872f484531e6d7a77ea14e22b7805f5856a4", "parents": [ "4380c14fd77338bac9d1da4dc5dd9f6eb4966c82" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Wed Jul 21 12:55:59 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:40:56 2010 +0100" }, "message": "ARM: 6246/1: mmci: support larger MMCIDATALENGTH register\n\nThe Ux500 variant has a 24-bit MMCIDATALENGTH register, as opposed to\nthe 16-bit one on the ARM version.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "4380c14fd77338bac9d1da4dc5dd9f6eb4966c82", "tree": "1042ee4eec5b78c646fb75f6f8bb71328eb52673", "parents": [ "4956e10903fd3459306dd9438c1e714ba3068a2a" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Wed Jul 21 12:55:18 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:40:32 2010 +0100" }, "message": "ARM: 6245/1: mmci: enable hardware flow control on Ux500 variants\n\nAlthough both the U300 and Ux500 use ST variants, the HWFCEN bits are at\ndifferent positions, so use the variant_data to store the information.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "4956e10903fd3459306dd9438c1e714ba3068a2a", "tree": "2604ac9ef417563c1ef6fc98867d8c88993c256e", "parents": [ "bb8f563c848faa113059973f68c24a3bb6a9585e" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Wed Jul 21 12:54:40 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:39:56 2010 +0100" }, "message": "ARM: 6244/1: mmci: add variant data and default MCICLOCK support\n\nAdd a variant_data structure to handle the differences between the\nvarious variants of this peripheral. Add a first quirk for a default\nMCICLOCK value, required on the Ux500 variant where the enable bit needs\nto be always set, since it controls access to some registers.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "bb8f563c848faa113059973f68c24a3bb6a9585e", "tree": "7ce9952411dd8ba1e9f438a62d586d9078f06212", "parents": [ "f5e2574e734650bbeb801a31cc99e628f9a027af" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Wed Jul 21 12:53:57 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jul 29 15:39:05 2010 +0100" }, "message": "ARM: 6243/1: mmci: pass power_mode to the translate_vdd callback\n\nPlatforms may have some external power control which need to be\ncontrolled from board specific code. Rename the translate_vdd()\ncallback to vdd_handler() and pass it the power mode.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "f5e2574e734650bbeb801a31cc99e628f9a027af", "tree": "e7705dae6e6be70cc7b20129471c2498f9def7ac", "parents": [ "528320db013b687c5f0150fd77eb4dc02ca328d1" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Wed Jul 21 12:50:31 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jul 27 10:48:44 2010 +0100" }, "message": "ARM: 6239/1: mmci: let core poll for card detection\n\nUse the MMC core\u0027s ability to poll for card detection. This also has\nthe advantage of doing the gpio_get_value from a workqueue instead of\ntimer, allowing the gpio to be on a sleeping gpiochip.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "528320db013b687c5f0150fd77eb4dc02ca328d1", "tree": "b41c684bd16c2466f949229d55c2d11b48f61552", "parents": [ "4ce1d6cbf07271ab8f7cc47c3e27edeac08b58a7" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Wed Jul 21 12:49:49 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jul 27 10:48:44 2010 +0100" }, "message": "ARM: 6238/1: mmci: fix multi block transfers\n\nFix the data transfer size to allow multi block transfers to work.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "4ce1d6cbf07271ab8f7cc47c3e27edeac08b58a7", "tree": "ff2c3397828cda8d8455893f336e497bcdd6cb44", "parents": [ "2c39c9e149f45ec15a6985cb06ec8f6d904bb35e" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Wed Jul 21 12:44:58 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jul 27 10:48:44 2010 +0100" }, "message": "ARM: 6237/1: mmci: use sg_miter API to fix multi-page sg handling\n\nThe mmci driver\u0027s SG list iteration logic assumes that each SG entry\nspans only one page, and only maps and flushes one page of the sg. This\nis not a valid assumption. Fix it by converting the driver to the\nsg_miter API, which correctly handles sgs which span multiple pages.\n\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "a7d403cfd1a4c8924874e0f6b600edb7f38684d0", "tree": "7b5ed459d186cf87e287120652bb1167e7b27e08", "parents": [ "d5efe2551e3ea88d9446f0d9d073debbb847f6af" ], "author": { "name": "Eric Bénard", "email": "eric@eukrea.com", "time": "Thu Jun 17 20:59:07 2010 +0200" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jul 26 14:29:21 2010 +0200" }, "message": "mxcmmc: convert to pm_ops and enable/disable clock\n\nSigned-off-by: Eric Bénard \u003ceric@eukrea.com\u003e\nCc: s.hauer@pengutronix.de\nCc: linux-mmc@vger.kernel.org\nCc: linux-arm-kernel@lists.infradead.org\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "2dcf78c0eeae3bd07082821557014f25f02ca2e9", "tree": "8ca5c4c7f35c9a9ab07fcd9732124c905e609aa1", "parents": [ "6b6322676add0fa2713d0ec89a28390fd4d907f5", "5109a4597f7e758b8d20694392d0361a0b4c43b1" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Wed Jun 30 12:16:24 2010 +0200" }, "committer": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Mon Jul 26 14:27:25 2010 +0200" }, "message": "Merge branch \u0027imx/for-2.6.36\u0027 of git://git.pengutronix.de/git/ukl/linux-2.6 into HEAD\n\nThere are some more conflicts than detected by git, namely support for\nthe newly added cpuimx machines needed to be converted to dynamic device\nregistration.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\n\nConflicts:\n\tarch/arm/mach-imx/Makefile\n\tarch/arm/mach-imx/devices.c\n\tarch/arm/mach-imx/devices.h\n\tarch/arm/mach-imx/eukrea_mbimx27-baseboard.c\n\tarch/arm/mach-mx2/Kconfig\n\tarch/arm/mach-mx25/Makefile\n\tarch/arm/mach-mx25/devices.c\n\tarch/arm/plat-mxc/include/mach/mx25.h\n\tarch/arm/plat-mxc/include/mach/mxc_nand.h\n" }, { "commit": "16b3bf8c85a5dc821eea7f9bb48d13b32f42f7ee", "tree": "2b7bf9906b26f1995f9beb8b647704e07c7298d6", "parents": [ "ebfc7e6e13ea61d6f9b3e5353e63f4d185a516b9" ], "author": { "name": "Eric Bénard", "email": "eric@eukrea.com", "time": "Wed May 19 18:46:04 2010 +0200" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jul 26 14:17:46 2010 +0200" }, "message": "mxcmmc: add card detect through DAT3 possibility\n\nSigned-off-by: Eric Bénard \u003ceric@eukrea.com\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "5ffdcd94ea0171cf9a3ca63051c2246426103b5b", "tree": "dfa1522796d5af649caf64ac6e2f1e69119e85d0", "parents": [ "cf40f082f8d3a98e28af02af20d00d2500eb6a65", "b37fa16e78d6f9790462b3181602a26b5af36260" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sun Jul 25 17:52:21 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sun Jul 25 17:52:21 2010 -0600" }, "message": "Merge commit \u0027v2.6.35-rc6\u0027 into spi/test\n" }, { "commit": "4e4f62bf7396fca48efe61513640ee399a6046e3", "tree": "42a503af02d9806bcc05e5fcc2cd53f9bd45b0c2", "parents": [ "9e3288dc9a94fab5ea87db42177d3a9e0345a614", "b37fa16e78d6f9790462b3181602a26b5af36260" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:49:13 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:49:13 2010 -0600" }, "message": "Merge commit \u0027v2.6.35-rc6\u0027 into devicetree/next\n\nConflicts:\n\tarch/sparc/kernel/prom_64.c\n" }, { "commit": "9d51a6b2487724e8713cd2794cf09ffeee5f6932", "tree": "acd827ad096722944daa54b694342876abbcff79", "parents": [ "d45840d9f04be4d8c0288066f37bca3a448f7471" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue Jul 20 13:24:33 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 16:25:41 2010 -0700" }, "message": "sdhci-s3c: add missing remove function\n\nSystem will crash sooner or later once the memory with the code of the\ns3c-sdhci.ko module is reused for something else. I really have no idea\nhow the lack of remove function went unnoticed into the mainline code.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2ffe8c5f323c3b9749bf7bc2375d909d20bdbb15", "tree": "ffbaba1c737fa5da32d9c1a503e58d2896f10be6", "parents": [ "959e85f7751c33d1a2dabc5cc3fe2ed0db7052e5" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jun 08 07:48:19 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Jul 05 16:14:52 2010 -0600" }, "message": "of: refactor of_modalias_node() and remove explicit match table.\n\nThis patch tightens up the behaviour of of_modalias_node() to be more\npredicatable and to eliminate the explicit of_modalias_tablep[] that\nis currently used to override the first entry in the compatible list\nof a device. The override table was needed originally because spi\nand i2c drivers had no way to do of-style matching. Now that all\ndevices can have an of_node pointer, and all drivers can have an\nof_match_table, the explicit override table is no longer needed\nbecause each driver can specify its own OF-style match data.\n\nThe mpc8349emitx-mcu driver is modified to explicitly specify the\ncorrect device to bind against.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "4751c1c74bc7b596db5de0c93be1a22a570145c0", "tree": "4c625f4bc049cfe29e7ff33520bf714c51375a4d", "parents": [ "cf32b71e981ca63e8f349d8585ca2a3583b556e0" ], "author": { "name": "Ernst Schwab", "email": "eschwab@online.de", "time": "Thu Feb 18 12:47:46 2010 +0100" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 03 22:45:36 2010 -0600" }, "message": "spi/mmc_spi: mmc_spi adaptations for SPI bus locking API\n\nModification of the mmc_spi driver to use the SPI bus locking API.\nWith this, the mmc_spi driver can be used together with other SPI\ndevices on the same SPI bus. The exclusive access to the SPI bus is\nnow managed in the SPI layer. The counting of chip selects in the probe\nfunction is no longer needed.\n\nSigned-off-by: Ernst Schwab \u003ceschwab@online.de\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nTested-by: Matt Fleming \u003cmatt@console-pimps.org\u003e\nTested-by: Antonio Ospite \u003cospite@studenti.unina.it\u003e\n" }, { "commit": "08ecfde47534ced67c3c16a15845456e83bd31d1", "tree": "6dbb2bb7b05a5ec0ff1ad3897f621435ecdbcd50", "parents": [ "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Daniel Walker", "email": "dwalker@codeaurora.org", "time": "Wed Jun 23 12:32:20 2010 -0700" }, "committer": { "name": "Daniel Walker", "email": "dwalker@codeaurora.org", "time": "Wed Jun 23 15:11:34 2010 -0700" }, "message": "mmc: msm: fix up build breakage on !PM\n\nwith PM disabled I get the following compile error,\n\ndrivers/built-in.o: In function `msmsdcc_resume\u0027:\nlinux-2.6/drivers/mmc/host/msm_sdcc.c:1352: undefined reference to `mmc_resume_host\u0027\ndrivers/built-in.o: In function `msmsdcc_suspend\u0027:\nlinux-2.6/drivers/mmc/host/msm_sdcc.c:1330: undefined reference to `mmc_suspend_host\u0027\n\nThis adds ifdefs around the suspend/resume functions to prevent this.\n\nSigned-off-by: Daniel Walker \u003cdwalker@codeaurora.org\u003e\n" }, { "commit": "f3d56144c86beb25c7d206efa66d6efba908371c", "tree": "f24757410e6c04537f9bc057fab0af8cb8fb2d5c", "parents": [ "6d7b7d578f2c182f77ab6dd1c375f848f38ea1a6" ], "author": { "name": "Daniel Walker", "email": "dwalker@codeaurora.org", "time": "Mon May 24 10:15:00 2010 -0700" }, "committer": { "name": "Daniel Walker", "email": "dwalker@codeaurora.org", "time": "Wed Jun 09 08:51:31 2010 -0700" }, "message": "mmc: msm: fix compile error on MSM7x30\n\nMSM7x30 isn\u0027t supported in this driver yet. If ones tried to compile it in\nwith MSM7x30 configure you get,\n\nlinux-2.6/drivers/mmc/host/msm_sdcc.c: In function \u0027msmsdcc_fifo_addr\u0027:\nlinux-2.6/drivers/mmc/host/msm_sdcc.c:165: error: \u0027MSM_SDC1_PHYS\u0027 undeclared (first use in this function)\nlinux-2.6/drivers/mmc/host/msm_sdcc.c:165: error: (Each undeclared identifier is reported only once\nlinux-2.6/drivers/mmc/host/msm_sdcc.c:165: error: for each function it appears in.)\nlinux-2.6/drivers/mmc/host/msm_sdcc.c:167: error: \u0027MSM_SDC2_PHYS\u0027 undeclared (first use in this function)\nlinux-2.6/drivers/mmc/host/msm_sdcc.c:169: error: \u0027MSM_SDC3_PHYS\u0027 undeclared (first use in this function)\nlinux-2.6/drivers/mmc/host/msm_sdcc.c:171: error: \u0027MSM_SDC4_PHYS\u0027 undeclared (first use in this function)\n\nSo we add a Kconfig check to prevent this.\n\nSigned-off-by: Daniel Walker \u003cdwalker@codeaurora.org\u003e\n" }, { "commit": "999fd1ab344dabd9c985b638bf4c29495b8e4619", "tree": "b4a238aafc79caa085e469ee28ab61301ca17f8f", "parents": [ "9a9620db07b27700a4de9e86985735fffb78e2f8", "ac422f9443191e050c16fe99baeb5c3d74934589" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 04 15:42:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 04 15:42:09 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits)\n sh: Make intc messages consistent via pr_fmt.\n sh: make sure static declaration on ms7724se\n sh: make sure static declaration on mach-migor\n sh: make sure static declaration on mach-ecovec24\n sh: make sure static declaration on mach-ap325rxa\n clocksource: sh_cmt: compute mult and shift before registration\n clocksource: sh_tmu: compute mult and shift before registration\n sh: PIO disabling for x3proto and urquell.\n sh: mach-sdk7786: conditionally disable PIO support.\n sh: support for platforms without PIO.\n usb: r8a66597-hcd pio to mmio accessor conversion.\n usb: gadget: r8a66597-udc pio to mmio accessor conversion.\n usb: gadget: m66592-udc pio to mmio accessor conversion.\n sh: add romImage MMCIF boot for sh7724 and Ecovec V2\n sh: add boot code to MMCIF driver header\n sh: prepare MMCIF driver header file\n sh: allow romImage data between head.S and the zero page\n sh: Add support MMCIF for ecovec\n sh: remove duplicated #include\n input: serio: disable i8042 for non-cayman sh platforms.\n ...\n" }, { "commit": "683eb94777c3c67b9b258765b9cb03641344c418", "tree": "c2983f24bef55dce6719e910ae05bfb07ec993f9", "parents": [ "bb21c7ce18eff8e6e7877ca1d06c6db719376e3c" ], "author": { "name": "Cory Maccarrone", "email": "darkstar6262@gmail.com", "time": "Fri Jun 04 14:15:07 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 04 15:21:45 2010 -0700" }, "message": "omap: remove BUG_ON for disabled interrupts\n\nRemove a BUG_ON for when interrupts are disabled during an MMC request.\n\nDuring boot, interrupts can be disabled when a request is made, causing\nthis bug to be triggered. In reality, there\u0027s no reason this should halt\nthe kernel, as the driver has proved reliable in spite of disabled\ninterrupts, and additionally, there\u0027s nothing in this code that would\nrequire interrupts to be enabled.\n\nThe only setup I\u0027ve managed to make it trigger on is on the HTC Herald\nduring bootup when the driver is built into the kernel (mostly because\nthat\u0027s all I have). I believe it\u0027s related to the fact that on bootup I\nget many timeout errors on \"CMD5\" while initializing the card. Each CMD5\ntimeout triggers that bug (I changed it to a WARN_ON to get it to boot in)\ndue to the fact that part of the timeout code involves sending the request\nagain. With interrupts turned off, that BUG would be triggered.\n\nSigned-off-by: Cory Maccarrone \u003cdarkstar6262@gmail.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "487d9fc5016529d7d77dfe35b666fd3a090e2953", "tree": "2cfcd7ed5bcbd6d8768f233770382a1378292f84", "parents": [ "b34bce45530ca897aea35915e0e42eb3c8047b52" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Tue May 18 14:42:51 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon May 31 13:11:41 2010 +0900" }, "message": "sh: prepare MMCIF driver header file\n\nUpdate the MMCIF driver to include register information\nand register access functions in the header file.\nThe MMCIF boot code builds on top of this.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "dc0fd7b56141999832a6bccda2f7e9765f0bc087", "tree": "fbd92ad8910f41865909d04198011492266b0752", "parents": [ "c63b3cba4f47ef9f4b3f952b4f923cf341d250ac" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Wed May 26 14:42:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "drivers/mmc/host: use ERR_CAST\n\nUse ERR_CAST(x) rather than ERR_PTR(PTR_ERR(x)). The former makes more\nclear what is the purpose of the operation, which otherwise looks like a\nno-op.\n\nThe semantic patch that makes this change is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\ntype T;\nT x;\nidentifier f;\n@@\n\nT f (...) { \u003c+...\n- ERR_PTR(PTR_ERR(x))\n+ x\n ...+\u003e }\n\n@@\nexpression x;\n@@\n\n- ERR_PTR(PTR_ERR(x))\n+ ERR_CAST(x)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c63b3cba4f47ef9f4b3f952b4f923cf341d250ac", "tree": "dc472d6c93cd7878609752ebe74476b0701e0d96", "parents": [ "6c1f716e8154ee9315534782b9b1eedea0559a24" ], "author": { "name": "Viresh KUMAR", "email": "viresh.kumar@st.com", "time": "Wed May 26 14:42:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "sdhci-spear: ST SPEAr based SDHCI controller glue\n\nAdd a glue layer to support the sdhci driver on the ST SPEAr platform.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nCc: \u003cshiraz.hashim@st.com\u003e\nCc: Linus Walleij \u003clinus.ml.walleij@gmail.com\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6c1f716e8154ee9315534782b9b1eedea0559a24", "tree": "a30bf84dddede683fee5a46d2468b8f02e67a0cb", "parents": [ "1a13f8fa76c880be41d6b1e6a2b44404bcbfdf9e" ], "author": { "name": "Grazvydas Ignotas", "email": "notasas@gmail.com", "time": "Wed May 26 14:42:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "sdio: add new function for RAW (Read after Write) operation\n\nSDIO specification allows RAW (Read after Write) operation using\nIO_RW_DIRECT command (CMD52) by setting the RAW bit. This operation is\nsimilar to ordinary read/write commands, except that both write and read\nare performed using single command/response pair. The Linux SDIO layer\nalready supports this internaly, only external function is missing for\ndrivers to make use, which is added by this patch.\n\nThis type of command is required to implement proper power save mode\nsupport in wl1251 wifi driver.\n\nAndroid has similar patch for G1 in it\u0027s tree for the same reason:\n\nhttp://android.git.kernel.org/?p\u003dkernel/common.git;a\u003dcommitdiff;h\u003d74a47786f6ecbe6c1cf9fb15efe6a968451deb52\n\nSigned-off-by: Grazvydas Ignotas \u003cnotasas@gmail.com\u003e\nAcked-by: Kalle Valo \u003ckalle.valo@iki.fi\u003e\nCc: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1a13f8fa76c880be41d6b1e6a2b44404bcbfdf9e", "tree": "3b4239740ca22d19780d05da92cdd203828ea17f", "parents": [ "a791daa15305e7e549a418ef0ae6bc4b4580066e" ], "author": { "name": "Matt Fleming", "email": "matt@console-pimps.org", "time": "Wed May 26 14:42:08 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "mmc: remove the \"state\" argument to mmc_suspend_host()\n\nEven though many mmc host drivers pass a pm_message_t argument to\nmmc_suspend_host() that argument isn\u0027t used the by MMC core. As host\ndrivers are converted to dev_pm_ops they\u0027ll have to construct\npm_message_t\u0027s (as they won\u0027t be passed by the PM subsystem any more) just\nto appease the mmc suspend interface.\n\nWe might as well just delete the unused paramter.\n\nSigned-off-by: Matt Fleming \u003cmatt@console-pimps.org\u003e\nAcked-by: Anton Vorontsov \u003ccbouatmailru@gmail.com\u003e\nAcked-by: Michal Miroslaw \u003cmirq-linux@rere.qmqm.pl\u003eZZ\nAcked-by: Sascha Sommer \u003csaschasommer@freenet.de\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a791daa15305e7e549a418ef0ae6bc4b4580066e", "tree": "ba85b141bc4ca93cc151449964ce4f903b110c93", "parents": [ "b417577d3b9bbb06a4ddc9aa955af9bd503f7242" ], "author": { "name": "Kevin Hilman", "email": "khilman@deeprootsystems.com", "time": "Wed May 26 14:42:07 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "mmc: OMAP HS-MMC: convert to dev_pm_ops\n\nConvert PM operations to use dev_pm_ops. This will facilitate the runtime\nPM coversion which will add to dev_pm_ops hooks.\n\nNote that dev_pm_ops version of the suspend hook no longer takes a \u0027state\u0027\nargument. However, the MMC core function mmc_suspend_host() still takes a\n\u0027state\u0027 argument, but it is unused, so a dummy state variable was created\nto pass to the MMC core.\n\nIn the future, the MMC core should be converted to drop this state\nargument and the rest of the MMC drivers could be easily converted to\ndev_pm_ops as well.\n\nSigned-off-by: Kevin Hilman \u003ckhilman@deeprootsystems.com\u003e\nCc: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nCc: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nCc: Matt Fleming \u003cmatt@console-pimps.org\u003e\nCc: Tony Lindgren \u003ctony@atomide.com\u003e\nCc: Denis Karpov \u003cext-denis.2.karpov@nokia.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b417577d3b9bbb06a4ddc9aa955af9bd503f7242", "tree": "32ff825e6d4ee925eff02932b2954a449b060e56", "parents": [ "14c5aa6d3797c6b3d09193a8423472847f738526" ], "author": { "name": "Adrian Hunter", "email": "adrian.hunter@nokia.com", "time": "Wed May 26 14:42:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "omap_hsmmc: improve interrupt synchronisation\n\nThe following changes were needed:\n\t- do not use in_interrupt() because it will not work\n\twith threaded interrupts\n\nIn addition, the following improvements were made:\n\t- ensure DMA is unmapped only after the final DMA interrupt\n\t- ensure a request is completed only after the final DMA interrupt\n\t- disable controller interrupts when a request is not in progress\n\t- remove the spin-lock protecting the start of a new request from\n\tan unexpected interrupt because the locking was complicated and\n\ta \u0027req_in_progress\u0027 flag suffices (since the spin-lock only defers\n\tthe unexpected interrupts anyway)\n\t- instead use the spin-lock to protect the MMC interrupt handler\n\tfrom the DMA interrupt handler\n\t- remove the semaphore preventing DMA from being started while\n\tthe previous DMA is still in progress - the other changes make that\n\timpossible, so it is now a BUG_ON condition\n\t- ensure the controller interrupt status is clear before exiting\n\tthe interrrupt handler\n\nIn general, these changes make the code safer but do not fix any specific\nbugs so backporting is not necessary.\n\nSigned-off-by: Adrian Hunter \u003cadrian.hunter@nokia.com\u003e\nTested-by: Venkatraman S \u003csvenkatr@ti.com\u003e\nAcked-by: Madhusudhan Chikkature \u003cmadhu.cr@ti.com\u003e\nAcked-by: Tony Lindgren \u003ctony@atomide.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "14c5aa6d3797c6b3d09193a8423472847f738526", "tree": "3263f14d77b515e492e9c3e0f112b0606fae98d6", "parents": [ "b2e75eff5e859d0c294e7405958362b26a423c6e" ], "author": { "name": "Maurus Cuelenaere", "email": "mcuelenaere@gmail.com", "time": "Wed May 26 14:42:05 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "sdhci: enable multiblock transfers in sdhci-s3c\n\nWifi over SDIO doesn\u0027t work correctly without multiblock, so enable this.\nThis patch depends on the following patches:\n\nSigned-off-by: Maurus Cuelenaere \u003cmcuelenaere@gmail.com\u003e\nCc: Thomas Abraham \u003cthomas.ab@samsung.com\u003e\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b2e75eff5e859d0c294e7405958362b26a423c6e", "tree": "23616cc22cc08caf87b1fd3e3fff09ef03bff6ce", "parents": [ "70764a905785ebacc8d44fed7a12fba3db267ae6" ], "author": { "name": "Thomas Abraham", "email": "thomas.ab@samsung.com", "time": "Wed May 26 14:42:05 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "mmc: s3c6410: enable ADMA feature in 6410 sdhci controller\n\nEnable the ADMA feature in the 6410 SDHCI controller driver.\n\nSigned-off-by: Maurus Cuelenaere \u003cmcuelenaere@gmail.com\u003e\nSigned-off-by: Thomas Abraham \u003cthomas.ab@samsung.com\u003e\nAcked-by: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "70764a905785ebacc8d44fed7a12fba3db267ae6", "tree": "0d4fbf97f88182a8679af78d9de9b20f1b3916d0", "parents": [ "dc297c92e6e63af5cbd7e7d2f377247f5664a378" ], "author": { "name": "Thomas Abraham", "email": "thomas.ab@samsung.com", "time": "Wed May 26 14:42:04 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "mmc: s3c6410: add new quirk in sdhci driver and update ADMA descriptor build\n\nThe s3c6410 sdhci controller does not support the \u0027End\u0027 attribute and NOP\nattribute in the same 8-Byte ADMA descriptor. This patch adds a new quirk\nto identify sdhci host contollers with such behaviour. In addition to\nthis, for controllers using the new quirk, the last entry in the ADMA\ndescritor table is marked with the \u0027End\u0027 attribute (instead of using a NOP\ndescriptor with \u0027End\u0027 attribute).\n\nSigned-off-by: Maurus Cuelenaere \u003cmcuelenaere@gmail.com\u003e\nSigned-off-by: Thomas Abraham \u003cthomas.ab@samsung.com\u003e\nAcked-by: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dc297c92e6e63af5cbd7e7d2f377247f5664a378", "tree": "b84dd2a7f835a1922ffb18965277bba84c914bb0", "parents": [ "a751a7d69fe91e4640884ae02fe44ddceb7f4cd8" ], "author": { "name": "Matt Fleming", "email": "matt@console-pimps.org", "time": "Wed May 26 14:42:03 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:40 2010 -0700" }, "message": "sdhci: build fix: rename SDHCI I/O accessor functions\n\nUnfortunately some architectures #define their read{b,w,l} and\nwrite{b,w,l} I/O accessors which makes the SDHCI I/O accessor functions of\nthe same names subject to preprocessing. This leads to the following\ncompiler error,\n\nIn file included from drivers/mmc/host/sdhci.c:26:\ndrivers/mmc/host/sdhci.h:318:35: error: macro \"writel\" passed 3 arguments, but takes just 2\n\nRename the SDHCI I/O functions so that CONFIG_MMC_SDHCI_IO_ACCESSORS can\nbe enabled for architectures that implement their read{b,w,l} and\nwrite{b,w,l} functions with macros.\n\nSigned-off-by: Matt Fleming \u003cmatt@console-pimps.org\u003e\nCc: Zhangfei Gao \u003czgao6@marvell.com\u003e\nAcked-by: Anton Vorontsov \u003ccbouatmailru@gmail.com\u003e\nAcked-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a751a7d69fe91e4640884ae02fe44ddceb7f4cd8", "tree": "298370106b5e85f3bba283c8a85e998dac5145d2", "parents": [ "88ff82ed4ff048c5548db9313b3de327c91234f8" ], "author": { "name": "Zhangfei Gao", "email": "zgao6@marvell.com", "time": "Wed May 26 14:42:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:39 2010 -0700" }, "message": "mmc: SDHCI_INT_DATA_MASK typo error\n\nSigned-off-by: Zhangfei Gao \u003czgao6@marvell.com\u003e\nReviewed-by: Matt Fleming \u003cmatt@console-pimps.org\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "88ff82ed4ff048c5548db9313b3de327c91234f8", "tree": "410aad3f7b8ad92983c64982f0dc5d2f6fefb6d5", "parents": [ "fdc50a9444b9781f4dd5aa5f7453300d2688cc5f" ], "author": { "name": "Anders Grahn", "email": "anders.grahn@hd-wireless.se", "time": "Wed May 26 14:42:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:39 2010 -0700" }, "message": "mmc: atmel-mci: Add support for SDIO interrupts\n\nAtmel-mci support for SDIO interrupts. This adds the enable_sdio_irq()\nfunction and the configuration of sdio irq mask per slot. With this irq\nmask information, we keep the idea of multiple slot per sd/mmc host (not\nonly A and B). MMC_CAP_SDIO_IRQ is added according to slot configuration.\n\nA new little function is added to run mmc_signal_sdio_irq() during\ninterrupt handling routine.\n\nSigned-off-by: Anders Grahn \u003canders.grahn@hd-wireless.se\u003e\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@atmel.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fdc50a9444b9781f4dd5aa5f7453300d2688cc5f", "tree": "d1e1e29c06ec03ecb3b217dfcdfb49f0a5eb30e2", "parents": [ "99ddffd8ef84c0389e31cb4b90d9e5415ea19cb0" ], "author": { "name": "Yusuke Goda", "email": "yusuke.goda.sx@renesas.com", "time": "Wed May 26 14:41:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:39 2010 -0700" }, "message": "mmc: add support MMCIF for SuperH\n\nMMCIF is the MMC Host Interface in SuperH.\n\nSigned-off-by: Yusuke Goda \u003cyusuke.goda.sx@renesas.com\u003e\nCc: Ben Hutchings \u003cben@decadent.org.uk\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Magnus Damm \u003cmagnus.damm@gmail.com\u003e\nCc: \u003clinux-mmc@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" } ], "next": "99ddffd8ef84c0389e31cb4b90d9e5415ea19cb0" }