)]}' { "log": [ { "commit": "fbae3fb1546e199ab0cd185348f8124411a1ca9d", "tree": "928881dc419348268cbc8208a41fe0d038035114", "parents": [ "35bfc353dcaecc99c277e3646564f3f785760bde" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Thu Jun 03 11:33:58 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Thu Jun 03 11:33:58 2010 +0200" }, "message": "i2c: Remove all i2c_set_clientdata(client, NULL) in drivers\n\nI2C drivers can use the clientdata-pointer to point to private data. As I2C\ndevices are not really unregistered, but merely detached from their driver, it\nused to be the drivers obligation to clear this pointer during remove() or a\nfailed probe(). As a couple of drivers forgot to do this, it was agreed that it\nwas cleaner if the i2c-core does this clearance when appropriate, as there is\nno guarantee for the lifetime of the clientdata-pointer after remove() anyhow.\nThis feature was added to the core with commit\ne4a7b9b04de15f6b63da5ccdd373ffa3057a3681 to fix the faulty drivers.\n\nAs there is no need anymore to clear the clientdata-pointer, remove all current\noccurrences in the drivers to simplify the code and prevent confusion.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nAcked-by: Richard Purdie \u003crpurdie@linux.intel.com\u003e\nAcked-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "cf9b59e9d3e008591d1f54830f570982bb307a0d", "tree": "113478ce8fd8c832ba726ffdf59b82cb46356476", "parents": [ "44504b2bebf8b5823c59484e73096a7d6574471d", "f4b87dee923342505e1ddba8d34ce9de33e75050" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "message": "Merge remote branch \u0027origin\u0027 into secretlab/next-devicetree\n\nMerging in current state of Linus\u0027 tree to deal with merge conflicts and\nbuild failures in vio.c after merge.\n\nConflicts:\n\tdrivers/i2c/busses/i2c-cpm.c\n\tdrivers/i2c/busses/i2c-mpc.c\n\tdrivers/net/gianfar.c\n\nAlso fixed up one line in arch/powerpc/kernel/vio.c to use the\ncorrect node pointer.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "4018294b53d1dae026880e45f174c1cc63b5d435", "tree": "6db3538eaf91b653381720a6d92f4f15634a93d0", "parents": [ "597b9d1e44e9ba69f2454a5318bbe7a6d5e6930a" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:13:02 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:10:40 2010 -0600" }, "message": "of: Remove duplicate fields from of_platform_driver\n\n.name, .match_table and .owner are duplicated in both of_platform_driver\nand device_driver. This patch is a removes the extra copies from struct\nof_platform_driver and converts all users to the device_driver members.\n\nThis patch is a pretty mechanical change. The usage model doesn\u0027t change\nand if any drivers have been missed, or if anything has been fixed up\nincorrectly, then it will fail with a compile time error, and the fixup\nwill be trivial. This patch looks big and scary because it touches so\nmany files, but it should be pretty safe.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Sean MacLennan \u003csmaclennan@pikatech.com\u003e\n\n" }, { "commit": "05ec7dd8dd5aa42c22a49682e4a51cadd4166b7e", "tree": "6370b43c0d8f324aa7421bbb5a647aa04ab5d747", "parents": [ "c316ba3b518bc35ce5aef5421135220389f4eb98", "8046112818b70329e930b1d4557ef0876c1ad2bb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 07:25:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 07:25:43 2010 -0700" }, "message": "Merge git://git.infradead.org/mtd-2.6\n\n* git://git.infradead.org/mtd-2.6: (154 commits)\n mtd: cfi_cmdset_0002: use AMD standard command-set with Winbond flash chips\n mtd: cfi_cmdset_0002: Fix MODULE_ALIAS and linkage for new 0701 commandset ID\n mtd: mxc_nand: Remove duplicate NAND_CMD_RESET case value\n mtd: update gfp/slab.h includes\n jffs2: Stop triggering block erases from jffs2_write_super()\n jffs2: Rename jffs2_erase_pending_trigger() to jffs2_dirty_trigger()\n jffs2: Use jffs2_garbage_collect_trigger() to trigger pending erases\n jffs2: Require jffs2_garbage_collect_trigger() to be called with lock held\n jffs2: Wake GC thread when there are blocks to be erased\n jffs2: Erase pending blocks in GC pass, avoid invalid -EIO return\n jffs2: Add \u0027work_done\u0027 return value from jffs2_erase_pending_blocks()\n mtd: mtdchar: Do not corrupt backing device of device node inode\n mtd/maps/pcmciamtd: Fix printk format for ssize_t in debug messages\n drivers/mtd: Use kmemdup\n mtd: cfi_cmdset_0002: Fix argument order in bootloc warning\n mtd: nand: add Toshiba TC58NVG0 device ID\n pcmciamtd: add another ID\n pcmciamtd: coding style cleanups\n pcmciamtd: fixing obvious errors\n mtd: chips: add SST39WF160x NOR-flashes\n ...\n\nTrivial conflicts due to dev_node removal in drivers/mtd/maps/pcmciamtd.c\n" }, { "commit": "61c7a080a5a061c976988fd4b844dfb468dda255", "tree": "8cb492b73f2755c38a6164d770da34d5af6486a0", "parents": [ "d12d42f744f805a9ccc33cd76f04b237cd83ce56" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:12:29 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue May 18 16:10:44 2010 -0600" }, "message": "of: Always use \u0027struct device.of_node\u0027 to get device node pointer.\n\nThe following structure elements duplicate the information in\n\u0027struct device.of_node\u0027 and so are being eliminated. This patch\nmakes all readers of these elements use device.of_node instead.\n\n(struct of_device *)-\u003enode\n(struct dev_archdata *)-\u003eprom_node (sparc)\n(struct dev_archdata *)-\u003eof_node (powerpc \u0026 microblaze)\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "11c93605faecfe6f9a28a6f3d14989bad077055a", "tree": "33c0b9dc50b786f2731198c75b6cc083f3c78301", "parents": [ "d80f2666b5373f195deae57c9f33a5abb8053d37" ], "author": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon May 17 06:55:24 2010 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon May 17 07:01:41 2010 +0100" }, "message": "mtd/maps/pcmciamtd: Fix printk format for ssize_t in debug messages\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "b2321ac37a16f0d6bdbcd2d20263e8b8b943c0ea", "tree": "94e51ccbca0906893ab4eadf8f46f36fedc886ef", "parents": [ "9bdde162ebcc0237e722e8c3d0d376e35188a98f" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Thu May 13 12:00:01 2010 +0200" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri May 14 03:23:40 2010 +0100" }, "message": "pcmciamtd: add another ID\n\nReported-by: Komuro \u003ckomurojun-mbn@nifty.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "9bdde162ebcc0237e722e8c3d0d376e35188a98f", "tree": "39143125e5e84ed8e3e5825824484d95a378a2b4", "parents": [ "f6763c98cb2175a816936f9b125d40054a27c185" ], "author": { "name": "Alexander Kurz", "email": "linux@blala.de", "time": "Thu May 13 12:00:00 2010 +0200" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri May 14 03:23:33 2010 +0100" }, "message": "pcmciamtd: coding style cleanups\n\nSigned-off-by: Alexander Kurz \u003clinux@kbdbabel.org\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "f6763c98cb2175a816936f9b125d40054a27c185", "tree": "015247e7d72fec7dc35d762d1bc00c55b0b51fd6", "parents": [ "087acaf1c6812d0ff4d4cb79c6f5a0e4e63815b3" ], "author": { "name": "Alexander Kurz", "email": "linux@blala.de", "time": "Thu May 13 11:59:59 2010 +0200" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri May 14 03:23:01 2010 +0100" }, "message": "pcmciamtd: fixing obvious errors\n\nAfter fixing the obvious errors, the driver will now compile\nagain on v2.6.34-rc3. First tests with two 4MB flash cards including\nerase- and write test with one of the cards where successful.\n\nAlso, add two new PCMCIA_DEVICE_PROD_IDs.\n\n[linux@dominikbrodowski.net: clean up commit message]\nSigned-off-by: Alexander Kurz \u003clinux@kbdbabel.org\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "9d5da3a9b849cf42fc165e90b1d39e2fd1e199a8", "tree": "f1d66bb84b510f8ba53e232e9b5d9499a1bd20a3", "parents": [ "2bfefa4c9632fb09bfe3277cf7b690818b147654" ], "author": { "name": "Jason Gunthorpe", "email": "jgunthorpe@obsidianresearch.com", "time": "Tue Mar 09 12:27:56 2010 -0700" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri May 14 00:32:30 2010 +0100" }, "message": "mtd: extend physmap_of to let the device tree specify the parition probe\n\nThis is to support custom partitioning schemes for embedded PPC. To use\ndefine your own mtd_part_parser and then add something like:\n linux,part-probe \u003d \"my_probe\", \"cmdlinepart\";\nTo the board\u0027s dts file.\n\nIf linux,part-probe is not specified then this behaves the same as before.\n\nSigned-off-by: Jason Gunthorpe \u003cjgunthorpe@obsidianresearch.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "2bfefa4c9632fb09bfe3277cf7b690818b147654", "tree": "9ddbd55e57e266dfea47e38fa007f47731fed8fb", "parents": [ "ecce2a6f9bdc7635838baeff8a09a76c9a70e7e0" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Thu May 13 22:03:15 2010 +0200" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Thu May 13 21:23:06 2010 +0100" }, "message": "drivers/mtd: Use kzalloc\n\nUse kzalloc rather than the combination of kmalloc and memset.\n\nThe semantic patch that makes this change is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression x,size,flags;\nstatement S;\n@@\n\n-x \u003d kmalloc(size,flags);\n+x \u003d kzalloc(size,flags);\n if (x \u003d\u003d NULL) S\n-memset(x, 0, size);\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "0ae28a35bcb7984838acbf28bfba9c030f8b74f0", "tree": "4f449d929b5df9e126e839f388ff0fd2b52028a0", "parents": [ "6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5", "b57f95a38233a2e73b679bea4a5453a1cc2a1cc9" ], "author": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon May 10 14:32:46 2010 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon May 10 14:32:46 2010 +0100" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n\nConflicts:\n\tdrivers/mtd/mtdcore.c\n\nPull in the bdi fixes and ARM platform changes that other outstanding\npatches depend on.\n" }, { "commit": "258006d1abcf3f2990d3ebd77d75af335ff24d81", "tree": "80d44a8767e365c33a247f63a9365cfcac05cbb6", "parents": [ "c4e773764cead9358fd4b036d1b883fff3968513" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Fri Apr 02 14:47:38 2010 +0200" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon May 10 14:22:55 2010 +0100" }, "message": "mtd: maps: Eliminate use after free\n\nMoved the debugging message before the call to map_destroy, which frees its\nargument. The message is also slightly changed to reflect its new\nposition.\n\nA simplified version of the semantic patch that finds this problem is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression E,E2;\n@@\n\ndel_mtd_device(E)\n...\n(\n E \u003d E2\n|\n* E\n)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "317b6d63000b3cc48c43d582d76063500e531a6c", "tree": "5b2ff9482257a8b4f4dc47156090e4c760c2b9bd", "parents": [ "b1577190e7cd259b5fc4846305f31cba9633f31e" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Mar 20 19:26:51 2010 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Mon May 10 10:23:14 2010 +0200" }, "message": "pcmcia: dev_node removal (write-only drivers)\n\ndev_node_t was only used to transport some minor/major numbers\nfrom the PCMCIA device drivers to deprecated userspace helpers.\nHowever, only a few drivers made use of it, and the userspace\nhelpers are deprecated anyways. Therefore, get rid of dev_node_t .\n\nAs a first step, remove any usage of dev_node_t from drivers which\nonly wrote to this typedef/struct, but did not make use of it.\n\nCC: linux-bluetooth@vger.kernel.org\nCC: Harald Welte \u003claforge@gnumonks.org\u003e\nCC: linux-mtd@lists.infradead.org\nCC: linux-wireless@vger.kernel.org\nCC: netdev@vger.kernel.org\nCC: linux-serial@vger.kernel.org\nCC: alsa-devel@alsa-project.org\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "1ca5d2f0196cfca678086fa6f88eec4f9d0307ee", "tree": "2d867897b6c6c88e912b60ca98ff06aaf98f1642", "parents": [ "fed457a83611182f5a2e049cce02f8f4e1b65644" ], "author": { "name": "H Hartley Sweeten", "email": "hartleys@visionengravers.com", "time": "Fri Apr 02 17:46:30 2010 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Tue Apr 20 08:53:52 2010 +0100" }, "message": "mtd/maps/physmap: catch failure to register MTD_PHYSMAP_COMPAT device\n\nIf the default Kconfig values are used with MTD_PHYSMAP_COMPAT you end\nup with a resource where end \u003c start. This causes __request_resource to\nreturn a conflict which then returns an -EBUSY error code. The current\nphysmap.c code just assumes that the platfom_device_register will always\nsucceed.\n\nCatch this failure during the physmap_init and propogate the error.\n\nSigned-off-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nReported-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "329f9052dbadf6f4afe2231668bd00c579a4aa10", "tree": "e080a5c70df40f3ae8cf28a95a3267757668ab97", "parents": [ "395b228858778d3c44f7c413693a6acaa8bb62dc", "220bf991b0366cc50a94feede3d7341fa5710ee4" ], "author": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri Mar 26 14:55:59 2010 +0000" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri Mar 26 14:55:59 2010 +0000" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n\nConflicts:\n\tdrivers/mtd/nand/sh_flctl.c\n\nMaxim\u0027s patch to initialise sysfs attributes depends on the patch which\nactually adds sysfs_attr_init().\n" }, { "commit": "395b228858778d3c44f7c413693a6acaa8bb62dc", "tree": "89abea4e16319b41452217f49a20a810d30b50c5", "parents": [ "4d682420cead1ce06d8cd44ae193414404f0e7f5" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Sat Mar 20 15:31:46 2010 +0000" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sun Mar 21 08:28:34 2010 +0000" }, "message": "mtd/maps/pismo: remove dangling pointer and a leak\n\nWhile looking for drivers which forgot to clear i2c_clientdata before freeing\nthe data structure it points to, I found that the pismo driver even has a leak\non the probe error path.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "17cf4442497cb2551eae1dedee638515db47c23e", "tree": "5f1738dbba192040ad870a4b830ef790c847374b", "parents": [ "39710479303fd3affb3e204e9a7a75cc676977b5" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Fri Mar 19 14:25:45 2010 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Fri Mar 19 14:25:45 2010 -0400" }, "message": "Delete zero-length file drivers/mtd/maps/omap_nor.c\n\nThe content was deleted in cc87edb173effdf74e680ee6d622a935ff0c1d6f,\nbut the file remained as a zero-length file.\n\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "c32da02342b7521df25fefc2ef20aee0e61cf887", "tree": "7e38f664fa3e13602c357d37f77d8adcf82fccc2", "parents": [ "dca1d9f6d7ae428c193f32bd3e9a4ca13176648b", "318ae2edc3b29216abd8a2510f3f80b764f06858" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 16:04:50 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 16:04:50 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits)\n doc: fix typo in comment explaining rb_tree usage\n Remove fs/ntfs/ChangeLog\n doc: fix console doc typo\n doc: cpuset: Update the cpuset flag file\n Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed\n Remove drivers/parport/ChangeLog\n Remove drivers/char/ChangeLog\n doc: typo - Table 1-2 should refer to \"status\", not \"statm\"\n tree-wide: fix typos \"ass?o[sc]iac?te\" -\u003e \"associate\" in comments\n No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h\n devres/irq: Fix devm_irq_match comment\n Remove reference to kthread_create_on_cpu\n tree-wide: Assorted spelling fixes\n tree-wide: fix \u0027lenght\u0027 typo in comments and code\n drm/kms: fix spelling in error message\n doc: capitalization and other minor fixes in pnp doc\n devres: typo fix s/dev/devm/\n Remove redundant trailing semicolons from macros\n fix typo \"definetly\" -\u003e \"definitely\" in comment\n tree-wide: s/widht/width/g typo in comments\n ...\n\nFix trivial conflict in Documentation/laptops/00-INDEX\n" }, { "commit": "91e013827c0bcbb187ecf02213c5446b6f62d445", "tree": "52ad3d0db856c50ab3a1a56da2bf3ae6ed8a8f48", "parents": [ "988addf82e4c03739375279de73929580a2d4a6a", "8d2b09f5b0de2c0e37f50d04980bc81098988239" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Mar 08 20:24:11 2010 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Mar 08 20:24:11 2010 +0000" }, "message": "Merge branch \u0027master\u0027 into for-linus\n" }, { "commit": "318ae2edc3b29216abd8a2510f3f80b764f06858", "tree": "ce595adde342f57f379d277b25e4dd206988a052", "parents": [ "25cf84cf377c0aae5dbcf937ea89bc7893db5176", "3e58974027b04e84f68b964ef368a6cd758e2f84" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "message": "Merge branch \u0027for-next\u0027 into for-linus\n\nConflicts:\n\tDocumentation/filesystems/proc.txt\n\tarch/arm/mach-u300/include/mach/debug-macro.S\n\tdrivers/net/qlge/qlge_ethtool.c\n\tdrivers/net/qlge/qlge_main.c\n\tdrivers/net/typhoon.c\n" }, { "commit": "d702d12167a2c05a346f49aac7a311d597762495", "tree": "baae42c299cce34d6df24b5d01f8b1d0b481bd9a", "parents": [ "9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11", "ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Mar 01 14:19:05 2010 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Mar 01 14:19:05 2010 -0800" }, "message": "Merge with mainline to remove plat-omap/Kconfig conflict\n\nConflicts:\n\tarch/arm/plat-omap/Kconfig\n" }, { "commit": "1d40ddd10dab332456e3863fed2a6e71aa6635ab", "tree": "06f97563bc18ccb158782ea690e7162323eef0d7", "parents": [ "98e12b5a6e05413420a7e3b3eca7fbfc2ff41b6d" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Mar 01 16:19:23 2010 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Mar 01 16:19:23 2010 +0000" }, "message": "MTD: fix pismo build error\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "206aa6cdadad8bbedee5649f1346fe47e922a039", "tree": "1b66e9d98b65d7afe962bb6c6989f3ad212f2e6d", "parents": [ "8facefd0907ae16f96a35bef7ce654206d87c2fc" ], "author": { "name": "Manuel Lauss", "email": "manuel.lauss@googlemail.com", "time": "Mon Oct 19 12:53:37 2009 +0200" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Sat Feb 27 12:52:59 2010 +0100" }, "message": "MIPS: Alchemy: physmap-flash for all devboards\n\nReplace the devboard NOR MTD mapping driver with physmap-flash support.\nAlso honor the \"swapboot\" switch settings wrt. to the layout of the\nNOR partitions.\n\nSigned-off-by: Manuel Lauss \u003cmanuel.lauss@gmail.com\u003e\nCc: Linux-MIPS \u003clinux-mips@linux-mips.org\u003e\nAcked-By: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "a7790532f5b7358c33a6b1834dc2b318de209f31", "tree": "0ceb9e24b3f54cb5c8453fb5a218e2a94a0f1cce", "parents": [ "2764fb4244cc1bc08df3667924ca4a972e90ac70", "60b341b778cc2929df16c0a504c91621b3c6a4ad" ], "author": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri Feb 26 19:04:15 2010 +0000" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri Feb 26 19:06:24 2010 +0000" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n\nThe SmartMedia FTL code depends on new kfifo bits from 2.6.33\n" }, { "commit": "9a5dea7b1046510fdcc81c523405494fd07ec303", "tree": "e0fdb9c4abd2fb40c54b10862446bbd19df8fb06", "parents": [ "dad0db318b391ddb9845ac5e52044f921219bf69" ], "author": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Tue Feb 09 13:42:39 2010 +0200" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Thu Feb 25 12:50:45 2010 +0000" }, "message": "mtd: maps: ceiva: do not return random numbers\n\nWhen machine_is_ceiva() returns zero, \u0027clps_setup_flash()\u0027 returns a\nvalue of an unitialized variable. Fix this.\n\nSpotted by David Binderman.\n\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "4335c1003ed05d5d5a386cd8008fc06a6d424ca2", "tree": "169f8ad13610716ccb6fbde060d2ac154c7ba26b", "parents": [ "bcc98a46eafd38968b05e793326f031988c2b2a8" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Sun Jan 17 10:52:46 2010 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Thu Feb 25 11:35:14 2010 +0000" }, "message": "mtd: maps: Blackfin async: rename local funcs to avoid common clashes\n\nThere are new Blackfin MMR helper functions that use the same name as some\nof the local functions in this driver, so have the driver use more specific\nnames to avoid the issue.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "53f2b1c86a1fa1414be93571062ac4c263fa9fbc", "tree": "62bfe4d6e07f211f6aa004dc0643f8c3fd850800", "parents": [ "9c14b153e6af1301f022d34f1f63888f333e3ef5" ], "author": { "name": "Jon Ringle", "email": "jon@ringle.org", "time": "Wed Jan 13 09:36:10 2010 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Thu Feb 25 11:28:56 2010 +0000" }, "message": "mtd: ixp4xx: fix reading from half-word boundary\n\nFix handling of reads that don\u0027t start on a half-word boundary.\n\nSigned-off-by: Jon Ringle \u003cjon@ringle.org\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "cc87edb173effdf74e680ee6d622a935ff0c1d6f", "tree": "4d7bdf19d5c4cdba1736e88e1cbce7f79cd5df16", "parents": [ "561b036ad9d0b4f0cd311d2e38025919c2cb437f" ], "author": { "name": "Ladislav Michl", "email": "ladis@linux-mips.org", "time": "Mon Feb 15 10:03:32 2010 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Feb 15 10:03:32 2010 -0800" }, "message": "MTD: remove no longer used OMAP flash map\n\nAll OMAP boards are now using physmap-flash.\n\nCc: linux-mtd@lists.infradead.org\nSigned-off-by: Ladislav Michl \u003cladis@linux-mips.org\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "947af2943576400628bba085eaa6b85143526133", "tree": "0f5ac358d1abcd34c30f53fa1cc3e15160d4d0e5", "parents": [ "3d956d1dfffef3b19d743aa1a443ab5a300051cb" ], "author": { "name": "Stefan Weil", "email": "weil@mail.berlios.de", "time": "Thu Jan 07 00:03:52 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Feb 05 12:22:34 2010 +0100" }, "message": "Fix spelling of \u0027platform\u0027 in comments and doc\n\nReplace platfrom -\u003e platform.\n\nThis is a frequent spelling bug.\n\nSigned-off-by: Stefan Weil \u003cweil@mail.berlios.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "b8be634e01b400fa2528848ad0cd6a5580a15bc4", "tree": "f36da264249540727a60e13a54d1d44c8821b48d", "parents": [ "298a4c3a57fed38df365a6807728d1930a72c728", "f5e2bae0aad03164ffc7ce9dfeee6608e2c87dba" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 24 10:31:34 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 24 10:31:34 2010 -0800" }, "message": "Merge git://git.infradead.org/~dwmw2/mtd-2.6.33\n\n* git://git.infradead.org/~dwmw2/mtd-2.6.33:\n mtd: tests: fix read, speed and stress tests on NOR flash\n mtd: Really add ARM pismo support\n kmsg_dump: Dump on crash_kexec as well\n" }, { "commit": "f6a8c60960bbea378142d1fa1b3d111555ee41c7", "tree": "1928b9e3fb242b5e220ca9369ec465fd7f05a821", "parents": [ "0f4bd46ec252887f44f1f065b41867cac8f70dfb" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Sun Nov 29 15:23:51 2009 +0000" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jan 13 09:04:53 2010 +0000" }, "message": "mtd: Really add ARM pismo support\n\n(Commit 7cb777a3d71f9d1f7eb149c7a504d21f24219ae8 (mtd: add ARM pismo support)\nintended to add this, but seems only to have patched the Makefile without\ntouching Kconfig or providing any code...)\n\nThe following patch adds support for PISMO modules found on ARM Ltd\ndevelopment platforms. These are MTD modules, and can have a\nselection of SRAM, flash or DOC devices as described by an on-board\nI2C EEPROM.\n\nWe support SRAM and NOR flash devices only by registering appropriate\nconventional MTD platform devices as children of the \u0027pismo\u0027 device.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "e026255f7d0e56006a147b190ae23be95cb0a9bd", "tree": "6bfc2be2cc917e65aedf2d18b6b3cd696974c934", "parents": [ "bb6a77554935a86686039097cdda2b2a38891c78" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Tue Dec 29 20:15:23 2009 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sat Jan 02 10:04:56 2010 +0000" }, "message": "mtd: physmap_of: Correct the size argument to kzalloc\n\nmtd_list has type struct mtd_info **, not struct mtd_info *, so the\nelements of the array should have pointer type, not structure type.\n\nThe semantic patch that makes this change is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@disable sizeof_type_expr@\ntype T;\nT **x;\n@@\n\n x \u003d\n \u003c+...sizeof(\n- T\n+ *x\n )...+\u003e\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "a695bc683609a2b815915e4cfcd93e4ccc0e2cae", "tree": "824d6b35783317f929fe13a9efcc8a35d5e00311", "parents": [ "6485536bcf499839a54dcda8a8d47ea0bd29b375", "6665398afafcb1c75d933c1452a9010644aba3e6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 17 15:53:41 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 17 15:53:41 2009 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm:\n PCMCIA: fix pxa2xx_lubbock modular build error\n [ARM] Update mach-types\n [ARM] pxa: fix no reference of cpu_is_pxa25x() in devices.c\n [ARM] pxa/cm-x300: add PWM backlight support\n revert \"[ARM] pxa/cm-x300: add PWM backlight support\"\n ARM: use flush_kernel_dcache_area() for dmabounce\n ARM: add size argument to __cpuc_flush_dcache_page\n ARM: 5848/1: kill flush_ioremap_region()\n ARM: cache-l2x0: make better use of background cache handling\n ARM: cache-l2x0: avoid taking spinlock for every iteration\n [ARM] Kirkwood: Add LaCie Network Space v2 support\n ARM: dove: fix the mm mmu flags of the pj4 procinfo\n" }, { "commit": "60d9aa758c00f20ade0cb1951f6a934f628dd2d7", "tree": "e3bdfa4ec0d3f9a29a822810b8b9188c7d613cbd", "parents": [ "b2adf0cbec4cf0934c63f48f893e0cebde380d0c", "2e16cfca6e17ae37ae21feca080a6f2eca9087dc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 10:23:43 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 10:23:43 2009 -0800" }, "message": "Merge git://git.infradead.org/mtd-2.6\n\n* git://git.infradead.org/mtd-2.6: (90 commits)\n jffs2: Fix long-standing bug with symlink garbage collection.\n mtd: OneNAND: Fix test of unsigned in onenand_otp_walk()\n mtd: cfi_cmdset_0002, fix lock imbalance\n Revert \"mtd: move mxcnd_remove to .exit.text\"\n mtd: m25p80: add support for Macronix MX25L4005A\n kmsg_dump: fix build for CONFIG_PRINTK\u003dn\n mtd: nandsim: add support for 4KiB pages\n mtd: mtdoops: refactor as a kmsg_dumper\n mtd: mtdoops: make record size configurable\n mtd: mtdoops: limit the maximum mtd partition size\n mtd: mtdoops: keep track of used/unused pages in an array\n mtd: mtdoops: several minor cleanups\n core: Add kernel message dumper to call on oopses and panics\n mtd: add ARM pismo support\n mtd: pxa3xx_nand: Fix PIO data transfer\n mtd: nand: fix multi-chip suspend problem\n mtd: add support for switching old SST chips into QRY mode\n mtd: fix M29W800D dev_id and uaddr\n mtd: don\u0027t use PF_MEMALLOC\n mtd: Add bad block table overrides to Davinci NAND driver\n ...\n\nFixed up conflicts (mostly trivial) in\n\tdrivers/mtd/devices/m25p80.c\n\tdrivers/mtd/maps/pcmciamtd.c\n\tdrivers/mtd/nand/pxa3xx_nand.c\n\tkernel/printk.c\n" }, { "commit": "ccaf5f05b218e5eb41e2f5cdfd26b18dce4a0218", "tree": "f4de2fb21cc45716c2dbcb98acb176c4295a551c", "parents": [ "3067e02f8f3ae2f3f02ba76400d03b8bcb4942b0" ], "author": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Fri Dec 11 02:21:57 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Dec 14 14:53:21 2009 +0000" }, "message": "ARM: 5848/1: kill flush_ioremap_region()\n\nThere is not enough users to warrant its existence, and it is actually\nan obstacle to progress with the new DMA API which cannot cover this\ncase properly.\n\nTo keep backward compatibility, let\u0027s perform the necessary custom\ncache maintenance locally in the only driver affected.\n\nSigned-off-by: Nicolas Pitre \u003cnico@marvell.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8", "tree": "856ba96302a36014736747e8464f80eeb827bbdd", "parents": [ "f6c4c8195b5e7878823caa1181be404d9e86d369", "d014d043869cdc591f3a33243d3481fa4479c2d0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:43:33 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:43:33 2009 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)\n tree-wide: fix misspelling of \"definition\" in comments\n reiserfs: fix misspelling of \"journaled\"\n doc: Fix a typo in slub.txt.\n inotify: remove superfluous return code check\n hdlc: spelling fix in find_pvc() comment\n doc: fix regulator docs cut-and-pasteism\n mtd: Fix comment in Kconfig\n doc: Fix IRQ chip docs\n tree-wide: fix assorted typos all over the place\n drivers/ata/libata-sff.c: comment spelling fixes\n fix typos/grammos in Documentation/edac.txt\n sysctl: add missing comments\n fs/debugfs/inode.c: fix comment typos\n sgivwfb: Make use of ARRAY_SIZE.\n sky2: fix sky2_link_down copy/paste comment error\n tree-wide: fix typos \"couter\" -\u003e \"counter\"\n tree-wide: fix typos \"offest\" -\u003e \"offset\"\n fix kerneldoc for set_irq_msi()\n spidev: fix double \"of of\" in comment\n comment typo fix: sybsystem -\u003e subsystem\n ...\n" }, { "commit": "1c496784a0d317535f846ddb2c93a08ba936266b", "tree": "6d0225860032f263b6d95a3e55c364a1a5f55ec1", "parents": [ "adf9904dc774f23f04a5425f0198483ea61f878b", "9a01609e1885b827b979d6d9dd86f43208a9e5fc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 08:15:29 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 08:15:29 2009 -0800" }, "message": "Merge branch \u0027omap-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6\n\n* \u0027omap-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (149 commits)\n arm: omap: Add omap3_defconfig\n AM35xx: Defconfig for AM3517 EVM board\n AM35xx: Add support for AM3517 EVM board\n omap: 3630sdp: defconfig creation\n omap: 3630sdp: introduce 3630 sdp board support\n omap3: Add defconfig for IGEP v2 board\n omap3: Add minimal IGEP v2 support\n omap3: Add CompuLab CM-T35 defconfig\n omap3: Add CompuLab CM-T35 board support\n omap3: rx51: Add wl1251 wlan driver support\n omap3: rx51: Add SDRAM init\n omap1: Add default kernel configuration for Herald\n omap1: Add board support and LCD for HTC Herald\n omap: zoom2: update defconfig for LL_DEBUG_NONE\n omap: zoom3: defconfig creation\n omap3: zoom: Introduce zoom3 board support\n omap3: zoom: Drop i2c-1 speed to 2400\n omap3: zoom: rename zoom2 name to generic zoom\n omap3: zoom: split board file for software reuse\n omap3evm: MIgrate to smsc911x ethernet driver\n ...\n\nFix trivial conflict (two unrelated config options added next to each\nother) in arch/arm/mach-omap2/Makefile\n" }, { "commit": "d014d043869cdc591f3a33243d3481fa4479c2d0", "tree": "63626829498e647ba058a1ce06419fe7e4d5f97d", "parents": [ "6ec22f9b037fc0c2e00ddb7023fad279c365324d", "6070d81eb5f2d4943223c96e7609a53cdc984364" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Dec 07 18:36:35 2009 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Dec 07 18:36:35 2009 +0100" }, "message": "Merge branch \u0027for-next\u0027 into for-linus\n\nConflicts:\n\n\tkernel/irq/chip.c\n" }, { "commit": "d9b2c4d0b03c721808c0d259e43a27f1e80205bc", "tree": "f17a4166f62ee14faa1401a6cbd353a4ab8c77cb", "parents": [ "27d16d08717faeaa8afd1b736a096dbaab90f08e", "5fa9167a1bf5f5a4b7282f5e7ac56a4a5a1fa044" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 05 09:42:59 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Dec 05 09:42:59 2009 -0800" }, "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: (50 commits)\n pcmcia: rework the irq_req_t typedef\n pcmcia: remove deprecated handle_to_dev() macro\n pcmcia: pcmcia_request_window() doesn\u0027t need a pointer to a pointer\n pcmcia: remove unused \"window_t\" typedef\n pcmcia: move some window-related code to pcmcia_ioctl.c\n pcmcia: Change window_handle_t logic to unsigned long\n pcmcia: Pass struct pcmcia_socket to pcmcia_get_mem_page()\n pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()\n pcmcia: Pass struct pcmcia_device to pcmcia_release_window()\n drivers/pcmcia: remove unnecessary kzalloc\n pcmcia: correct handling for Zoomed Video registers in topic.h\n pcmcia: fix printk formats\n pcmcia: autoload module pcmcia\n pcmcia/staging: update comedi drivers\n PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket\n PCMCIA: ss: allow PCI IRQs \u003e 255\n PCMCIA: soc_common: remove \u0027dev\u0027 member from soc_pcmcia_socket\n PCMCIA: soc_common: constify soc_pcmcia_socket ops member\n PCMCIA: sa1111: remove duplicated initializers\n PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data\n ...\n" }, { "commit": "86185af927bebbb094f686ce5e3c908c7a418f4c", "tree": "cef28dfee09956e98618d2f207e83bfc3497cfd5", "parents": [ "bebd04cc4569844effbdae49c01a48e57fa77864" ], "author": { "name": "Krzysztof Halasa", "email": "khc@pm.waw.pl", "time": "Sun Nov 15 19:14:07 2009 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Dec 04 15:39:57 2009 +0100" }, "message": "mtd: Fix comment in Kconfig\n\nIXDP425 and Coyote aren\u0027t based on IXP2000 but on IXP425.\n\nSigned-off-by: Krzysztof Halasa \u003ckhc@pm.waw.pl\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "7cb777a3d71f9d1f7eb149c7a504d21f24219ae8", "tree": "41ca9332e2bec40084ad051112e017bc082b19f9", "parents": [ "98ecc914d0a48dbbcbb5fc866ab5b59a52afbd41" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Sun Nov 29 15:23:51 2009 +0000" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon Nov 30 12:01:05 2009 +0000" }, "message": "mtd: add ARM pismo support\n\nThe following patch adds support for PISMO modules found on ARM Ltd\ndevelopment platforms. These are MTD modules, and can have a\nselection of SRAM, flash or DOC devices as described by an on-board\nI2C EEPROM.\n\nWe support SRAM and NOR flash devices only by registering appropriate\nconventional MTD platform devices as children of the \u0027pismo\u0027 device.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "895fb49459227edbb4a4e5a2b5e9d12c34640f84", "tree": "c6d8ce92b3c3a9797bdb8c8196a671402b829f87", "parents": [ "b2ef1a2bb2eb49cd7c75b22f1ea40ead0bdfdb8a" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Wed Nov 11 21:47:06 2009 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon Nov 30 09:51:44 2009 +0000" }, "message": "mtd: error return -EIO instead of EIO\n\nReturn a negative error value instead of a positive\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "d6587feaf0ed7511b3d0b52bcaae8ecd0949d3af", "tree": "cfd13ef9280472485342cc1384989fbc87d5fda9", "parents": [ "2af7c653993199fb32dc6d9504064a0c9c57e5d6" ], "author": { "name": "Tobias Klauser", "email": "tklauser@distanz.ch", "time": "Fri Oct 30 17:54:33 2009 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon Nov 30 09:47:24 2009 +0000" }, "message": "mtd: ixp4xx map: use resource_size\n\nUse the resource_size inline function instead of manually calculating\nthe resource size. This reduces the chance of introducing off-by-one\nerrors.\n\nSigned-off-by: Tobias Klauser \u003ctklauser@distanz.ch\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "6838b03fc6564ea07d0cd87ea6e198d90ab1fc3e", "tree": "bf14e1ea71482dacfdad97ac9d3f895050946406", "parents": [ "82f88e36004162f49a9340ffbbaebe89016e4835" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Tue Nov 03 01:31:52 2009 +0100" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Nov 28 18:02:58 2009 +0100" }, "message": "pcmcia: pcmcia_request_window() doesn\u0027t need a pointer to a pointer\n\npcmcia_request_window() only needs a pointer to struct pcmcia_device, not\na pointer to a pointer.\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-scsi@vger.kernel.org\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nAcked-by: Karsten Keil \u003ckeil@b1-systems.de\u003e (for ISDN)\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "868575d1e87ff2091800aea816972ddb46de60d5", "tree": "95c50968098815dfe066e960922c4be3b003b27f", "parents": [ "f5560da549ea2e32dd41e36548c0e7dee3d4aabb" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Wed Dec 13 19:46:43 2006 +0900" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Nov 28 18:02:13 2009 +0100" }, "message": "pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()\n\nNo logic changes, just pass struct pcmcia_device to pcmcia_map_mem_page()\n\n[linux@dominikbrodowski.net: update to 2.6.31]\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-scsi@vger.kernel.org\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nAcked-by: Karsten Keil \u003ckeil@b1-systems.de\u003e (for ISDN)\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "f5560da549ea2e32dd41e36548c0e7dee3d4aabb", "tree": "604c41db48ba2e497857ceb2137099d2f0d96d3b", "parents": [ "78a14e273d93dfbea9673f9b10398c538096302d" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Wed Dec 13 19:46:38 2006 +0900" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Nov 28 18:01:26 2009 +0100" }, "message": "pcmcia: Pass struct pcmcia_device to pcmcia_release_window()\n\nNo logic changes, just pass struct pcmcia_device to pcmcia_release_window().\n\n[linux@dominikbrodowski.net: update to 2.6.31]\nCC: netdev@vger.kernel.org\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "a76df42a675c9936e8bf3607226e74c8a5e2d847", "tree": "96d93706d884dea956393653452fa4d78d8d7f76", "parents": [ "648f4e3e50c4793d9dbf9a09afa193631f76fa26", "8171d88089ad63fc442b2bf32af7c18653adc5cb" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Sun Nov 22 10:08:43 2009 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Sun Nov 22 10:08:43 2009 -0800" }, "message": "Merge 7xx-iosplit-plat-merge with omap-fixes\n\nMerge branch \u00277xx-iosplit-plat-merge\u0027 into omap-for-linus\n" }, { "commit": "782e5711d61b2cda45dea447badba3ab07c236f0", "tree": "3b3916786274f09ec5e1cbeab4c564e6990caff6", "parents": [ "8ce110ac19bc88b82e3feacfbb3a2ee08a07fe22" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Fri Nov 20 14:56:07 2009 +0900" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri Nov 20 10:31:23 2009 +0000" }, "message": "mtd: vmu-flash: Use hweight_long\n\nUse hweight_long instead of Brian Kernighan\u0027s/Peter Wegner\u0027s method\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "927585f650b51639f0262dad650eafeaf1611197", "tree": "01cfd4125cef19263545744a6d0ca5e9180e0375", "parents": [ "a9366e61b03f55a6e009e687ad10e706714c9907" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Nov 16 16:13:35 2009 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Nov 16 16:13:35 2009 +0000" }, "message": "ARM: Fix warning in sa1100-flash.c\n\ndrivers/mtd/maps/sa1100-flash.c: In function \u0027sa1100_probe_subdev\u0027:\ndrivers/mtd/maps/sa1100-flash.c:214: warning: format \u0027%d\u0027 expects type \u0027int\u0027, but argument 3 has type \u0027uint64_t\u0027\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "52cb0148ef2401dbffa4daf60588cad27e4f329d", "tree": "59c7eb7c65ee4e40fbf9043208f0266cada54d9a", "parents": [ "799dd75b1a8380a967c929a4551895788c374b31" ], "author": { "name": "Atsushi Nemoto", "email": "anemo@mba.ocn.ne.jp", "time": "Mon Nov 09 23:21:19 2009 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 09 15:37:07 2009 -0800" }, "message": "mtd/maps: Fix accidental removal in Makefile\n\nThe commit d79c326 (\"gpio-addr-flash: new driver for GPIO assisted\nflash addressing\") removed two lines from the Makefile by accident.\nThough I\u0027m not sure how this accident happened, this patch reverts the\nremoval.\n\nSigned-off-by: Atsushi Nemoto \u003canemo@mba.ocn.ne.jp\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fa3012318bfb395552baef69bb1ebe87e64945c8", "tree": "5095c1dda820a408609c6e0bd5bc2e7f4c359eae", "parents": [ "7beeec88e5f379680abeb4244b0781e102201c0e" ], "author": { "name": "Michael Roth", "email": "mroth@nessie.de", "time": "Sun Oct 04 18:14:29 2009 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Nov 09 09:40:56 2009 +0100" }, "message": "Kconfig: Remove useless and sometimes wrong comments\n\nAdditionally, some excessive newlines removed.\n\nSigned-off-by: Michael Roth \u003cmroth@nessie.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "9b44de2015ff4a2ed1d56efedfcc72b917d356a6", "tree": "63460e0cf95d4bbea0111d153247c3298ac4ff3d", "parents": [ "7c5af6ffd69bb2bb3c86b374153627529d67598c" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Oct 24 15:55:39 2009 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Mon Nov 09 08:30:05 2009 +0100" }, "message": "pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (misc drivers)\n\nConvert PCMCIA drivers to use the dynamic debug infrastructure, instead of\nrequiring manual settings of PCMCIA_DEBUG.\n\nAlso, remove all usages of the CS_CHECK macro and replace them with proper\nLinux style calling and return value checking. The extra error reporting may\nbe dropped, as the PCMCIA core already complains about any (non-driver-author)\nerrors.\n\nCC: linux-mtd@lists.infradead.org\nCC: linux-usb@vger.kernel.org\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "18b61b97294dad74dd00a1aa8efed0cfacb95aff", "tree": "c14ba8be136d95e725bc6f4d31073bbec8ca146d", "parents": [ "37ace3d4131ae80f370eb1230fa7db2b3eedf17c" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Oct 18 23:57:58 2009 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Nov 08 18:23:10 2009 +0100" }, "message": "pcmcia: convert pcmciamtd driver to use new CIS helpers\n\nConvert the (broken) pcmciamtd driver to use the new CIS helpers.\n\nCC: David.Woodhouse@intel.com\nCC: linux-mtd@lists.infradead.org\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "4397989fc91ed289909ecf307c2dc21cee0e7905", "tree": "fc28a1e179caa3570146ece045cd2bf198f6bd89", "parents": [ "1bbc9a66d0194449f32c2aa18be40db5744dbd85", "de19d02b731478877ce8b1ccf371c2b2142ac80e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 05 13:23:16 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 05 13:23:16 2009 -0800" }, "message": "Merge git://git.infradead.org/users/dwmw2/mtd-2.6.32\n\n* git://git.infradead.org/users/dwmw2/mtd-2.6.32:\n mtd/maps: gpio-addr-flash: depend on GPIO arch support\n mtd/maps: gpio-addr-flash: pull in linux/ headers rather than asm/\n mtd: nand: fix htmldocs warnings\n" }, { "commit": "8ce110ac19bc88b82e3feacfbb3a2ee08a07fe22", "tree": "942c3de936655fb78a9e356a4cea6b056687c7da", "parents": [ "1cc523999e0acd0c21f83bf89b7a44b4ab6f7bd8" ], "author": { "name": "H Hartley Sweeten", "email": "hartleys@visionengravers.com", "time": "Tue Oct 20 12:23:33 2009 -0400" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Oct 21 06:29:27 2009 +0900" }, "message": "mtd: Fix compile failure and error path in physmap.c\n\nCommit 4b56ffcacee937a85bf39e14872dd141e23ee85f (\"mtd: Fix kernel NULL\npointer dereference in physmap.c\") introduced a couple of bugs.\n\nIt neglected to run the loop of map_destroy() calls in\nphysmap_flash_remove(), if !info-\u003ecmtd, which would happen if that\nfunction was called to clean up errors during probe.\n\nIt also failed to compile if CONFIG_MTD_PARTITIONS was not defined.\n\nReported-By: Atsushi Nemoto \u003canemo@mba.ocn.ne.jp\u003e\nSigned-off-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "ce491cf85466c3377228c5a852ea627ec5136956", "tree": "3396aa3dc80ac30de662b59218d3bf788d105996", "parents": [ "3eff851b9dc1e84aa0822772e0be9afb0c973585" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Tue Oct 20 09:40:47 2009 -0700" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Tue Oct 20 09:40:47 2009 -0700" }, "message": "omap: headers: Move remaining headers from include/mach to include/plat\n\nMove the remaining headers under plat-omap/include/mach\nto plat-omap/include/plat. Also search and replace the\nfiles using these headers to include using the right path.\n\nThis was done with:\n\n#!/bin/bash\nmach_dir_old\u003d\"arch/arm/plat-omap/include/mach\"\nplat_dir_new\u003d\"arch/arm/plat-omap/include/plat\"\nheaders\u003d$(cd $mach_dir_old \u0026\u0026 ls *.h)\nomap_dirs\u003d\"arch/arm/*omap*/ \\\ndrivers/video/omap \\\nsound/soc/omap\"\nother_files\u003d\"drivers/leds/leds-ams-delta.c \\\ndrivers/mfd/menelaus.c \\\ndrivers/mfd/twl4030-core.c \\\ndrivers/mtd/nand/ams-delta.c\"\n\nfor header in $headers; do\n\told\u003d\"#include \u003cmach\\/$header\"\n\tnew\u003d\"#include \u003cplat\\/$header\"\n\tfor dir in $omap_dirs; do\n\t\tfind $dir -type f -name \\*.[chS] | \\\n\t\t\txargs sed -i \"s/$old/$new/\"\n\tdone\n\tfind drivers/ -type f -name \\*omap*.[chS] | \\\n\t\txargs sed -i \"s/$old/$new/\"\n\tfor file in $other_files; do\n\t\tsed -i \"s/$old/$new/\" $file\n\tdone\ndone\n\nfor header in $(ls $mach_dir_old/*.h); do\n\tgit mv $header $plat_dir_new/\ndone\n\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "4b56ffcacee937a85bf39e14872dd141e23ee85f", "tree": "da435281a3b348c2ed89d1f473bd0f78a1761069", "parents": [ "2d098a725333990d265dfe4754d1b63032c35afb" ], "author": { "name": "H Hartley Sweeten", "email": "hartleys@visionengravers.com", "time": "Mon Oct 19 13:31:46 2009 -0400" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Tue Oct 20 09:36:04 2009 +0900" }, "message": "mtd: Fix kernel NULL pointer dereference in physmap.c\n\nDuring the probe for physmap platform flash devices there are a\nnumber error exit conditions that all do a goto err_out which\nthen calls physmap_flash_remove(). In that function one of the\ncleanup steps is:\n\n#ifdef CONFIG_MTD_CONCAT\n\tif (info-\u003ecmtd !\u003d info-\u003emtd[0])\n\t\tmtd_concat_destroy(info-\u003ecmtd);\n#endif\n\nThis test will succeed since info-\u003ecmtd \u003d\u003d NULL and info-\u003emtd[0] is\nvalid.\n\nFix this by exiting the remove function when info-\u003ecmtd \u003d\u003d NULL.\n\nAlso, cleanup the #ifdef CONFIG_MTD_PARTITIONS stuff by using\nmtd_has_partitions().\n\nSigned-off-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "5da6bbe2f9e1db56b4a94cad2ace7d9992b1d666", "tree": "b851288ad16e7f2679cb8047b9d43efad29a6d18", "parents": [ "9729b260ea5ef4b2c5de0643a7b764b408e275b1" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Oct 18 16:07:34 2009 -0700" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon Oct 19 08:40:37 2009 +0900" }, "message": "pcmcia: convert pcmciamtd driver to use new CIS helpers\n\nConvert the (broken) pcmciamtd driver to use the new CIS helpers.\n\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "9729b260ea5ef4b2c5de0643a7b764b408e275b1", "tree": "4b390a369232ff0076da9f14ffe7f9d3b09b24c8", "parents": [ "d4702669b0b64b8fa7c91123639ec20d9592ee43" ], "author": { "name": "Dmitry Artamonow", "email": "mad_soft@inbox.ru", "time": "Tue Oct 13 15:34:54 2009 +0400" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sat Oct 17 15:41:26 2009 +0100" }, "message": "mtd: maps: remove obsolete ipaq-flash driver\n\nThis driver seems to be obsolete and broken for a long time.\nIt depends on CONFIG_IPAQ_HANDHELD that simply doesn\u0027t exists\nanywhere in kernel. Also, it seems that none of machines it\nclaims to support have any use of it:\n SA11xx-based iPAQs (h3100/h3600) use sa1100-flash\n iPAQ h5000 uses physmap-flash\n Jornada 720 uses sa1100-flash\n Jornada 560 and iPAQ h1910 are not in mainline\n\nSigned-off-by: Dmitry Artamonow \u003cmad_soft@inbox.ru\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "5a134239e707b23c65948f41f40b828d40e440af", "tree": "716e5a8529330dc3cd7d7c7f41596d459d4f48e3", "parents": [ "82613b0da622efbd24cb7b23eb349966802310f1" ], "author": { "name": "Dmitry Artamonow", "email": "mad_soft@inbox.ru", "time": "Fri Oct 09 12:18:49 2009 +0400" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sat Oct 17 15:37:13 2009 +0100" }, "message": "mtd: maps/sa1100: fix section mismatch\n\nCommit f0b1e589 changed sa1100_mtd_probe from __init to __devinit,\nbut missed to correct sa1100_setup_mtd definition accordingly, which\ncauses following warning:\n\nWARNING: vmlinux.o(.devinit.text+0xf4): Section mismatch in reference from\n the function sa1100_mtd_probe() to the function .init.text:sa1100_setup_mtd()\nThe function __devinit sa1100_mtd_probe() references\na function __init sa1100_setup_mtd().\nIf sa1100_setup_mtd is only used by sa1100_mtd_probe then\nannotate sa1100_setup_mtd with a matching annotation.\n\nSigned-off-by: Dmitry Artamonow \u003cmad_soft@inbox.ru\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "794d579ae17a7ec8028e4844096059c19431a96c", "tree": "a6e85fb36490a730c531fbdd5e97b797d3f18c10", "parents": [ "c1558b55c55620f54f0f78cb8295947a2a3f6de2" ], "author": { "name": "Russell King", "email": "rmk@arm.linux.org.uk", "time": "Sun Sep 27 23:51:04 2009 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sun Sep 27 15:54:43 2009 -0700" }, "message": "mtd: Fix warning in sa1100-flash.c\n\ndrivers/mtd/maps/sa1100-flash.c: In function \u0027sa1100_probe_subdev\u0027:\ndrivers/mtd/maps/sa1100-flash.c:214: warning: format \u0027%d\u0027 expects type \u0027int\u0027, but argument 3 has type \u0027uint64_t\u0027\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "de19d02b731478877ce8b1ccf371c2b2142ac80e", "tree": "5f5cc1ad1bd7ed4bd7e13b87989734f14336049c", "parents": [ "f5bae56a501347671b18095731d78e13eee5205f" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Thu Sep 24 15:11:38 2009 -0400" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Thu Sep 24 12:52:10 2009 -0700" }, "message": "mtd/maps: gpio-addr-flash: depend on GPIO arch support\n\nThe driver requires gpio functionality, so make sure we depend on that in\nthe Kconfig menu.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "f5bae56a501347671b18095731d78e13eee5205f", "tree": "208fc0d93779c536fe2b1cc4ded7b061ced27f0b", "parents": [ "58475fb908485ab38860d6970a8063987fe1d619" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Thu Sep 24 15:11:37 2009 -0400" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Thu Sep 24 12:50:32 2009 -0700" }, "message": "mtd/maps: gpio-addr-flash: pull in linux/ headers rather than asm/\n\nNow that there are linux/ versions of gpio.h and io.h, include those\nrather than hitting the asm/ versions.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "a6b49cb210f878709bdc0bddc16a853f18790d02", "tree": "6147078ef0ce584cb6a8dae7468f060ef5838d12", "parents": [ "2c9871de0ae89a0e2c365ea6e277135fe031d8b4", "bfc8125858d777bd5bdba03a091c07cc2e0e17c0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 09:01:44 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 09:01:44 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.monstr.eu/linux-2.6-microblaze\n\n* \u0027for-linus\u0027 of git://git.monstr.eu/linux-2.6-microblaze: (24 commits)\n microblaze: Disable heartbeat/enable emaclite in defconfigs\n microblaze: Support simpleImage.dts make target\n microblaze: Fix _start symbol to physical address\n microblaze: Use LOAD_OFFSET macro to get correct LMA for all sections\n microblaze: Create the LOAD_OFFSET macro used to compute VMA vs LMA offsets\n microblaze: Copy ppc asm-compat.h for clean handling of constants in asm and C\n microblaze: Actually show KiB rather than pages in \"Freeing initrd memory:\"\n microblaze: Support ptrace syscall tracing.\n microblaze: Updated CPU version and FPGA family codes in PVR\n microblaze: Generate correct signal and siginfo for integer div-by-zero\n microblaze: Don\u0027t be noisy when userspace causes hardware exceptions\n microblaze: Remove ipc.h file which points to non-existing asm-generic file\n microblaze: Clear sticky FSR register after generating exception signals\n microblaze: Ensure CPU usermode is set on new userspace processes\n microblaze: Use correct kbuild variable KBUILD_CFLAGS\n microblaze: Save and restore msr in hw exception\n microblaze: Add architectural support for USB EHCI host controllers\n microblaze: Implement include/asm/syscall.h.\n microblaze: Improve checking mechanism for MSR instruction\n microblaze: Add checking mechanism for MSR instruction\n ...\n" }, { "commit": "a7c367b95a9d8e65e0f0e7da31f700a556794efb", "tree": "5b1bb202801e29e3237381aa7aad5aa288378d5b", "parents": [ "15f964bed054821d6d940d3752508c5f96a9ffd3", "e1070211f7327a1f197d535aa886f721a241c32f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 10:07:49 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 10:07:49 2009 -0700" }, "message": "Merge git://git.infradead.org/mtd-2.6\n\n* git://git.infradead.org/mtd-2.6: (58 commits)\n mtd: jedec_probe: add PSD4256G6V id\n mtd: OneNand support for Nomadik 8815 SoC (on NHK8815 board)\n mtd: nand: driver for Nomadik 8815 SoC (on NHK8815 board)\n m25p80: Add Spansion S25FL129P serial flashes\n jffs2: Use SLAB_HWCACHE_ALIGN for jffs2_raw_{dirent,inode} slabs\n mtd: sh_flctl: register sh_flctl using platform_driver_probe()\n mtd: nand: txx9ndfmc: transfer 512 byte at a time if possible\n mtd: nand: fix tmio_nand ecc correction\n mtd: nand: add __nand_correct_data helper function\n mtd: cfi_cmdset_0002: add 0xFF intolerance for M29W128G\n mtd: inftl: fix fold chain block number\n mtd: jedec: fix compilation problem with I28F640C3B definition\n mtd: nand: fix ECC Correction bug for SMC ordering for NDFC driver\n mtd: ofpart: Check availability of reg property instead of name property\n driver/Makefile: Initialize \"mtd\" and \"spi\" before \"net\"\n mtd: omap: adding DMA mode support in nand prefetch/post-write\n mtd: omap: add support for nand prefetch-read and post-write\n mtd: add nand support for w90p910 (v2)\n mtd: maps: add mtd-ram support to physmap_of\n mtd: pxa3xx_nand: add single-bit error corrections reporting\n ...\n" }, { "commit": "fd589a8f0a13f53a2dd580b1fe170633cf6b095f", "tree": "942c50188ca58041b0453189e710eafcfebaea57", "parents": [ "4f37940d64a155c025968118849b596f6aaa8128" ], "author": { "name": "Anand Gadiyar", "email": "gadiyar@ti.com", "time": "Thu Jul 16 17:13:03 2009 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Sep 21 15:14:55 2009 +0200" }, "message": "trivial: fix typo \"to to\" in multiple files\n\nSigned-off-by: Anand Gadiyar \u003cgadiyar@ti.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "c2a32f0d758273fc1caa18b9d4544abb40cd58b1", "tree": "e075f3be140207e842699bd05b5bca6d19e1d761", "parents": [ "ebc79c4f8da0f92efa968e0328f32334a2ce80cf" ], "author": { "name": "John Williams", "email": "john.williams@petalogix.com", "time": "Tue Aug 25 19:19:54 2009 +1000" }, "committer": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Mon Sep 21 14:29:20 2009 +0200" }, "message": "mtd: Enable Open Firmware initialisation of MTD devices and maps for MicroBlaze\n\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e\n" }, { "commit": "6469f540ea37d53db089c8fea9c0c77a3d9353d4", "tree": "1dc9dc077150d57f4424cae49e711b5dd6e903a1", "parents": [ "304e6d5fe294b80e6d3107f99ec241816390ebcc", "78f28b7c555359c67c2a0d23f7436e915329421e" ], "author": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sun Sep 20 05:55:36 2009 -0700" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sun Sep 20 05:55:36 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n\nConflicts:\n\tdrivers/mtd/mtdcore.c\n\nMerged in order that I can apply the Nomadik nand/onenand support patches.\n" }, { "commit": "fc28c39f0ef59bfb649ddfd633275be8e45c0f9c", "tree": "7a1e8d0b1bc015b5cc9584db3ac7805269036479", "parents": [ "223cf6c3b517cf6ef040cafe45af89f3b8adba74" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Fri Jul 17 14:39:23 2009 +0200" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sat Sep 19 13:15:26 2009 -0700" }, "message": "mtd: maps: add mtd-ram support to physmap_of\n\nUse physmap_of to access RAMs as mtd and add documenation for it. This approach\nis a lot less intrusive as adding an of-wrapper around plat-ram.c. As most\nextensions of plat-ram.c (e.g. custom map-functions) can\u0027t be mapped to the\ndevice tree anyhow, extending physmap_of seems to be the cleanest approach.\n\nTested with a phyCORE-MPC5121e.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nCc: Vitaly Wool \u003cvwool@ru.mvista.com\u003e\nCc: Artem Bityutskiy \u003cdedekind@infradead.org\u003e\nCc: Ken MacLeod \u003cken@bitsko.slc.ut.us\u003e\nCc: Albrecht Dreß \u003calbrecht.dress@arcor.de\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "d79c326c048246b855b83a0092e6324df0717735", "tree": "3a1465753d9c7a6c61cbf3d6fca0c2bf45d559bc", "parents": [ "1b533d227e5f8356d2f009f90b8c8c1f02eb71b8" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Wed May 20 12:04:09 2009 -0400" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sat Sep 19 11:52:42 2009 -0700" }, "message": "mtd/maps: gpio-addr-flash: new driver for GPIO assisted flash addressing\n\nThis driver lets people use GPIO\u0027s for additional address lines in case\ntheir processor does not have enough address lines already.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Bryan Wu \u003ccooloney@kernel.org\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "1b533d227e5f8356d2f009f90b8c8c1f02eb71b8", "tree": "4df753d98b42d68977dcae3523b63de8c46167e6", "parents": [ "3ff230a742b8fc196c1fe69875a57a429877cacb" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Tue Jun 09 10:37:18 2009 +0000" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sat Sep 19 11:47:12 2009 -0700" }, "message": "mtd/maps: uclinux: depend on MTD_RAM being built into the kernel\n\nIf MTD_RAM is built as a module, the uClinux map does not work since it\ncan only be built in to the kernel.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "3ff230a742b8fc196c1fe69875a57a429877cacb", "tree": "e5825c0cccc7b7a1d5e6d975a96fc73a48fa6ce3", "parents": [ "9aff1b1afe9a30c358d1c3a0bb50ae77bd7f994b" ], "author": { "name": "Timofei Bondarenko", "email": "tim@ipi.ac.ru", "time": "Wed May 20 19:59:02 2009 -0400" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sat Sep 19 11:44:51 2009 -0700" }, "message": "mtd/maps: uclinux: fix building when partition support is disabled\n\nThe uClinux map driver doesn\u0027t even use partitions, so we shouldn\u0027t require\nit in order to work properly.\n\nSigned-off-by: Timofei Bondarenko \u003ctim@ipi.ac.ru\u003e\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Sonic Zhang \u003csonic.zhang@analog.com\u003e\nCC: Greg Ungerer \u003cgerg@uclinux.org\u003e\nCC: uclinux-dev@uclinux.org\nCC: linux-mtd@lists.infradead.org\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "2f82af08fcc7dc01a7e98a49a5995a77e32a2925", "tree": "d505fe5936881b137b82b59360646a6988e506ba", "parents": [ "f199fd990639f93d07d8e104b0a66aabaf01d67d" ], "author": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Mon Sep 14 03:25:28 2009 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 15 09:37:12 2009 -0700" }, "message": "Nicolas Pitre has a new email address\n\nDue to problems at cam.org, my nico@cam.org email address is no longer\nvalid. FRom now on, nico@fluxnic.net should be used instead.\n\nSigned-off-by: Nicolas Pitre \u003cnico@fluxnic.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2c78c44362bc9b7c715a3c2119b89a407c1cb739", "tree": "2ecdf19b0bccb73b60486c6784ae7cf0c7d67350", "parents": [ "fca910883324d437a24d447b08f524fa19261a94" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Mon Aug 10 10:16:37 2009 +0200" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri Sep 04 09:42:06 2009 +0100" }, "message": "mtd: pmcmsp-flash: fix error paths in init_msp_flash\n\nCleanin up after errors in init_msp_flash().\n\nAlso cleanup_msp_flash() attempts to determine the size of\nmsp_flash with `sizeof(msp_flash) / sizeof(struct mtd_info **)\u0027\nThis will not work since msp_flash is not an array.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "ad4fbc7921bd7cca108ecc1340a014e91ecc8536", "tree": "22bbcfe99366a67357cec464e9b3332cd4cd5d95", "parents": [ "9a73290d7735c0671d1d2379ed40025db8b773d0" ], "author": { "name": "vimal singh", "email": "vimal.newwork@gmail.com", "time": "Thu Jul 30 20:54:27 2009 +0530" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri Sep 04 09:39:50 2009 +0100" }, "message": "mtd: physmap_of: fix incorrect check\n\nThis patch fixes a spelling error that has resulted from copy and\npasting. The location of the error was found using a semantic patch\nbut the semantic patch was not trying to find these errors. After\nlooking things over it seemed logical that this change was needed.\n\nThe patch also makes sure mtd_list is not being freed if it has not\nbeen allocated\n\nSigned-off-by: Stoyan Gaydarov \u003csgayda2@uiuc.edu\u003e\nSigned-off-by: Vimal Singh \u003cvimalsingh@ti.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "76d6a4791609e4d14b411a513c7648b19b258d8f", "tree": "a4ad122fa6a3525b3eedce0cdcf694385e7aa7bb", "parents": [ "2763c508a3c8f8ec5d6df4e8c63d5e2a5a7d3954" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Fri Jul 17 17:47:37 2009 +0200" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri Sep 04 09:37:34 2009 +0100" }, "message": "mtd: plat-ram: use resource_size\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "2763c508a3c8f8ec5d6df4e8c63d5e2a5a7d3954", "tree": "07bbb07d236b19ecf3a4f9d1e93095d905648cc7", "parents": [ "44a1f2085e8fe07b3aecdab7c391ca057d75da0f" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Fri Jul 17 17:54:14 2009 +0200" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri Sep 04 09:37:18 2009 +0100" }, "message": "mtd: physmap_of: use resource_size\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "67fe0688082509c52bd451d10a61b3565169c23e", "tree": "ae3dd36f56fba7faa8a2bf7ce384a5109548ee5d", "parents": [ "7cb7beb31aa3d941833b6a6e553687422c31e4b6" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Wed Aug 12 06:29:57 2009 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Wed Aug 12 06:29:57 2009 -0400" }, "message": "Remove zero-length file drivers/mtd/maps/sbc8240.c\n\nIt was \"deleted\" in commit 2bf961b7ccd69e108ac435c67e2b0522b403c578\n\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "2bf961b7ccd69e108ac435c67e2b0522b403c578", "tree": "6b5ee4abc35c82e4c511b8234775aea8c84edd09", "parents": [ "3cae1cc149c40c14424162496eb5a7c8db1cd4fb" ], "author": { "name": "Subrata Modak", "email": "subrata@linux.vnet.ibm.com", "time": "Wed Jul 01 19:22:47 2009 +0530" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon Aug 03 14:22:54 2009 +0100" }, "message": "mtd: remove \u0027SBC8240 Wind River\u0027 Device Driver Code\n\nThis driver is causing build errors and is no longer needed -- it is obsoleted\nby physmap_of.\n\nSigned-off-by: Subrata Modak \u003csubrata@linux.vnet.ibm.com\u003e\nTested-on-PPC64-by: Subrata Modak \u003csubrata@linux.vnet.ibm.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "17659c60629618c0aa67eb3cb6a77d2c52486d2e", "tree": "c0bd2515acfb4c609e00f92291d5e71c2587f1b7", "parents": [ "4839641333d4593bfc4fb29aa3af10d36f607d5b" ], "author": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 24 15:35:15 2009 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 24 16:02:06 2009 +0100" }, "message": "mtd: maps: Remove BUS_ID_SIZE from integrator_flash\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\nTested-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\n" }, { "commit": "143070e74630b9557e1bb64d899ff2cc5a1dcb48", "tree": "90f22516649e24837cf435b7ca9f86da0374d257", "parents": [ "43950a605dc76677f0c74dcd818a57d4df040e12" ], "author": { "name": "Stefan Roese", "email": "sr@denx.de", "time": "Thu Apr 16 14:10:45 2009 +0200" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sat Jun 06 08:27:42 2009 +0100" }, "message": "mtd: physmap_of: Add multiple regions and concatenation support\n\nThis patch adds support to handle multiple non-identical chips in one\nflash device tree node. It also adds concat support to physmap_of. This\nmakes it possible to support e.g. the Intel P30 48F4400 chips which\ninternally consists of 2 non-identical NOR chips on one die. Additionally\npartitions now can span over multiple chips.\n\nTo describe such a chip\u0027s, multiple \"reg\" tuples are now supported in one\nflash device tree node. Here an dts example:\n\n flash@f0000000,0 {\n #address-cells \u003d \u003c1\u003e;\n #size-cells \u003d \u003c1\u003e;\n compatible \u003d \"cfi-flash\";\n reg \u003d \u003c0 0x00000000 0x02000000\n 0 0x02000000 0x02000000\u003e;\n bank-width \u003d \u003c2\u003e;\n partition@0 {\n label \u003d \"test-part1\";\n reg \u003d \u003c0 0x04000000\u003e;\n };\n };\n\nSigned-off-by: Stefan Roese \u003csr@denx.de\u003e\nReviewed-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "4938c88c922fad23f0a9f404eeda0207a819e4df", "tree": "f4ba97c4721f421fb172e8ce237da846c4928a18", "parents": [ "9f31f4b9dccf6fa4a606ae04602ec232b94727fb" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Tue Jun 02 00:06:23 2009 -0400" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri Jun 05 18:35:44 2009 +0100" }, "message": "mtd: maps: Blackfin async: fix memory leaks in probe/remove funcs\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Bryan Wu \u003ccooloney@kernel.org\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "9f31f4b9dccf6fa4a606ae04602ec232b94727fb", "tree": "23cbf7621365fa10ee126327dd650026edea6466", "parents": [ "6ae392ccadbc622d58a9d01a7ee59e340f82fe85" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Tue May 26 19:33:17 2009 -0400" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri Jun 05 18:29:35 2009 +0100" }, "message": "mtd: uclinux: mark local stuff static\n\nThe uclinux_ram_mtdinfo, uclinux_romfs, and uclinux_point symbols do not\nneed to be visible outside of this module, so mark them static.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCC: Greg Ungerer \u003cgerg@uclinux.org\u003e\nCC: uclinux-dev@uclinux.org\nCC: linux-mtd@lists.infradead.org\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "6ae392ccadbc622d58a9d01a7ee59e340f82fe85", "tree": "5e8bc7a07fb67d503580cf6e4e60b989c64db16c", "parents": [ "fa254ecbcca713a4aec99478e79f858942b3d4e0" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Tue May 26 19:33:18 2009 -0400" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri Jun 05 18:29:25 2009 +0100" }, "message": "mtd: uclinux: do not allow to be built as a module\n\nThere isn\u0027t any benefit to building the uClinux MTD map as a module as the\nrootfs it requires in order to actually be usable is appended to the\nkernel image, not the module. No known system builds it this way either,\nso change the option to \"bool\".\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCC: Paul Mundt \u003clethal@linux-sh.org\u003e\nCC: Greg Ungerer \u003cgerg@uclinux.org\u003e\nCC: uclinux-dev@uclinux.org\nCC: linux-mtd@lists.infradead.org\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "fa254ecbcca713a4aec99478e79f858942b3d4e0", "tree": "4f734d3cdb4d89987bb181e78218fb377cd12a9a", "parents": [ "c3a9f35673290f49ec115d36ad283961c82c135a" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Tue May 26 19:33:16 2009 -0400" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri Jun 05 18:29:14 2009 +0100" }, "message": "mtd: uclinux: allow systems to override map addr/size\n\nDue to a processor anomaly (05000263 to be exact), most Blackfin parts\ncannot keep the embedded filesystem image directly after the kernel in\nRAM. Instead, the filesystem needs to be relocated to the end of memory.\nAs such, we need to tweak the map addr/size during boot for Blackfin\nsystems. This can be done in any early arch/board init code.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCC: Paul Mundt \u003clethal@linux-sh.org\u003e\nCC: Greg Ungerer \u003cgerg@uclinux.org\u003e\nCC: uclinux-dev@uclinux.org\nCC: linux-mtd@lists.infradead.org\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "4d964824ec826ed97bdde10bc8d8c4ce10540a98", "tree": "2dae63621c86eab4a26f024e4cd064224491d00d", "parents": [ "d3412dbd721c0136379d86242297d19399f0c05f" ], "author": { "name": "Shane McDonald", "email": "mcdonald.shane@gmail.com", "time": "Sat May 02 09:40:06 2009 -0600" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri Jun 05 18:10:49 2009 +0100" }, "message": "mtd: remove pmcmsp-ramroot.c\n\nThe RAMROOT function was a successful but non-portable attempt to append\nthe root filesystem to the end of the kernel image. The preferred and\nportable solution is to use an initramfs instead.\n\nThe only user of this function was the msp71xx configuration\nin the MIPS architecture; as the use of the RAMROOT has been removed\nfrom that configuration, there are no more users, so this code\ncan be removed.\n\nSigned-off-by: Shane McDonald \u003cmcdonald.shane@gmail.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "9fd1e8f92ad17b3bc94245fee9b4e4bfea0dba0e", "tree": "6e44bd5e4046b2161a404e8786633ddf34172e19", "parents": [ "8d42b524f4323cdf49872fe5e3a0e824f32feb51" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Thu Apr 23 17:41:10 2009 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri May 29 14:00:21 2009 +0100" }, "message": "mtd: Add armflash support for multiple blocks of flash\n\nThis patch adds MTD concatenation support to integrator-flash.c for\nplatforms with more than one block of flash memory (e.g. RealView\nPB11MPCore). The implementation is based on the sa1100-flash.c one.\n\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nAcked-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "8d42b524f4323cdf49872fe5e3a0e824f32feb51", "tree": "998417847b2aee9388bdea6e5277b6b517331d9b", "parents": [ "b90cf6681f4f6263920616e7ca2fd09130e4143a" ], "author": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri May 29 13:57:13 2009 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri May 29 13:57:56 2009 +0100" }, "message": "mtd: DIL/NetPC broken for now\n\nWe\u0027ll fix it up again, but for now I don\u0027t think anyone really cares.\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "ccd93854d44710adaa02cecf0ef5f24ab383dd20", "tree": "4e1f3d835631cec271f6ea7ec19c45b2f5a98925", "parents": [ "15bce40cb3133bcc07d548013df97e4653d363c1" ], "author": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sun Apr 05 07:49:48 2009 -0700" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Tue May 26 16:45:44 2009 +0100" }, "message": "[MTD] Remove mtd-\u003e{suspend,resume} calls from board drivers\n\nNow the MTD core will do this for us, we don\u0027t need to hook it up from\nthe board drivers.\n\nShame we can\u0027t do shutdown from the class too...\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "22ae77bc7ac115b9d518d5cbc13d39317079b2b0", "tree": "574b7af678c0b1ad2c891ac5066292746788ece8", "parents": [ "e379ec7c42343c6b6ef06a98de7c94db41c1423e", "30bbf1406714cf464c56e96e4ad6a291907f5023" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 06 14:56:26 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 06 14:56:26 2009 -0700" }, "message": "Merge git://git.infradead.org/mtd-2.6\n\n* git://git.infradead.org/mtd-2.6: (53 commits)\n [MTD] struct device - replace bus_id with dev_name(), dev_set_name()\n [MTD] [NOR] Fixup for Numonyx M29W128 chips\n [MTD] mtdpart: Make ecc_stats more realistic.\n powerpc/85xx: TQM8548: Update DTS file for multi-chip support\n powerpc: NAND: FSL UPM: document new bindings\n [MTD] [NAND] FSL-UPM: Add wait flags to support board/chip specific delays\n [MTD] [NAND] FSL-UPM: add multi chip support\n [MTD] [NOR] Add device parent info to physmap_of\n [MTD] [NAND] Add support for NAND on the Socrates board\n [MTD] [NAND] Add support for 4KiB pages.\n [MTD] sysfs support should not depend on CONFIG_PROC_FS\n [MTD] [NAND] Add parent info for CAFÉ controller\n [MTD] support driver model updates\n [MTD] driver model updates (part 2)\n [MTD] driver model updates\n [MTD] [NAND] move gen_nand\u0027s probe function to .devinit.text\n [MTD] [MAPS] move sa1100 flash\u0027s probe function to .devinit.text\n [MTD] fix use after free in register_mtd_blktrans\n [MTD] [MAPS] Drop now unused sharpsl-flash map\n [MTD] ofpart: Check name property to determine partition nodes.\n ...\n\nManually fix trivial conflict in drivers/mtd/maps/Makefile\n" }, { "commit": "db99a5523175ba15fef4719c722cea11b94911bb", "tree": "97157a675da7b6d0a0b6a46ad28f9717c5fa4d19", "parents": [ "1b578193af3b94c3d55d9aaf6b53275b1cb59a41" ], "author": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon Apr 06 07:15:42 2009 -0700" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon Apr 06 07:15:42 2009 -0700" }, "message": "[MTD] [NOR] Add device parent info to physmap_of\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "87f39f0493edf7051b1b87c6e9eb7f9a74be8e85", "tree": "d4e3675487c46c36dcacf95ad62ab561cbc33d88", "parents": [ "694bb7fc19c6b87e106f4c85a2707072e2f111a0" ], "author": { "name": "David Brownell", "email": "dbrownell@users.sourceforge.net", "time": "Thu Mar 26 00:42:50 2009 -0700" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Sat Apr 04 14:32:59 2009 +0100" }, "message": "[MTD] support driver model updates\n\nFollow-on patch to the previous driver model patch for the MTD\nframework. This one makes various MTD drivers connect to the\ndriver model tree, so /sys/devices/virtual/mtd/* nodes are no\nlonger present ... mostly drivers used on boards I have handy.\n\nBased on a patch from Kay Sievers.\n\nSigned-off-by: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "f0b1e5892478d5bd683ff01bd95dc7bfc87f8e42", "tree": "3998b297437e88b86a97f82cb032f765f5092eda", "parents": [ "2cf3a11494b15949835ff92a7af15f979ac37bbd" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Sat Mar 28 00:27:03 2009 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Fri Apr 03 10:37:18 2009 +0100" }, "message": "[MTD] [MAPS] move sa1100 flash\u0027s probe function to .devinit.text\n\nA pointer to sa1100_mtd_probe is passed to the core via\nplatform_driver_register and so the function must not disappear when the\n.init sections are discarded. Otherwise (if also having HOTPLUG\u003dy)\nunbinding and binding a device to the driver via sysfs will result in an\noops as does a device being registered late.\n\nAn alternative to this patch is using platform_driver_probe instead of\nplatform_driver_register plus removing the pointer to the probe function\nfrom the struct platform_driver.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCc: Nicolas Pitre \u003cnico@marvell.com\u003e\nCc: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "67a52bb90b515c2a96ec51a3571bcd70a2fadb50", "tree": "415e6bdd27caace2145c3d7f1c38a5af77613cf6", "parents": [ "cd02938a828f4b2098a074afb7454f106f2e8df5" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Thu Apr 02 23:23:43 2009 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Apr 02 23:23:43 2009 +0100" }, "message": "[ARM] fix build-breaking 7a192ec commit\n\nThe commit:\n\n platform driver: fix incorrect use of \u0027platform_bus_type\u0027 with \u0027struct device_driver\u0027\n\ncontains this:\n\n-static int __exit pxa2xx_flash_remove(struct device *dev)\n+static int __exit pxa2xx_flash_remove(struct platform_device *dev)\n...\n- .remove \u003d __exit_p(pxa2xx_flash_remove),\n+ .remove \u003d __devexit_p(pxa2xx_flash_remove),\n\nwhich leads to the following build error:\n\n`pxa2xx_flash_remove\u0027 referenced in section `.data\u0027 of drivers/built-in.o: defined in discarded section `.exit.text\u0027 of drivers/built-in.o\n\nThis is not the only instance of it in this patch - all __exit_p\u0027s\ntouched by this patch have been converted to __devexit_p\u0027s without\nregard to the original function.\n\nLet\u0027s revert this change and, if we are going to convert functions\nto be __devexit/__devinit, lets have that as a _separate_ patch doing\njust that change.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "ed40d0c472b136682b2fcba05f89762859c7374f", "tree": "076b83a26bcd63d6158463735dd34c10bbc591dc", "parents": [ "9e495834e59ca9b29f1a1f63b9f5533bb022ac49", "5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Sat Mar 28 20:29:51 2009 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Mar 28 20:29:51 2009 +0000" }, "message": "Merge branch \u0027origin\u0027 into devel\n\nConflicts:\n\tsound/soc/pxa/pxa2xx-i2s.c\n" }, { "commit": "0c93ea4064a209cdc36de8a9a3003d43d08f46f7", "tree": "ff19952407c523a1349ef56c05993416dd28437e", "parents": [ "bc2fd381d8f9dbeb181f82286cdca1567e3d0def", "e6e66b02e11563abdb7f69dcb7a2efbd8d577e77" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 26 11:17:04 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 26 11:17:04 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (61 commits)\n Dynamic debug: fix pr_fmt() build error\n Dynamic debug: allow simple quoting of words\n dynamic debug: update docs\n dynamic debug: combine dprintk and dynamic printk\n sysfs: fix some bin_vm_ops errors\n kobject: don\u0027t block for each kobject_uevent\n sysfs: only allow one scheduled removal callback per kobj\n Driver core: Fix device_move() vs. dpm list ordering, v2\n Driver core: some cleanup on drivers/base/sys.c\n Driver core: implement uevent suppress in kobject\n vcs: hook sysfs devices into object lifetime instead of \"binding\"\n driver core: fix passing platform_data\n driver core: move platform_data into platform_device\n sysfs: don\u0027t block indefinitely for unmapped files.\n driver core: move knode_bus into private structure\n driver core: move knode_driver into private structure\n driver core: move klist_children into private structure\n driver core: create a private portion of struct device\n driver core: remove polling for driver_probe_done(v5)\n sysfs: reference sysfs_dirent from sysfs inodes\n ...\n\nFixed conflicts in drivers/sh/maple/maple.c manually\n" }, { "commit": "928a726b0e12184729900c076e13dbf1c511c96c", "tree": "f31a7f23c1b511ebb486598cc746786e1821d48c", "parents": [ "8ff64b539bfd998792614481ccb67139b97075ef", "eaeed5d31d8ded02fa0a4b608f57418cc0e65b07" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 26 11:11:23 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 26 11:11:23 2009 -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: (96 commits)\n sh: add support for SMSC Polaris platform\n sh: fix the HD64461 level-triggered interrupts handling\n sh: sh-rtc wakeup support\n sh: sh-rtc invalid time rework\n sh: sh-rtc carry interrupt rework\n sh: disallow kexec virtual entry\n sh: kexec jump: fix for ftrace.\n sh: kexec: Drop SR.BL bit toggling.\n sh: add kexec jump support\n sh: rework kexec segment code\n sh: simplify kexec vbr code\n sh: Flush only the needed range when unmapping a VMA.\n sh: Update debugfs ASID dumping for 16-bit ASID support.\n sh: tlb-pteaex: Kill off legacy PTEA updates.\n sh: Support for extended ASIDs on PTEAEX-capable SH-X3 cores.\n sh: sh7763rdp: Change IRQ number for sh_eth of sh7763rdp\n sh: espt-giga board support\n sh: dma: Make G2 DMA configurable.\n sh: dma: Make PVR2 DMA configurable.\n sh: Move IRQ multi definition of DMAC to defconfig\n ...\n" }, { "commit": "997302259f386bca8fe1db67c50296ca426c438f", "tree": "8003d7e388dbddf723571c389fec7211e8aa59d6", "parents": [ "e63cedb656683739eea2696114bc56888e9bff05" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Wed Mar 25 10:21:35 2009 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Mar 25 10:21:35 2009 +0000" }, "message": "[ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" } ], "next": "61dd7eb876344904aece6b1837da6ea1cbadbc07" }