)]}' { "log": [ { "commit": "2a554736f0d518b7c4d9939c6a6842bffebc7475", "tree": "466ffd550f978b1e066bb9935af456f4db463275", "parents": [ "d15ca3203754359cfe5d18910722d3089b204cc4", "145e5aa269d54e4ea53fdb5e597007bd287fbe49" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 18 13:27:41 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 18 13:27:41 2010 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:\n [IA64] Fix build error: conflicting types for ‘sys_execve’\n" }, { "commit": "145e5aa269d54e4ea53fdb5e597007bd287fbe49", "tree": "f0939ba35a64546ce71a93e1f3f048f0306da509", "parents": [ "3b89f56783a4ef796190ef1192c25e72e0b986b6" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Wed Aug 18 10:17:44 2010 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Wed Aug 18 10:17:44 2010 -0700" }, "message": "[IA64] Fix build error: conflicting types for ‘sys_execve’\n\narch/ia64/kernel/process.c:636: error: conflicting types for ‘sys_execve’\n\ncommit d7627467b7a8dd6944885290a03a07ceb28c10eb\nMake do_execve() take a const filename pointer\n\nMissed the declaration of sys_execve in the ia64 asm/unistd.h (perhaps\nbecause there is no reason for it to be there ... it might be a left over\nfrom the COMPAT code?). Just delete the conflicting version.\n\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "6c8bfb7f7d43602c7f76060253bdaa493cd2e8b8", "tree": "33e4072d5539741e775788eb7dd0ffcf84208d3b", "parents": [ "d9f5d41569731189e519fcee8578fcef5c916978", "5e1c53356d79591b10cdea12e3d5ebace8e7b6fa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 18 09:27:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 18 09:27:10 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:\n m68knommu: include sched.h in ColdFire/SPI driver\n m68knommu: formatting of pointers in printk()\n m68knommu: arch/m68k/include/asm/ide.h fix for nommu\n" }, { "commit": "86ea51d4a27ec79e9da7d2ce0c4a58f1dc4544c0", "tree": "dadb5d86c9f05bdbfe3180c3b307630c08f721b3", "parents": [ "3b89f56783a4ef796190ef1192c25e72e0b986b6", "5c79a5ae23e72fa12f1c7c528f62bf3ea35da0dc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 18 09:26:17 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 18 09:26:17 2010 -0700" }, "message": "Merge branch \u0027merge-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027merge-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi.h: missing kernel-doc notation, please fix\n of: fix missing headers for of_address_to_resource() in MTD and SysACE drivers\n of: Fix missing includes\n ata: update for of_device to platform_device replacement\n microblaze: Fix of: eliminate of_device-\u003enode and dev_archdata-\u003e{of,prom}_node\n microblaze: Fix of/address: Merge all of the bus translation code\n booting-without-of: Remove nonexistent chapters from TOC, fix numbering\n" }, { "commit": "c7484cf467df44c0d478b0412dc01e71fbec7923", "tree": "0710d935671391c343bd66f1e69b843276973a09", "parents": [ "dc6ae5e471425762122bb93310dd46101ccd840d" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Wed Jul 14 22:01:13 2010 +0400" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Aug 18 12:44:31 2010 +1000" }, "message": "m68knommu: formatting of pointers in printk()\n\narch/m68knommu/kernel/process.c: formatting of pointers in printk()\n\nUse %p instead of %08x in printk().\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "dc6ae5e471425762122bb93310dd46101ccd840d", "tree": "b1aafe69e2ae4e432928de2b31eccc3571716e9e", "parents": [ "da5cabf80e2433131bf0ed8993abc0f7ea618c73" ], "author": { "name": "Jate Sujjavanich", "email": "jsujjavanich@syntech-fuelmaster.com", "time": "Mon Jun 07 11:39:30 2010 -0400" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Aug 18 12:44:31 2010 +1000" }, "message": "m68knommu: arch/m68k/include/asm/ide.h fix for nommu\n\nThe arch/m68k/include/asm/ide.h produces errors when the IDE driver is compiled for my 523x uClinux system under kernel. The header makes some redefines of operators not defined in the arch/m68k/include/asm/io_no.h header. There are no separate mmio and iospace defines.\n\nSigned-off-by: Jate Sujjavanich \u003cjsujjavanich@syntech-fuelmaster.com\u003e\nAcked-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "392abeea52db4dc870c0ea41912df8ca60b27d44", "tree": "a2683db754940ea8fb5e4aa78aedbfe2b786b3a4", "parents": [ "472db19ff5729cc9d054d6f87ba5147b21ec0787", "beed5336eba6a5a70c97e9f4bfff525915a25003" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 17 18:36:19 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 17 18:36:19 2010 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:\n vt,console,kdb: preserve console_blanked while in kdb\n vt: fix regression warnings from KMS merge\n arm,kgdb: fix GDB_MAX_REGS no longer used\n kgdb: add missing __percpu markup in arch/x86/kernel/kgdb.c\n kdb: fix compile error without CONFIG_KALLSYMS\n" }, { "commit": "19147d0eb1472eac690a9a708893d4de096bbfcf", "tree": "7d68cc017199365b224c072130e64bfd929f7703", "parents": [ "2a6a432a9ce55876b92f9ea860d7baa05538de16", "86fa04b8742ac681d470786f55e2403ada0075b2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 17 18:14:08 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 17 18:14:08 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n sparc64: Fix atomic64_t routine return values.\n sparc64: Fix rwsem constant bug leading to hangs.\n sparc: Hook up new fanotify and prlimit64 syscalls.\n sparc: Really fix \"console\u003d\" for serial consoles.\n" }, { "commit": "2a6a432a9ce55876b92f9ea860d7baa05538de16", "tree": "f64431e3f5f105ee350831aef6810281d93e10b1", "parents": [ "a7c8962bfbc730a9acc0a635bad0f9628b6e816a", "99c796df94afca5256860dd4760017f1dbb3480c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 17 18:11:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 17 18:11:49 2010 -0700" }, "message": "Merge master.kernel.org:/home/rmk/linux-2.6-arm\n\n* master.kernel.org:/home/rmk/linux-2.6-arm:\n VIDEO: amba clcd: don\u0027t disable an already disabled clock\n ARM: Tighten check for allowable CPSR values\n ARM: 6329/1: wire up sys_accept4() on ARM\n ARM: 6328/1: Build with -fno-dwarf2-cfi-asm\n ARM: 6326/1: kgdb: fix GDB_MAX_REGS no longer used\n" }, { "commit": "d7627467b7a8dd6944885290a03a07ceb28c10eb", "tree": "a18c83468418e878cfb2d44e4310d81b8db84ad7", "parents": [ "da5cabf80e2433131bf0ed8993abc0f7ea618c73" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Aug 17 23:52:56 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 17 18:07:43 2010 -0700" }, "message": "Make do_execve() take a const filename pointer\n\nMake do_execve() take a const filename pointer so that kernel_execve() compiles\ncorrectly on ARM:\n\narch/arm/kernel/sys_arm.c:88: warning: passing argument 1 of \u0027do_execve\u0027 discards qualifiers from pointer target type\n\nThis also requires the argv and envp arguments to be consted twice, once for\nthe pointer array and once for the strings the array points to. This is\nbecause do_execve() passes a pointer to the filename (now const) to\ncopy_strings_kernel(). A simpler alternative would be to cast the filename\npointer in do_execve() when it\u0027s passed to copy_strings_kernel().\n\ndo_execve() may not change any of the strings it is passed as part of the argv\nor envp lists as they are some of them in .rodata, so marking these strings as\nconst should be fine.\n\nFurther kernel_execve() and sys_execve() need to be changed to match.\n\nThis has been test built on x86_64, frv, arm and mips.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nTested-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nAcked-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "86fa04b8742ac681d470786f55e2403ada0075b2", "tree": "956d792b6a5b8a5e19bceab8e971339eded60d54", "parents": [ "ef201bebe5afc91a2b99b45dacc8c6dd88ca9e58" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 17:12:04 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 17:12:04 2010 -0700" }, "message": "sparc64: Fix atomic64_t routine return values.\n\nShould return \u0027long\u0027 instead of \u0027int\u0027.\n\nThanks to Dimitris Michailidis and Tony Luck.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ef201bebe5afc91a2b99b45dacc8c6dd88ca9e58", "tree": "08b1a29f9110325e335cebe6cb88fd4f46f038ad", "parents": [ "8e8073a449b2e00641c095ad55bd56f43468daf9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 17:09:53 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 17:09:53 2010 -0700" }, "message": "sparc64: Fix rwsem constant bug leading to hangs.\n\nAs noticed by Linus, it is critical that some of the\nrwsem constants be signed. Yet, hex constants are\nunsigned unless explicitly casted or negated.\n\nThe most critical one is RWSEM_WAITING_BIAS.\n\nThis bug was exacerbated by commit\n424acaaeb3a3932d64a9b4bd59df6cf72c22d8f3 (\"rwsem: wake queued readers\nwhen writer blocks on active read lock\")\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f1ca09b2b5c9dd3988c61818a7d621b1400e4f0c", "tree": "2a54bbcc450aa1269fe33c30f6a9316e585939c3", "parents": [ "60652d07a028595df5c2582e915325d643a3800d" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Aug 16 23:44:49 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Aug 16 23:44:49 2010 -0600" }, "message": "of: Fix missing includes\n\nThis patch fixes missing includes from a number of .c files because\nthe code (wrongfully) depended on prom.h including them. The include\nof linux/of_address.h was removed in microblaze prom.h in commit\n\"of/address: Clean up function declarations\" (sha1 id 22ae782f8), but\nnot fixed in some callers. This patch fixes them up.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nTested-by: Michal Simek \u003cmonstr@monstr.eu\u003e\n" }, { "commit": "8e8073a449b2e00641c095ad55bd56f43468daf9", "tree": "7ac24dbc88d51a19745230be5c915206d20387d0", "parents": [ "300a103d1504134f8c4a7e831f995e917ea9b1e4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 15:04:29 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 15:04:29 2010 -0700" }, "message": "sparc: Hook up new fanotify and prlimit64 syscalls.\n\nThe only tricky bit is the compat version of fanotify_mark, which\nwhich on 32-bit the 64-bit mark argument is passed in as \"high32\",\n\"low32\".\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "300a103d1504134f8c4a7e831f995e917ea9b1e4", "tree": "7f94d5fff513d132bd0b57a9e3bd96c4cc80d707", "parents": [ "0a492896ac07336c98f37ad7fab4a6387b6ada78", "da5cabf80e2433131bf0ed8993abc0f7ea618c73" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 14:09:34 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 14:09:34 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n" }, { "commit": "787ea1c5811b11124d28c8d85f483c4cd37f5c58", "tree": "bb9f3ae74b74524831af9a5f0caeeadf2d1ba3cc", "parents": [ "8c8aefce934dc45de641fe78d48ff1b7722d826a" ], "author": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Mon Aug 16 15:58:30 2010 -0500" }, "committer": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Mon Aug 16 15:58:30 2010 -0500" }, "message": "arm,kgdb: fix GDB_MAX_REGS no longer used\n\nAccording to commit 22eeef4bb2a7fd225089c0044060ed1fbf091958\n\n kgdb,arm: Individual register get/set for arm\n\nIt\u0027s now replaced by DBG_MAX_REG_NUM.\n\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\n" }, { "commit": "8c8aefce934dc45de641fe78d48ff1b7722d826a", "tree": "a48c66e5c7856a5bd24726ac5989e00c6cb8b1e2", "parents": [ "b590cddfa6f40447158323b43a13cdae01d9a051" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Sat Aug 07 11:00:59 2010 -0700" }, "committer": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Mon Aug 16 15:58:30 2010 -0500" }, "message": "kgdb: add missing __percpu markup in arch/x86/kernel/kgdb.c\n\nbreakinfo-\u003epev is a pointer to percpu pointer but was missing __percpu markup.\nAdd it.\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\n" }, { "commit": "088ab302f23bfc8abfaada32506d02d64a637b23", "tree": "e98e914cd497e530580638d642d296cf2653a750", "parents": [ "a8dcb878b628203f917c50b0268bba7fd146d9c0" ], "author": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Mon Aug 16 10:31:54 2010 +0200" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Aug 16 14:55:48 2010 -0600" }, "message": "microblaze: Fix of: eliminate of_device-\u003enode and dev_archdata-\u003e{of,prom}_node\n\nCommit 58f9b0b02414062eaff46716bc04b47d7e79add5 should\ncontain this fix too.\n\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "a8dcb878b628203f917c50b0268bba7fd146d9c0", "tree": "848d0f0f3d66947ecdb320ab53fba40dfd1a7064", "parents": [ "b9e0ba8114583b0462cfb18b4ca01fc82894c5c0" ], "author": { "name": "Michal Simek", "email": "monstr@monstr.eu", "time": "Mon Aug 16 10:31:53 2010 +0200" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Aug 16 14:55:46 2010 -0600" }, "message": "microblaze: Fix of/address: Merge all of the bus translation code\n\nCommit dbbdee94734bf6f1db7af42008a53655e77cab8f removed\nof_irq_pci_swizzle but didn\u0027t use pci_swizzle_interrupt_pin\ninstead.\n\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "0a492896ac07336c98f37ad7fab4a6387b6ada78", "tree": "ae2f18d5113a5443b223239963790daefcc394d5", "parents": [ "2dc4ec5de039d5db4805dff170ab80f4e990e977" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 15 00:26:14 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 12:26:09 2010 -0700" }, "message": "sparc: Really fix \"console\u003d\" for serial consoles.\n\nIf a video head and keyboard are hooked up, specifying \"console\u003dttyS0\"\nor similar to use a serial console will not work properly.\n\nThe key issue is that we must register all serial console capable\ndevices with register_console(), otherwise the command line specified\ndevice won\u0027t be found. The sun serial drivers would only register\nthemselves as console devices if the OpenFirmware specified console\ndevice node matched. To fix this part we now unconditionally get\nthe serial console register by setting serial_drv-\u003econs always.\n\nSecondarily we must not add_preferred_console() using the firmware\nprovided console setting if the user gaven an override on the kernel\ncommand line using \"console\u003d\" The \"primary framebuffer\" matching\nlogic was always triggering o n openfirmware device node match, make\nit not when a command line override was given.\n\nReported-by: Frans Pop \u003celendil@planet.nl\u003e\nTested-by: Frans Pop \u003celendil@planet.nl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2245ba2a3a975656bb303dfaa115accaa4667083", "tree": "cbeb348c43d58461d851907373c34a7b9a985e41", "parents": [ "e2e96c663639a3361bb1a84e666887d308c6c87e", "95ee46aa8698f2000647dfb362400fadbb5807cf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 15 17:37:07 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 15 17:37:07 2010 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:\n gcc-4.6: ACPI: fix unused but set variables in ACPI\n ACPI thermal: make procfs I/F depend on CONFIG_ACPI_PROCFS\n ACPI video: make procfs I/F depend on CONFIG_ACPI_PROCFS\n ACPI processor: remove deprecated ACPI procfs I/F\n ACPI power_resource: remove unused procfs I/F\n ACPI: remove deprecated ACPI procfs I/F\n ACPI: introduce drivers/acpi/sysfs.c\n ACPI: introduce module parameter acpi.aml_debug_output\n ACPI: introduce drivers/acpi/debugfs.c\n ACPI, APEI, ERST debug support\n ACPI, APEI, Manage GHES as platform devices\n ACPI, APEI, Rename CPER and GHES severity constants\n ACPI, APEI, Fix a typo of error path of apei_resources_request\n ACPI / ACPICA: Fix reference counting problems with GPE handlers\n ACPI: Add the check of ADR flag in course of finding ACPI handle for PCI device\n ACPI / Sleep: Drop acpi_suspend_finish()\n ACPI / Sleep: Consolidate suspend and hibernation routines\n ACPI / Wakeup: Simplify enabling of wakeup devices\n ACPI / Sleep: Rework enabling wakeup devices\n ACPI / Sleep: Free NVS copy if suspending of devices fails\n\nFixed up totally buggered \"ACPI: fix unused but set variables in ACPI\"\npatch that doesn\u0027t even compile in the merge.\n\nThanks to Sedat Dilek \u003csedat.dilek@googlemail.com\u003e for noticing the\nbreakage before I even pulled. And a big \"Grrr..\" at Len for not even\nbothering to compile the tree before asking me to pull.\n" }, { "commit": "7355a5a654ccbbfd2fd11bb1e2389910f786ea92", "tree": "a1aa0b16bab51f8c5c505fe237d3ba6ba20b88aa", "parents": [ "7a1b29a82ba76427de791098c095ce31dab9333d", "84c4f46d9c0bd67b763b01a6b4c86dcfde6c818a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 15 17:32:47 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 15 17:32:47 2010 -0700" }, "message": "Merge git://git.infradead.org/mtd-2.6\n\n* git://git.infradead.org/mtd-2.6:\n mtd/nand_ids: Fix buswidth\n mtd/m25p80: fix test for end of loop\n mtd/m25p80: retlen is never NULL\n MIPS: Fix gen_nand probe structures contents\n gen_nand: Test if nr_chips field is valid\n BFIN: Fix gen_nand probe structures contents\n nand/denali: move all hardware initialization work to denali_hw_init\n nand/denali: Add a page check in denali_read_page \u0026 denali_read_page_raw\n nand/denali: use cpu_relax() while waiting for hardware interrupt\n nand/denali: change read_status function method\n nand/denali: Fixed check patch warnings\n ARM: Fix gen_nand probe structures contents\n mtd/nand_base: fix kernel-doc warnings \u0026 typos\n nand/denali: use dev_xx debug function to replace nand_dbg_print and some printk\n nand/denali: Fixed handle ECC error bugs\n nand/denali: use iowrite32() to replace denali_write32()\n nand/denali: Fixed probe function bugs\n" }, { "commit": "7a1b29a82ba76427de791098c095ce31dab9333d", "tree": "077a1563ce243b6ac619397a0b7904623a28de50", "parents": [ "d7824370e26325c881b665350ce64fb0a4fde24a", "a5854dd7f30c3849edf9b9711362e2dd51d3f855" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 15 17:31:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 15 17:31:43 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:\n arch/tile: don\u0027t validate CROSS_COMPILE needlessly\n arch/tile: export only COMMAND_LINE_SIZE to userspace.\n arch/tile: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN\n arch/tile: Rename the hweight() implementations to __arch_hweight()\n arch/tile: extend syscall ABI to set r1 on return as well.\n arch/tile: Various cleanups.\n arch/tile: support backtracing on TILE-Gx\n arch/tile: Fix a couple of issues with the COMPAT code for TILE-Gx.\n arch/tile: Use separate, better minsec values for clocksource and sched_clock.\n arch/tile: correct a bug in freeing bootmem by VA for the optional second initrd.\n arch: tile: mm: pgtable.c: Removed duplicated #include\n arch: tile: kernel/proc.c Removed duplicated #include\n Add fanotify syscalls to \u003casm-generic/unistd.h\u003e.\n arch/tile: support new kunmap_atomic() naming convention.\n tile: remove unused ISA_DMA_THRESHOLD define\n\nConflicts in arch/tile/configs/tile_defconfig (pick the mainline version\nwith the reduced defconfig).\n" }, { "commit": "41e2e8fd34fff909a0e40129f6ac4233ecfa67a9", "tree": "46dd3fe7a0a2ecb12325f4af96d2aedb3ff7835e", "parents": [ "21d93e2e29722d7832f61cc56d73fb953ee6578e" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Aug 13 23:33:46 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Aug 15 22:04:24 2010 +0100" }, "message": "ARM: Tighten check for allowable CPSR values\n\nReviewed-by: Arve Hjønnevåg \u003carve@android.com\u003e\nAcked-by: Dima Zavin \u003cdima@android.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "21d93e2e29722d7832f61cc56d73fb953ee6578e", "tree": "adf54ddd1079e7903b8e53edac5c2fbb8bfaf445", "parents": [ "bd365591dfb942d1447b8043e21e8ff112630db4" ], "author": { "name": "Mikael Pettersson", "email": "mikpe@it.uu.se", "time": "Sun Aug 15 10:47:23 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Aug 15 22:04:23 2010 +0100" }, "message": "ARM: 6329/1: wire up sys_accept4() on ARM\n\nsys_accept4() was added in kernel 2.6.28, but ARM was not updated\nto include it. The number and types of parameters is such that\nno ARM-specific processing is needed, so wiring up sys_accept4()\njust requires defining __NR_accept4 and adding a direct call in\nthe syscall entry table.\n\nTested with an EABI 2.6.35 kernel and Ulrich Drepper\u0027s original\naccept4() test program, modified to define __NR_accept4 for ARM.\n\nUsing the updated unistd.h also eliminates a warning then building\nglibc (2.10.2 and newer) about accept4() being unimplemented.\n\nSigned-off-by: Mikael Pettersson \u003cmikpe@it.uu.se\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "a5854dd7f30c3849edf9b9711362e2dd51d3f855", "tree": "e4e84e168eab39fa7e8bdd943447ea241ce6979a", "parents": [ "3b3c1b9d04db2ac925818c3cff677f5353c0b559" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Sun Aug 15 15:01:45 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Sun Aug 15 16:14:07 2010 -0400" }, "message": "arch/tile: don\u0027t validate CROSS_COMPILE needlessly\n\nWith this change, the arch/tile Makefile will only check for a valid\ncombination of CROSS_COMPILE vs \"uname -m\" for a few common targets\nthat are typically the ones we get wrong (vmlinux, all, and modules).\nThe change handles the case of an empty \"make\" goal like \"make all\".\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nReviewed-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "3b3c1b9d04db2ac925818c3cff677f5353c0b559", "tree": "a9dd552ad393a9e65ab82eb1cf69d7236f52134c", "parents": [ "b3ae98ab8217a8621859e1d9cbf3ee6c4c19533b" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Sun Aug 15 12:14:41 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Sun Aug 15 12:14:41 2010 -0400" }, "message": "arch/tile: export only COMMAND_LINE_SIZE to userspace.\n\nThis fixes a failure in \"make headers_check\" for tile.\nI hadn\u0027t realized this file was exported to userspace by default.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\n" }, { "commit": "b3ae98ab8217a8621859e1d9cbf3ee6c4c19533b", "tree": "dfab5358562d26fcdf9924346cde822252ec3192", "parents": [ "947e7dc1aed0532478e10988328bfd7426e0c2bd" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 20:43:39 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Sun Aug 15 11:05:33 2010 -0400" }, "message": "arch/tile: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN\n\nSee commit a6eb9fe105d5de0053b261148cee56c94b4720ca.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nAcked-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\n" }, { "commit": "95ee46aa8698f2000647dfb362400fadbb5807cf", "tree": "e5a05c7297f997e191c73091934e42e3195c0e40", "parents": [ "cfa806f059801dbe7e435745eb2e187c8bfe1e7f", "92fa5bd9a946b6e7aab6764e7312e4e3d9bed295" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Aug 15 01:06:31 2010 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Aug 15 01:06:31 2010 -0400" }, "message": "Merge branch \u0027linus\u0027 into release\n\nConflicts:\n\tdrivers/acpi/debug.c\n\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "bd365591dfb942d1447b8043e21e8ff112630db4", "tree": "0c4336455cf1eef0d46e05ff49e445cc8a57f650", "parents": [ "2f174847b0fdd4eb9f482030a284db24aef7a97f" ], "author": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Sat Aug 14 23:56:21 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Aug 14 23:58:43 2010 +0100" }, "message": "ARM: 6328/1: Build with -fno-dwarf2-cfi-asm\n\nCommit d0679c7 restricted this workaround to powerpc only, but it turns\nout that ARM needs it as well. Fixes\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d16310 .\n\nReported-and-Tested-by: Robert Nelson \u003crobertcnelson@gmail.com\u003e\nAcked-by: Mikael Pettersson \u003cmikpe@it.uu.se\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "8b1bb90701f9a51f10ce8a990bcc1e237cb3b1c7", "tree": "20607f7e67bf9bceab68e5b91030231de993ff51", "parents": [ "7cfddeef357aac78179ea804b11cffb5fbba8288" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 22:05:58 2010 +0200" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 22:26:53 2010 +0200" }, "message": "defconfig reduction\n\nUse the defconfig files generated by \"make savedefconfig\" for\nremaining defconfig files.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "bf56fba6703592149e1bcd19220c60eb42dff9b7", "tree": "45908384005037b96ef4561345ded09da1798f14", "parents": [ "60641aa1f379820e99ac7f45a38b43795670c741" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 10:20:19 2010 +0200" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 22:26:51 2010 +0200" }, "message": "archs: replace unifdef-y with header-y\n\nunifdef-y and header-y have same semantic, so drop unifdef-y\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "bbbfb910d14988963fbc0b3fc5fc460daf21bf24", "tree": "d06629217c7b91f678ef821295f133c0ef6781fa", "parents": [ "d0a0c28cf178943afaf22f87957b73c47497cb4b", "a739260d4e3d88c5c810b14231dbdce73665b0b2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 14 11:59:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 14 11:59:44 2010 -0700" }, "message": "Merge branch \u0027for-linus/samsung-2635\u0027 of git://git.fluff.org/bjdooks/linux\n\n* \u0027for-linus/samsung-2635\u0027 of git://git.fluff.org/bjdooks/linux:\n DMAENGINE: correct PL080 register header file\n ARM: SAMSUNG: Fix on build warning about dependency in Kconfig\n ARM: SMDK6410: Make virtual screen twice depth of real\n ARM: S3C64XX: Update consistent DMA size to 8MiB\n ARM: S3C64XX: Add audio support to SmartQ\n ARM: S3C64XX: Framebuffer fix for SmartQ5\n ARM: S3C64XX: Set wifi and iNAND as permanently connected SD devices on SmartQ boards\n ARM: S3C64XX: Move SmartQ LCD control platform definition to shared file\n ARM: mach-real6410: add sdhc device support\n ARM: mach-real6410: add dm9000 ethernet support for mach-real6410\n ARM: S3C64XX: Support for Real6410\n\nFix up trivial conflicts in arch/arm/mach-s3c64xx/mach-smartq5.c\n(\"remove pixclock\" vs \"Framebuffer fix for SmartQ5\")\n" }, { "commit": "d0a0c28cf178943afaf22f87957b73c47497cb4b", "tree": "c07ee70a42bdf046d0ce8540b4e86d2c16f05b6c", "parents": [ "ce00f7feb0a497b4280e1efe16e03728ed292687", "f6e1901c4c596238abe6735bb20593f2734f757e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 14 11:57:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 14 11:57:54 2010 -0700" }, "message": "Merge branch \u0027for-linus/i2c-2636\u0027 of git://git.fluff.org/bjdooks/linux\n\n* \u0027for-linus/i2c-2636\u0027 of git://git.fluff.org/bjdooks/linux:\n i2c/nuc900: add i2c driver support for nuc900\n i2c: Enable NXP LPC support in Kconfig\n i2c-pxa: fix compiler warning, due to missing const\n i2c: davinci: bus recovery procedure to clear the bus\n i2c: davinci: Add cpufreq support\n i2c: davinci: Add suspend/resume support\n i2c: davinci: Add helper functions for power management\n i2c: davinci: misc. cleanups: remove MOD_REG_BIT and IO_ADDRESS usage\n i2c: davinci: Fix smbus Oops with AIC33 usage\n" }, { "commit": "a739260d4e3d88c5c810b14231dbdce73665b0b2", "tree": "352aeed2d9dad32503eb465eee450e048e309576", "parents": [ "d92342df2a06baa8f5d7bf609b0bc0dc87067e82", "001ca74f185f32bd8383146f9ffedd2de9b882ed" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Sat Aug 14 16:34:38 2010 +0100" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Sat Aug 14 16:34:38 2010 +0100" }, "message": "Merge branch \u0027for-2636/s3c64xx\u0027 into for-linus/samsung-2635\n" }, { "commit": "d92342df2a06baa8f5d7bf609b0bc0dc87067e82", "tree": "d18b12db1293ae9cb3b6df6388d8ea1625d0ed93", "parents": [ "2d4a3b76cfc061eedec7f510e14ddc3b9399a741" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Mon Aug 09 12:47:52 2010 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Sat Aug 14 16:29:55 2010 +0100" }, "message": "DMAENGINE: correct PL080 register header file\n\nThis PL008 among all other variables named PL080 doesn\u0027t seem\nright. Fix it. Also add some missing defined that I use in the\nnew PL08x driver.\n\nAcked-by: Ben Dooks \u003cben-linux@fluff.org\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "2d4a3b76cfc061eedec7f510e14ddc3b9399a741", "tree": "5e2291ed1d3031c1d86df9485a2193681ff4c67e", "parents": [ "45d7f32c7a43cbb9592886d38190e379e2eb2226" ], "author": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Fri Aug 13 14:38:52 2010 +0900" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Sat Aug 14 16:27:40 2010 +0100" }, "message": "ARM: SAMSUNG: Fix on build warning about dependency in Kconfig\n\nThis patch fixes on following build warning.\n\nwarning: (PLAT_S5P \u0026\u0026 (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PC100 ||\n\t ARCH_S5PV210 || ARCH_S5PV310) || ARCH_S3C64XX \u0026\u0026 \u003cchoice\u003e)\n\t selects PLAT_SAMSUNG which has unmet direct dependencies\n\t (ARCH_S3C2410 || ARCH_S3C24A0 || ARCH_S3C64XX)\n\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "001ca74f185f32bd8383146f9ffedd2de9b882ed", "tree": "d99d9174d4e1f77a77b4e114f688a42753b8d834", "parents": [ "46d0ad37838016e1f7c2cd46ebceb1976e3a3236" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Mon Jul 26 10:56:40 2010 +0100" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Sat Aug 14 16:24:33 2010 +0100" }, "message": "ARM: SMDK6410: Make virtual screen twice depth of real\n\nFor situations where double buffering is needed (such as the\ncurrent Android) make the screen virtual y size twice the\nLCD size so that there is space for a second screen that\ncan be switched to.\n\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "46d0ad37838016e1f7c2cd46ebceb1976e3a3236", "tree": "efa8de481f1bec777e55617b60fcb2ca673c1b48", "parents": [ "4e13c0ea2ca076068fa2dff20709434d6f41e1ce" ], "author": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Mon Jul 26 10:54:00 2010 +0100" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Sat Aug 14 16:24:15 2010 +0100" }, "message": "ARM: S3C64XX: Update consistent DMA size to 8MiB\n\nChange the area available for consitent DMA allocations from the\ndefault to 8MiB to allow drivers such as the framebuffer to get\nmore memory (for situations where larger virtual screen resolutions\nare needed).\n\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "4e13c0ea2ca076068fa2dff20709434d6f41e1ce", "tree": "abd30391b0e88d44ba491871a39ed772d3f35b99", "parents": [ "08ee000b51fc8a4b5e88c478a860f4a689be20b5" ], "author": { "name": "Maurus Cuelenaere", "email": "mcuelenaere@gmail.com", "time": "Fri Aug 13 21:17:59 2010 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Sat Aug 14 16:16:28 2010 +0100" }, "message": "ARM: S3C64XX: Add audio support to SmartQ\n\nThis adds the I²C board information for the WM8987 used in the SmartQ as audio\ncodec and adds the I²C/I²S platform drivers.\n\nSigned-off-by: Maurus Cuelenaere \u003cmcuelenaere@gmail.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "08ee000b51fc8a4b5e88c478a860f4a689be20b5", "tree": "5c5f1b40f8eb7541f4a998a7136f32f39398e0f3", "parents": [ "eeda5fcb4fa13c7f9b76cb872f561bdba08ca6fd" ], "author": { "name": "Patrick Georgi", "email": "mcuelenaere@gmail.com", "time": "Fri Aug 13 21:17:56 2010 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Sat Aug 14 16:15:56 2010 +0100" }, "message": "ARM: S3C64XX: Framebuffer fix for SmartQ5\n\nThe following change makes the framebuffer work on SmartQ5. There are\nstill some problems with ADC, so this patch alone won\u0027t make the device\nrun (or even give a working fb), but it\u0027s one issue less to think about.\n\nSigned-off-by: Patrick Georgi \u003cpatrick@georgi-clan.de\u003e\nSigned-off-by: Maurus Cuelenaere \u003cmcuelenaere@gmail.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "eeda5fcb4fa13c7f9b76cb872f561bdba08ca6fd", "tree": "9a9e571df6f660060191a32fbd934e9c308be910", "parents": [ "49f91b9ed14f6c2dd90d99c65a2ab47bd93652b1" ], "author": { "name": "Maurus Cuelenaere", "email": "mcuelenaere@gmail.com", "time": "Fri Aug 13 21:17:54 2010 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Sat Aug 14 16:13:23 2010 +0100" }, "message": "ARM: S3C64XX: Set wifi and iNAND as permanently connected SD devices on SmartQ boards\n\nThis patch changes the platform data definitions of the wifi and iNAND chip on\nthe SmartQ 5 and 7 to indicate that they don\u0027t have a CD line available and are\nthus hard-wired to the SDHCI data lines.\n\nSigned-off-by: Maurus Cuelenaere \u003cmcuelenaere@gmail.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "49f91b9ed14f6c2dd90d99c65a2ab47bd93652b1", "tree": "645b41420616623f4113de7a5ad40074d0eccf47", "parents": [ "ce611d7b98eec03b2b1036ac55b7604b268154d8" ], "author": { "name": "Maurus Cuelenaere", "email": "mcuelenaere@gmail.com", "time": "Fri Aug 13 21:17:52 2010 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Sat Aug 14 16:13:06 2010 +0100" }, "message": "ARM: S3C64XX: Move SmartQ LCD control platform definition to shared file\n\nThis shares the common LCD control platform definition used in the SmartQ 5 and\n7. This also corrects it as a GPIO bitbanged SPI device instead of an I²C one,\nwhich was wrong.\n\nSigned-off-by: Maurus Cuelenaere \u003cmcuelenaere@gmail.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "ce611d7b98eec03b2b1036ac55b7604b268154d8", "tree": "a2d69447e660a86e7e32193b1fb23bfd96714d01", "parents": [ "ff266c0c91942cf56b03675ac5fc820b1ac600e1" ], "author": { "name": "Darius Augulis", "email": "augulis.darius@gmail.com", "time": "Mon Aug 02 01:39:25 2010 +0300" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Sat Aug 14 16:10:23 2010 +0100" }, "message": "ARM: mach-real6410: add sdhc device support\n\nRegister SHDCI devices\n\nSigned-off-by: Darius Augulis \u003caugulis.darius@gmail.com\u003e\n[ben-linux@fluff.org: rewrite header[\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "ff266c0c91942cf56b03675ac5fc820b1ac600e1", "tree": "3bd8a4377fc705753b788a37122cb18311fd34a8", "parents": [ "eab5cfa065c94389b72d84670b6197ae60ccb235" ], "author": { "name": "Darius Augulis", "email": "augulis.darius@gmail.com", "time": "Sun Aug 01 23:38:43 2010 +0300" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Sat Aug 14 16:10:23 2010 +0100" }, "message": "ARM: mach-real6410: add dm9000 ethernet support for mach-real6410\n\nThis patch is based on \"[PATCH v2] Support for Real6410\"\n\nSigned-off-by: Darius Augulis \u003caugulis.darius@gmail.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "eab5cfa065c94389b72d84670b6197ae60ccb235", "tree": "38af4323f248c075a4ba3cd6284e653fcd8f1a5a", "parents": [ "45d7f32c7a43cbb9592886d38190e379e2eb2226" ], "author": { "name": "Darius Augulis", "email": "augulis.darius@gmail.com", "time": "Wed Jul 28 23:03:43 2010 +0300" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Sat Aug 14 16:10:22 2010 +0100" }, "message": "ARM: S3C64XX: Support for Real6410\n\nAdd support for CoreWind Real6410 board, based on Samsung s3c6410 processor.\n\nSigned-off-by: Darius Augulis \u003caugulis.darius@gmail.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "2f174847b0fdd4eb9f482030a284db24aef7a97f", "tree": "230ec36c5dc4865bcbbae4a7f0195e8794e3a773", "parents": [ "92fa5bd9a946b6e7aab6764e7312e4e3d9bed295" ], "author": { "name": "eric miao", "email": "eric.y.miao@gmail.com", "time": "Thu Aug 12 16:43:00 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Aug 14 09:28:35 2010 +0100" }, "message": "ARM: 6326/1: kgdb: fix GDB_MAX_REGS no longer used\n\nAccording to commit 22eeef4bb2a7fd225089c0044060ed1fbf091958\n\n kgdb,arm: Individual register get/set for arm\n\nIt\u0027s now replaced by DBG_MAX_REG_NUM.\n\nCc: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "92fa5bd9a946b6e7aab6764e7312e4e3d9bed295", "tree": "8c0f10ff685126b084cd86da49d07d0b09f62782", "parents": [ "eb3bbf805f8509f03ee479becf8c2f00737e1efb", "a78b2de1e47b66c0f7525057652e99d1592ec77b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 21:23:57 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 21:23:57 2010 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:\n [IA64] Add latest crop of syscalls\n [IA64] Fix 64-bit atomic routines to return \"long\"\n" }, { "commit": "a78b2de1e47b66c0f7525057652e99d1592ec77b", "tree": "61706ac1bfcaef5d3c6486277d62dfa565e35c47", "parents": [ "01d69a82e1d3c938da16bf55aab000672243aa24" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Thu Aug 12 11:56:57 2010 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Fri Aug 13 20:55:51 2010 -0700" }, "message": "[IA64] Add latest crop of syscalls\n\nThree new syscalls for 2.6.36: prlimit64, fanotify_init and\nfanotify_mark. Wire up the ia64 syscall table for them.\n\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "c206d44ffdd539f5f4553e1a92cc7711084c1d3c", "tree": "c2bfef721c91c3f468fb9a52bf69a785e4889128", "parents": [ "83ae170092c8ec4d8a268d93438054e32493ee17", "1d6225e8cc5598f2bc5c992f9c88b1137763e8e1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 18:00:25 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 18:00:25 2010 -0700" }, "message": "Merge branch \u0027x86-uv-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-uv-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, UV: Make kdump avoid stack dumps - fix !CONFIG_KEXEC breakage\n x86, UV: Initialize BAU hub map\n x86, UV: Make kdump avoid stack dumps\n" }, { "commit": "78b148696d380698270a15352bdb733631872aee", "tree": "955fa1d2dbc36fd8d3bbd073206f5f9ae321dd52", "parents": [ "7ec3fa1f4a5c4f9cc3d72983bfd8ac87cae356ab", "3f6c4df7e1f05f2fdb3f20cac9c03f595a72b45d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 17:59:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 17:59:09 2010 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq\n\n* \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:\n [CPUFREQ] acpi-cpufreq: add missing __percpu markup\n" }, { "commit": "947e7dc1aed0532478e10988328bfd7426e0c2bd", "tree": "4bafd2b326b7a86879456bd0496cf8bb9d950a72", "parents": [ "7d72e6fa56c4100b9669efe0044f77ed9eb785a1" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 20:32:41 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 20:45:54 2010 -0400" }, "message": "arch/tile: Rename the hweight() implementations to __arch_hweight()\n\nSee commit 1527bc8b928dd1399c3d3467dd47d9ede210978a.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\n" }, { "commit": "7d72e6fa56c4100b9669efe0044f77ed9eb785a1", "tree": "5e90bf4969809a1ab20b97432b85be20ccfaa1f4", "parents": [ "ba00376b0b13f234d839541a7b36a5bf5c2a4036", "2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 19:59:15 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 19:59:15 2010 -0400" }, "message": "Merge branch \u0027master\u0027 into for-linus\n" }, { "commit": "c7887325230aec47d47a32562a6e26014a0fafca", "tree": "10535943dace59ddb01d3440aa582bc4640e8016", "parents": [ "b84ae4a1401a731ef5fee987c0cb08743838dda7" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Aug 11 11:26:22 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 16:53:13 2010 -0700" }, "message": "Mark arguments to certain syscalls as being const\n\nMark arguments to certain system calls as being const where they should be but\naren\u0027t. The list includes:\n\n (*) The filename arguments of various stat syscalls, execve(), various utimes\n syscalls and some mount syscalls.\n\n (*) The filename arguments of some syscall helpers relating to the above.\n\n (*) The buffer argument of various write syscalls.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "01d69a82e1d3c938da16bf55aab000672243aa24", "tree": "9d9763c1a71e29111cab48632aa8c177a54e63c9", "parents": [ "ad41a1e0cab07c5125456e8d38e5b1ab148d04aa" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Fri Aug 13 16:41:07 2010 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Fri Aug 13 16:41:07 2010 -0700" }, "message": "[IA64] Fix 64-bit atomic routines to return \"long\"\n\nThese have been broken (returning \"int\") since the dawn of\ntime. But there were no users that needed the whole value\nuntil commit\n 424acaaeb3a3932d64a9b4bd59df6cf72c22d8f3\n rwsem: wake queued readers when writer blocks on active read lock\n\nmade this change:\n\n- (rwsem_atomic_update(0, sem) \u0026 RWSEM_ACTIVE_MASK))\n- /* Someone grabbed the sem already */\n+ rwsem_atomic_update(0, sem) \u003c RWSEM_WAITING_BIAS)\n+ /* Someone grabbed the sem for write already */\n\nRWSEM_ACTIVE_MASK is 0xffffffffL, so the old code only looked\nat the low order 32-bits. The new code needs to see all 64 bits.\n\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "ba00376b0b13f234d839541a7b36a5bf5c2a4036", "tree": "9f74c7d7933d969484859365f055b5a77cfc4fd1", "parents": [ "c745a8a11fa1df6078bfc61fc29492ed43f71c2b" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 16:37:00 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 16:37:00 2010 -0400" }, "message": "arch/tile: extend syscall ABI to set r1 on return as well.\n\nUntil now, the tile architecture ABI for syscall return has just been\nthat r0 holds the return value, and an error is only signalled like it is\nfor kernel code, with a negative small number.\n\nHowever, this means that in multiple places in userspace we end up writing\nthe same three-cycle idiom that tests for a small negative number for\nerror. It seems cleaner to instead move that code into the kernel, and\nset r1 to hold zero on success or errno on failure; previously, r1 was\njust zeroed on return from the kernel (to avoid leaking kernel state).\nThis way a single conditional branch after the syscall is sufficient\nto test for the failure case. The number of cycles taken is the same,\nbut the error-checking code is in just one place, so total code size is\nsmaller, and random userspace syscall code is easier to understand.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\n" }, { "commit": "2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8", "tree": "8e54da82410c8e57ff53b3d69d5760ff28bc236f", "parents": [ "1547ac893acbf87738ded0b470e2735fdfba6947", "2041f657aa4dc77afd63bbb34b34ed9476cf9ab9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 10:54:04 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 10:54:04 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6\n\n* \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6:\n [S390] partitions: fix build error in ibm partition detection code\n [S390] appldata: fix dev_get_stats 64 bit conversion\n [S390] wire up prlimit64 and fanotify* syscalls\n [S390] zcrypt: fix Kconfig dependencies\n [S390] sys_personality: follow u_long to unsigned int conversion\n [S390] dasd: fix format string types\n" }, { "commit": "4b17cafaa4cc000a490821db649c5a3bf7ba9671", "tree": "9e6a1ed383be31f7a28ebfee726acf2cc15c377f", "parents": [ "36450e9c953b2a6838def5945de8ae508141e834", "88d89da64951377962334b684634cfc1468aa93f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 10:39:30 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 10:39:30 2010 -0700" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)\n perf: Add back list_head data types\n perf ui hist browser: Fixup key bindings\n perf ui browser: Add ui_browser__show counterpart: __hide\n perf annotate: Cycle thru sorted lines with samples\n perf ui: Make SPACE work as PGDN in all browsers\n perf annotate: Sort by hottest lines in the TUI\n perf ui: Complete the breakdown of util/newt.c\n perf ui: Move hists browser to util/ui/browsers/\n perf symbols: Ignore mapping symbols on ARM\n perf ui: Move map browser to util/ui/browsers/\n perf ui: Move annotate browser to util/ui/browsers/\n perf ui: Move ui_progress routines to separate file in util/ui/\n perf ui: Move ui_helpline routines to separate file in util/ui/\n perf ui: Shorten ui_browser member names\n perf, x86: P4 PMU -- update nmi irq statistics and unmask lvt entry properly\n perf ui: Start breaking down newt.c into multiple files\n perf tui: Introduce list_head based generic ui_browser refresh routine\n perf probe: Fix memory leaks in add_perf_probe_events\n perf probe: Fix to copy the type for raw parameters\n perf report: Speed up exit path\n ...\n" }, { "commit": "36450e9c953b2a6838def5945de8ae508141e834", "tree": "13657a037a6f41bb915f5700a6b590bbe27ea167", "parents": [ "2f2c779583e9646097b57599f8efeb8eca7bd654", "93a7ca0c3ebe5d931126f1fb732cb9c4518383d4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 10:38:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 10:38:37 2010 -0700" }, "message": "Merge branch \u0027x86-uv-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-uv-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, UV: Initialize BAU MMRs only on hubs with cpus\n x86, UV: Modularize BAU send and wait\n x86, UV: BAU broadcast to the local hub\n x86, UV: Correct BAU regular message type\n x86, UV: Remove BAU check for stay-busy\n x86, UV: Correct BAU discovery of hubs and sockets\n x86, UV: Correct BAU software acknowledge\n x86, UV: BAU structure rearranging\n x86, UV: Shorten access to BAU statistics structure\n x86, UV: Disable BAU on network congestion\n x86, UV: BAU tunables into a debugfs file\n x86, UV: Calculate BAU destination timeout\n" }, { "commit": "c029b55af7d6b02b993e8a5add78d062da7a3940", "tree": "eda9177a8d42324927424b3c42a99606ac6a4080", "parents": [ "96054569190bdec375fe824e48ca1f4e3b53dd36", "417484d47e115774745ef025bce712a102b6f86f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 10:35:48 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 10:35:48 2010 -0700" }, "message": "Merge branch \u0027x86/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, asm: Use a lower case name for the end macro in atomic64_386_32.S\n x86, asm: Refactor atomic64_386_32.S to support old binutils and be cleaner\n x86: Document __phys_reloc_hide() usage in __pa_symbol()\n x86, apic: Map the local apic when parsing the MP table.\n" }, { "commit": "96054569190bdec375fe824e48ca1f4e3b53dd36", "tree": "13e249da75a0667e2c9d195e9c125fb14d721e71", "parents": [ "5528f9132cf65d4d892bcbc5684c61e7822b21e9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 09:49:20 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 09:49:20 2010 -0700" }, "message": "x86: don\u0027t send SIGBUS for kernel page faults\n\nIt\u0027s wrong for several reasons, but the most direct one is that the\nfault may be for the stack accesses to set up a previous SIGBUS. When\nwe have a kernel exception, the kernel exception handler does all the\nfixups, not some user-level signal handler.\n\nEven apart from the nested SIGBUS issue, it\u0027s also wrong to give out\nkernel fault addresses in the signal handler info block, or to send a\nSIGBUS when a system call already returns EFAULT.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3f6c4df7e1f05f2fdb3f20cac9c03f595a72b45d", "tree": "3251831521b0af659ce3d991df436ac1507594b8", "parents": [ "320b2b8de12698082609ebbc1a17165727f4c893" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Fri Aug 13 23:00:11 2010 +0900" }, "committer": { "name": "Dave Jones", "email": "davej@redhat.com", "time": "Fri Aug 13 11:11:49 2010 -0400" }, "message": "[CPUFREQ] acpi-cpufreq: add missing __percpu markup\n\nacpi_perf_data is a percpu pointer but was missing __percpu markup.\nAdd it.\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Dave Jones \u003cdavej@redhat.com\u003e\n" }, { "commit": "c745a8a11fa1df6078bfc61fc29492ed43f71c2b", "tree": "2db1cdf9cd0d0e892f4f92de1fd2700ac319f04a", "parents": [ "1fcbe027b5d29ec9cd0eeb753c14fb366ae852ac" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 08:52:19 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 08:52:19 2010 -0400" }, "message": "arch/tile: Various cleanups.\n\nThis change rolls up random cleanups not representing any actual bugs.\n\n- Remove a stale CONFIG_ value from the default tile_defconfig\n- Remove unused tns_atomic_xxx() family of methods from \u003casm/atomic.h\u003e\n- Optimize get_order() using Tile\u0027s \"clz\" instruction\n- Fix a bad hypervisor upcall name (not currently used in Linux anyway)\n- Use __copy_in_user_inatomic() name for consistency, and export it\n- Export some additional hypervisor driver I/O upcalls and some homecache calls\n- Remove the obfuscating MEMCPY_TEST_WH64 support code\n- Other stray comment cleanups, #if 0 removal, etc.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\n" }, { "commit": "1fcbe027b5d29ec9cd0eeb753c14fb366ae852ac", "tree": "b0d80646567ac71238cf2ffb33e29ad33d758816", "parents": [ "32020effaf713c0c669864301bcd5dac6b9bb9e0" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 08:40:57 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 08:40:57 2010 -0400" }, "message": "arch/tile: support backtracing on TILE-Gx\n\nThis functionality was stubbed out until recently. Now we support our\nnormal backtracing API on TILE-Gx as well as on TILE64/TILEPro.\nThis change includes a tweak to the instruction encoding caused by\nadding addxli for compat mode.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\n" }, { "commit": "32020effaf713c0c669864301bcd5dac6b9bb9e0", "tree": "86bca127e785fe2170bfec548ebc6be549a842b8", "parents": [ "749dc6f252b57d5cb9c1f4c1c4aafe4c92a28207" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 08:32:21 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 08:32:21 2010 -0400" }, "message": "arch/tile: Fix a couple of issues with the COMPAT code for TILE-Gx.\n\nFirst, the siginfo preamble wasn\u0027t quite right; we need to indicate\nthat we are padding up to 4 ints of preamble for 64-bit code, and\nthen for compat mode we need to pad differently, using only 3 ints.\n\nSecond, the C ABI requires a save area of two registers, not two\npointers, since in compat mode we have 64-bit registers all of which\nwe need to save, even though we only have 32-bit VAs.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\n" }, { "commit": "749dc6f252b57d5cb9c1f4c1c4aafe4c92a28207", "tree": "1728f62b00935ecf9ac16bd9e3871f9d0e7ad75c", "parents": [ "bc63de7c5bcc44b0098d09931f69a19e93d8a7ba" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 08:24:22 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 08:24:22 2010 -0400" }, "message": "arch/tile: Use separate, better minsec values for clocksource and sched_clock.\n\nWe were using the same 5-sec minsec for the clocksource and sched_clock\nthat we were using for the clock_event_device. For the clock_event_device\nthat\u0027s exactly right since it has a short maximum countdown time.\nBut for sched_clock we want to avoid wraparound when converting from\nticks to nsec over a much longer window, so we force a shift of 10.\nAnd for clocksource it seems dodgy to use a 5-sec minsec as well, so we\ncopy some other platforms and force a shift of 22.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\n" }, { "commit": "bc63de7c5bcc44b0098d09931f69a19e93d8a7ba", "tree": "7763679472e08b56a403bbcb9dffbc4b53620dcc", "parents": [ "c45c1cd7bf4e997c74407dd29268d41d7adbb257" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 08:23:07 2010 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 08:23:07 2010 -0400" }, "message": "arch/tile: correct a bug in freeing bootmem by VA for the optional second initrd.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\n" }, { "commit": "c45c1cd7bf4e997c74407dd29268d41d7adbb257", "tree": "462c87e6b34f5cca304d16fd6db85b9bed831307", "parents": [ "a6fb72f1e9e9f1905746646fd1e40932336291da" ], "author": { "name": "Andrea Gelmini", "email": "andrea.gelmini@gelma.net", "time": "Wed Aug 11 21:07:35 2010 +0200" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 08:10:24 2010 -0400" }, "message": "arch: tile: mm: pgtable.c: Removed duplicated #include\n\nSigned-off-by: Andrea Gelmini \u003candrea.gelmini@gelma.net\u003e\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\n" }, { "commit": "a6fb72f1e9e9f1905746646fd1e40932336291da", "tree": "883428344ac594e4ca9f2e55d33ff0dc0348fb4c", "parents": [ "fad9e93e5490e1f2c54f5e7c8418952bc55200a1" ], "author": { "name": "Andrea Gelmini", "email": "andrea.gelmini@gelma.net", "time": "Wed Aug 11 21:07:34 2010 +0200" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Fri Aug 13 08:10:16 2010 -0400" }, "message": "arch: tile: kernel/proc.c Removed duplicated #include\n\nSigned-off-by: Andrea Gelmini \u003candrea.gelmini@gelma.net\u003e\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\n" }, { "commit": "e402e38c6b148febf8c3c39546e24584eaa23e42", "tree": "feaea65789054ccaf76496b943a0a9199ce0a276", "parents": [ "b47ac63c7229dd13daf4d7eed806d720f769c526" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Fri Aug 13 10:06:42 2010 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Fri Aug 13 10:06:55 2010 +0200" }, "message": "[S390] appldata: fix dev_get_stats 64 bit conversion\n\nFix this warning:\n\narch/s390/appldata/appldata_net_sum.c: In function \u0027appldata_get_net_sum_data\u0027:\narch/s390/appldata/appldata_net_sum.c:89: warning: initialization from incompatible pointer type\n\nwhich was introduced with be1f3c2c027cc5ad735df6a45a542ed1db7ec48b\n\"net: Enable 64-bit net device statistics on 32-bit architectures\"\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "b47ac63c7229dd13daf4d7eed806d720f769c526", "tree": "0d58d7991f5ae75184a094315b90bb15d963be01", "parents": [ "57a4955f134dcfd7761b5ba6205ffc8e9b0a1da9" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Fri Aug 13 10:06:41 2010 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Fri Aug 13 10:06:54 2010 +0200" }, "message": "[S390] wire up prlimit64 and fanotify* syscalls\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "3a1103703538d164551dc9b5a734a2c8ebcd27ee", "tree": "78cb5db53ac92c2040cceceaca96f9a85a27bfb9", "parents": [ "625c94df22fb4247c8ccd54635a8ec77cb60d651" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Fri Aug 13 10:06:39 2010 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Fri Aug 13 10:06:54 2010 +0200" }, "message": "[S390] sys_personality: follow u_long to unsigned int conversion\n\ncommit 485d527686850d68a0e9006dd9904f19f122485e \"sys_personality: change\nsys_personality() to accept \"unsigned int\" instead of u_long\" changed\nthe syscall interface for sys_personality.\nJust follow the common code change in our arch code to avoid confusion.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "f46a6804135795f77d096ab0128f27531c7d051c", "tree": "7cd33f69e3661327739ae4c96e5a8389e7fc912e", "parents": [ "b3e84ffa21f916e3354a12a7f19169c9febe96d0", "ad41a1e0cab07c5125456e8d38e5b1ab148d04aa" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Aug 12 21:38:56 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Aug 12 21:39:04 2010 +0200" }, "message": "Merge branch \u0027linus\u0027 into perf/urgent\n\nMerge reason: Fix upstream breakage introduced by:\n\n de5d9bf: Move list types from \u003clinux/list.h\u003e to \u003clinux/types.h\u003e.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "1d6225e8cc5598f2bc5c992f9c88b1137763e8e1", "tree": "f9aef5abd49f947175ec038ca416840935ef581e", "parents": [ "c4026cfd8febcd63dd278894108839f30e525a0e" ], "author": { "name": "Cliff Wickman", "email": "cpw@sgi.com", "time": "Mon Aug 09 16:11:22 2010 -0500" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Thu Aug 12 12:23:55 2010 -0700" }, "message": "x86, UV: Make kdump avoid stack dumps - fix !CONFIG_KEXEC breakage\n\nThis replaces Version 1 of this patch, which broke the build when\nCONFIG_KEXEC and CONFIG_CRASH_DUMP were configured off. In that case\nthe storage for the \u0027in_crash_kexec\u0027 flag was never built.\n\nThis version defines that flag as 0 if CONFIG_KEXEC is not set.\nThe patch is tested with all combinations of those two options.\n\nSigned-off-by: Cliff Wickman \u003ccpw@sgi.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nLKML-Reference: \u003cE1OiZcw-0001Hb-2g@eag09.americas.sgi.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "ad41a1e0cab07c5125456e8d38e5b1ab148d04aa", "tree": "2d0757baeb75823a2f0488e9f35b0ca03f975337", "parents": [ "8357422d4bf33bc2c35884d4016c3fc9efbbc1d2", "5272a7534afc5e888e702ca2c6f439a6c62f3752" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:17:19 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:17:19 2010 -0700" }, "message": "Merge branch \u0027io_remap_pfn_range\u0027 of git://www.jni.nu/cris\n\n* \u0027io_remap_pfn_range\u0027 of git://www.jni.nu/cris:\n CRIS: Define io_remap_pfn_range as remap_pfn_range\n" }, { "commit": "ce4327d372af7e2f2d403286e9904ab012e72827", "tree": "aa95c33aa9277d3ecb4d7c46cee13c8b59611c7c", "parents": [ "4032816dca04141e3d49ec4ed717c9f7cc5444c5", "b5d643de3ea28d7844a3a1a00a0a6f50897a2a6b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:07:32 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:07:32 2010 -0700" }, "message": "Merge branch \u0027msm-core\u0027 of git://codeaurora.org/quic/kernel/dwalker/linux-msm\n\n* \u0027msm-core\u0027 of git://codeaurora.org/quic/kernel/dwalker/linux-msm:\n msm: mmc: Add msm prefix to platform data structure\n msm: trout: Remove extern declaration from source file\n arm: msm: Fix section mismatch in smd.c.\n arm: msm: trout add mmc support\n arm: msm: trout: add trout specific gpio interrupts\n arm: msm: remove unused #include \u003clinux/version.h\u003e\n" }, { "commit": "4032816dca04141e3d49ec4ed717c9f7cc5444c5", "tree": "28cd19cff00011f4709e84632a481f1a05f35558", "parents": [ "1c00650c233c404fadf9347329214d55283bd17a", "a3da323420d5aa6f7bd15efc7bf34cd6d19e1f1a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:07:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:07:11 2010 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq\n\n* \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:\n [CPUFREQ] add missing __percpu markup in pcc-cpufreq.c\n" }, { "commit": "26df0766a73a859bb93dc58e747c5028557a23fd", "tree": "4776de567425a7fb66ca9a87228309f9c84de633", "parents": [ "580287628cdd99366b10c9050c4479b387283be8", "a6de51b2787012ba3ab62c7d50df1b749b83d5f0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:01:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:01:59 2010 -0700" }, "message": "Merge branch \u0027params\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\n* \u0027params\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (22 commits)\n param: don\u0027t deref arg in __same_type() checks\n param: update drivers/acpi/debug.c to new scheme\n param: use module_param in drivers/message/fusion/mptbase.c\n ide: use module_param_named rather than module_param_call\n param: update drivers/char/ipmi/ipmi_watchdog.c to new scheme\n param: lock if_sdio\u0027s lbs_helper_name and lbs_fw_name against sysfs changes.\n param: lock myri10ge_fw_name against sysfs changes.\n param: simple locking for sysfs-writable charp parameters\n param: remove unnecessary writable charp\n param: add kerneldoc to moduleparam.h\n param: locking for kernel parameters\n param: make param sections const.\n param: use free hook for charp (fix leak of charp parameters)\n param: add a free hook to kernel_param_ops.\n param: silence .init.text references from param ops\n Add param ops struct for hvc_iucv driver.\n nfs: update for module_param_named API change\n AppArmor: update for module_param_named API change\n param: use ops in struct kernel_param, rather than get and set fns directly\n param: move the EXPORT_SYMBOL to after the definitions.\n ...\n" }, { "commit": "4936a3b90d79dd8775c6ac23c2cf2dcebe29abde", "tree": "ab4fb288fd00bb50b5aebcc93fa476cc2c1d53be", "parents": [ "deda2e81961e96be4f2c09328baca4710a2fd1a0" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Aug 09 14:20:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:53:39 2010 -0700" }, "message": "x86/hpet: Use the FSEC_PER_SEC constant for femto-second periods\n\nThe current computation, introduced with f12a15be63, of FSEC_PER_SEC using\nthe multiplication of (FSEC_PER_NSEC * NSEC_PER_SEC) is performed only\nwith 32bit integers on small machines, resulting in an overflow and a\n*very* short intervals being programmed. An interrupt storm follows.\n\nNote that we also have to specify FSEC_PER_SEC as being long long to\novercome the same limitations.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "95f4572737da469b66ebfd1badd69d9adc340409", "tree": "33bb82e1fb78b343242c187a3525b83e4da6e6ca", "parents": [ "12fdff3fc2483f906ae6404a6e8dcf2550310b6f" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Aug 12 16:55:02 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:51:35 2010 -0700" }, "message": "MN10300: Use no_printk() for disabled gdbstub debugging functions\n\nUse no_printk() for disabled gdbstub debugging functions to maintain side\neffect checking.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "12fdff3fc2483f906ae6404a6e8dcf2550310b6f", "tree": "a79fb1365fce7c7529655a8802d6d6bf8509b374", "parents": [ "1490cf5f0cb07dd49cdab4bceb769d7f711d7ca6" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Aug 12 16:54:57 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:51:35 2010 -0700" }, "message": "Add a dummy printk function for the maintenance of unused printks\n\nAdd a dummy printk function for the maintenance of unused printks through gcc\nformat checking, and also so that side-effect checking is maintained too.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1490cf5f0cb07dd49cdab4bceb769d7f711d7ca6", "tree": "368983c4a0e92467368bb41c2cc326611aa0f31e", "parents": [ "019fca84e7c4b94817abc77df9081ba208fcc46a" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Aug 12 16:54:52 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:51:35 2010 -0700" }, "message": "MN10300: Don\u0027t try and #include \u003clinux/slab.h\u003e in lib/inflate.c from bootloader\n\nDon\u0027t try and #include \u003clinux/slab.h\u003e in lib/inflate.c from the bootloader code\nas linux/slab.h hauls in function defs that aren\u0027t available in the bootloader\ncode and may also haul in conflicting functions.\n\nTo fix this, make the inclusion of linux/slab.h contingent on NO_INFLATE_MALLOC\nas are the usages of kmalloc() and kfree().\n\nIn MN10300, this causes the following errors:\n\nIn file included from include/linux/string.h:21,\n from include/linux/bitmap.h:8,\n from include/linux/nodemask.h:93,\n from include/linux/mmzone.h:16,\n from include/linux/gfp.h:4,\n from include/linux/slab.h:12,\n from arch/mn10300/boot/compressed/../../../../lib/inflate.c:106,\n from arch/mn10300/boot/compressed/misc.c:170:\n/warthog/am33/linux-2.6-mn10300/arch/mn10300/include/asm/string.h:19: error: conflicting types for \u0027memset\u0027\narch/mn10300/boot/compressed/misc.c:59: error: previous definition of \u0027memset\u0027 was here\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3ad001c04f1ad21b87a7648450b53e7f04194f2a", "tree": "7f3212be8095b0fedd3dc19b1267bbc394db48d2", "parents": [ "3557957616412db3f496d75c6baef836f8f55a67" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Aug 12 16:54:41 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:51:35 2010 -0700" }, "message": "MN10300: Fix size_t and ssize_t\n\nWith the newer compilers, size_t and ssize_t are expected to be (un)signed int\nrather than (un)signed long.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3557957616412db3f496d75c6baef836f8f55a67", "tree": "647c155fdc4f23486f5da133369413d857fb4e43", "parents": [ "d4a47ac15487ee855386e414bf51435d83cd1812" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Aug 12 16:54:36 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:51:35 2010 -0700" }, "message": "MN10300: Fix RTC routines\n\nA change to the RTC routines in the MN10300 arch used set_rtc_mms() when it\nmeant set_rtc_mmss(). This results in an error due to a reference of an\nundefined symbol.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a3da323420d5aa6f7bd15efc7bf34cd6d19e1f1a", "tree": "5a426b20876d92f8ba1c212da5eee9cdf7882ba0", "parents": [ "5af568cbd55f60b5a1d174f621b273e4f585dc35" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Sun Aug 08 02:37:23 2010 +0900" }, "committer": { "name": "Dave Jones", "email": "davej@redhat.com", "time": "Thu Aug 12 12:38:06 2010 -0400" }, "message": "[CPUFREQ] add missing __percpu markup in pcc-cpufreq.c\n\npcc_cpu_info is a percpu pointer but was missing __percpu markup.\nAdd it.\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Dave Jones \u003cdavej@redhat.com\u003e\n" }, { "commit": "d4a47ac15487ee855386e414bf51435d83cd1812", "tree": "86700cde504bf6f345da8c76201fe20e785f4337", "parents": [ "aa9f56b66d278aba2f278c75761b7e19fbaca97a", "b680f0979ff571836f3616dfca727b516bcc5d3d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:29:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:29:06 2010 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:\n [IA64] Fix rwsem: RWSEM_WAITING_BIAS must not be unsigned.\n" }, { "commit": "b680f0979ff571836f3616dfca727b516bcc5d3d", "tree": "ac0c90740fdb8de42c91d47fae0ef4c2bf824144", "parents": [ "5af568cbd55f60b5a1d174f621b273e4f585dc35" ], "author": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Thu Aug 12 09:14:56 2010 -0700" }, "committer": { "name": "Tony Luck", "email": "tony.luck@intel.com", "time": "Thu Aug 12 09:14:56 2010 -0700" }, "message": "[IA64] Fix rwsem: RWSEM_WAITING_BIAS must not be unsigned.\n\nSome nice improvements were made to rwsem in commit:\n\n 424acaaeb3a3932d64a9b4bd59df6cf72c22d8f3\n rwsem: wake queued readers when writer blocks on active read lock\n\nbut this change overlooked that ia64 had defined RWSEM_WAITING_BIAS\nas an unsigned value, while the new code required a signed value (as\nit is in every other architecture).\n\nThis fix suggested by the original patch author: Michel Lespinasse.\n\nSigned-off-by: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "58d4ea65b98f154f3326b038eecda32f90b46ea8", "tree": "636aed413349dece12c08a4bd3d1fea0254976d8", "parents": [ "26f0cf91813bdc8e61595f8ad6660251e2ee9cf6", "fbe0f8348fd6c3d016a3f48756eb729b41a67c22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:11:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:11:31 2010 -0700" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6:\n mmc_spi: Fix unterminated of_match_table\n of/sparc: fix build regression from of_device changes\n of/device: Replace struct of_device with struct platform_device\n" }, { "commit": "26f0cf91813bdc8e61595f8ad6660251e2ee9cf6", "tree": "db129d45fba03e3e59392410d0f35ba7d3e438e6", "parents": [ "d862b13bc8cbab9692fbe0ef44c40d0488b81af1", "fe96eb404e33b59bb39f7050205f7c56c1c7d686" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:09:41 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:09:41 2010 -0700" }, "message": "Merge branch \u0027stable/xen-swiotlb-0.8.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/xen-swiotlb-0.8.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n x86: Detect whether we should use Xen SWIOTLB.\n pci-swiotlb-xen: Add glue code to setup dma_ops utilizing xen_swiotlb_* functions.\n swiotlb-xen: SWIOTLB library for Xen PV guest with PCI passthrough.\n xen/mmu: inhibit vmap aliases rather than trying to clear them out\n vmap: add flag to allow lazy unmap to be disabled at runtime\n xen: Add xen_create_contiguous_region\n xen: Rename the balloon lock\n xen: Allow unprivileged Xen domains to create iomap pages\n xen: use _PAGE_IOMAP in ioremap to do machine mappings\n\nFix up trivial conflicts (adding both xen swiotlb and xen pci platform\ndriver setup close to each other) in drivers/xen/{Kconfig,Makefile} and\ninclude/xen/xen-ops.h\n" }, { "commit": "a292dfa01794477126d3f022559eb235edde00b0", "tree": "abc2ca6ec588491e07940ce674b4bac71571d8d7", "parents": [ "17e465034a174d23e08cbb964aeda5e41e5d84ca" ], "author": { "name": "Florian Zumbiehl", "email": "florz@florz.de", "time": "Wed Aug 11 14:17:33 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 08:43:29 2010 -0700" }, "message": "parisc: fix wrong page aligned size calculation in ioremapping code\n\nparisc __ioremap(): fix off-by-one error in page alignment of allocation\nsize for sizes where size%PAGE_SIZE\u003d\u003d1.\n\nSigned-off-by: Florian Zumbiehl \u003cflorz@florz.de\u003e\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nAcked-by: Helge Deller \u003cdeller@gmx.de\u003e\nTested-by: Helge Deller \u003cdeller@gmx.de\u003e\nCc: \"James E.J. Bottomley\" \u003cjejb@parisc-linux.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "17e465034a174d23e08cbb964aeda5e41e5d84ca", "tree": "212dca6a4872d496014a0ead9c34fb7ed885b4bb", "parents": [ "7b958090458e99456b8c1a0f644923b6b9fdd358" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Wed Aug 11 14:17:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 08:43:29 2010 -0700" }, "message": "score: fix dereference of NULL pointer in local_flush_tlb_page()\n\nDon\u0027t dereference vma if it\u0027s NULL.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nCc: Chen Liqin \u003cliqin.chen@sunplusct.com\u003e\nCc: Lennox Wu \u003clennox.wu@gmail.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "417484d47e115774745ef025bce712a102b6f86f", "tree": "2a898b29b691ae0f1617e1189d57abbcbeb7383c", "parents": [ "30246557a06bb20618bed906a06d1e1e0faa8bb4" ], "author": { "name": "Luca Barbieri", "email": "luca@luca-barbieri.com", "time": "Thu Aug 12 07:00:35 2010 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Thu Aug 12 07:04:16 2010 -0700" }, "message": "x86, asm: Use a lower case name for the end macro in atomic64_386_32.S\n\nUse a lowercase name for the end macro, which somehow fixes a binutils 2.16\nproblem.\n\nSigned-off-by: Luca Barbieri \u003cluca@luca-barbieri.com\u003e\nLKML-Reference: \u003ctip-30246557a06bb20618bed906a06d1e1e0faa8bb4@git.kernel.org\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "5272a7534afc5e888e702ca2c6f439a6c62f3752", "tree": "c81c230e66c4561c087861058fd87099b851898c", "parents": [ "f1d23ed8218ca5afaf178a6495253dbb7fc98f57" ], "author": { "name": "Jesper Nilsson", "email": "jesper.nilsson@axis.com", "time": "Thu Aug 12 14:32:58 2010 +0200" }, "committer": { "name": "Jesper Nilsson", "email": "jesper.nilsson@axis.com", "time": "Thu Aug 12 14:32:58 2010 +0200" }, "message": "CRIS: Define io_remap_pfn_range as remap_pfn_range\n\nCRIS don\u0027t need any special mapping for io, but didn\u0027t define this,\nmeaning that all uses of io_remap_pfn_range lead to compile errors.\n\nThis fixes a compile error introduced in CRIS when drivers/mtd/mtdchar.c\nmmap handling was changed in commit dd02b67d5e9e7896891fa27eb5db65f55a290998\n\nSigned-off-by: Jesper Nilsson \u003cjesper.nilsson@axis.com\u003e\n" }, { "commit": "d2b5bbef2198f82280441ab1ea7f634d615d913b", "tree": "0219a9cb3fc5e6f8ac9da256622972f19651ce9b", "parents": [ "01cd2ababddd55a127caa1cd20d570637e0d42e1" ], "author": { "name": "Marek Vasut", "email": "marek.vasut@gmail.com", "time": "Thu Aug 12 03:53:54 2010 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Thu Aug 12 12:22:49 2010 +0100" }, "message": "MIPS: Fix gen_nand probe structures contents\n \nThis platform didn\u0027t properly fill nr_chips in gen_nand\nregistration and therefore depended on gen_nand bug fixed by commit\n81cbb0b17796d81cbd92defe113cf2a7c7a21fbb (\"mtd: gen_nand: fix support for\nmultiple chips\")\n \nSigned-off-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "ef56609f9c7fdf5baa9d9f86f84a7bd8a717cd25", "tree": "1d275a985658ed35bd5303113b311c364025d45c", "parents": [ "5eab6aaaaf0149ada4afd1aebce1978e1cc5a3e7" ], "author": { "name": "Marek Vasut", "email": "marek.vasut@gmail.com", "time": "Thu Aug 12 03:53:54 2010 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Thu Aug 12 12:17:32 2010 +0100" }, "message": "BFIN: Fix gen_nand probe structures contents\n\nThese two platforms didn\u0027t properly fill nr_chips in gen_nand \nregistration and therefore depended on gen_nand bug fixed by by commit\n81cbb0b17796d81cbd92defe113cf2a7c7a21fbb (\"mtd: gen_nand: fix support for\nmultiple chips\")\n\nSigned-off-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "30246557a06bb20618bed906a06d1e1e0faa8bb4", "tree": "26f1493097b00e1cf3fdbf40b4abced115ac219d", "parents": [ "8fd49936a8cac246fc9ed85508556c82cd44cf68" ], "author": { "name": "Luca Barbieri", "email": "luca@luca-barbieri.com", "time": "Fri Aug 06 04:04:38 2010 +0200" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Wed Aug 11 21:03:28 2010 -0700" }, "message": "x86, asm: Refactor atomic64_386_32.S to support old binutils and be cleaner\n\nThe old code didn\u0027t work on binutils 2.12 because setting a symbol to\na register apparently requires a fairly recent version.\n\nThis commit refactors the code to use the C preprocessor instead, and\nin the process makes the whole code a bit easier to understand.\n\nThe object code produced is unchanged as expected.\n\nThis fixes kernel bugzilla 16506.\n\nReported-by: Dieter Stussy \u003ckd6lvw+software@kd6lvw.ampr.org\u003e\nSigned-off-by: Luca Barbieri \u003cluca@luca-barbieri.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: \u003cstable@kernel.org\u003e 2.6.35\nLKML-Reference: \u003ctip-*@git.kernel.org\u003e\n" }, { "commit": "ef077179a2909d3d0d3accf29ad1ea9ebb19019b", "tree": "93fdf0f9bc28512a5fd908756fa927728552bdb2", "parents": [ "db9ebb7cd0b6329c46ba3cc326d6414647fcfe6b" ], "author": { "name": "Marek Vasut", "email": "marek.vasut@gmail.com", "time": "Thu Aug 12 02:14:54 2010 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Thu Aug 12 02:21:18 2010 +0100" }, "message": "ARM: Fix gen_nand probe structures contents\n\nThese three platforms didn\u0027t properly fill nr_chips in gen_nand \nregistration and therefore depended on gen_nand bug fixed by commit \n81cbb0b17796d81cbd92defe113cf2a7c7a21fbb (\"mtd: gen_nand: fix support for \nmultiple chips\")\n\nSigned-off-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "5af568cbd55f60b5a1d174f621b273e4f585dc35", "tree": "7cdc1afeb267519133a29ac595df21278c556c8c", "parents": [ "062e27ec1b49d12bdb1ecc94d74b5fee5a5775db", "66a362a2aa8ffa72670259fa15e2a77a01cc2217" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 09:23:32 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 09:23:32 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n isofs: Fix lseek() to position beyond 4 GB\n vfs: remove unused MNT_STRICTATIME\n vfs: show unreachable paths in getcwd and proc\n vfs: only add \" (deleted)\" where necessary\n vfs: add prepend_path() helper\n vfs: __d_path: dont prepend the name of the root dentry\n ia64: perfmon: add d_dname method\n vfs: add helpers to get root and pwd\n cachefiles: use path_get instead of lone dget\n fs/sysv/super.c: add support for non-PDP11 v7 filesystems\n V7: Adjust sanity checks for some volumes\n Add v7 alias\n v9fs: fixup for inode_setattr being removed\n\nManual merge to take Al\u0027s version of the fs/sysv/super.c file: it merged\ncleanly, but Al had removed an unnecessary header include, so his side\nwas better.\n" }, { "commit": "946880fa270c18c137654af70ba939f03181c6b6", "tree": "1fc66f0f55c17be3026d55fc261f4cbddaf80e90", "parents": [ "636d17427b1ef0e97bd9df9b3b0e0f314ff889d3", "42ea573f872365b0797ddbcee2e1f1f48913f507" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 09:17:27 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 09:17:27 2010 -0700" }, "message": "Merge branch \u0027ixp4xx\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6\n\n* \u0027ixp4xx\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:\n IXP4xx: Fix LL debugging on little-endian CPU.\n IXP4xx: Fix sparse warnings in I/O primitives.\n IXP4xx: Make mdio_bus struct static in the Ethernet driver.\n IXP4xx: Fix ixp4xx_crypto little-endian operation.\n IXP4xx: Prevent HSS transmitter lockup by disabling FRaMe signals.\n ixp4xx/vulcan: add PCI support\n ixp4xx: base support for Arcom Vulcan\n" }, { "commit": "636d17427b1ef0e97bd9df9b3b0e0f314ff889d3", "tree": "f573602c1a78e9140c36e220c47675b79af1c270", "parents": [ "dd21e9bdff14a9882f2c485fe533c6ce64ea2675", "0b019a41553a919965bb02d07d54e3e6c57a796d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 09:13:19 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 09:13:19 2010 -0700" }, "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: (226 commits)\n ARM: 6323/1: cam60: don\u0027t use __init for cam60_spi_{flash_platform_data,partitions}\n ARM: 6324/1: cam60: move cam60_spi_devices to .init.data\n ARM: 6322/1: imx/pca100: Fix name of spi platform data\n ARM: 6321/1: fix syntax error in main Kconfig file\n ARM: 6297/1: move U300 timer to dynamic clock lookup\n ARM: 6296/1: clock U300 intcon and timer properly\n ARM: 6295/1: fix U300 apb_pclk split\n ARM: 6306/1: fix inverted MMC card detect in U300\n ARM: 6299/1: errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID\n ARM: 6294/1: etm: do a dummy read from OSSRR during initialization\n ARM: 6292/1: coresight: add ETM management registers\n ARM: 6288/1: ftrace: document mcount formats\n ARM: 6287/1: ftrace: clean up mcount assembly indentation\n ARM: 6286/1: fix Thumb-2 decompressor broken by \"Auto calculate ZRELADDR\"\n ARM: 6281/1: video/imxfb.c: allow usage without BACKLIGHT_CLASS_DEVICE\n ARM: 6280/1: imx: Fix build failure when including \u003cmach/gpio.h\u003e without \u003clinux/spinlock.h\u003e\n ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3\n ARM: S5P: Fix on missing S5P_DEV_FIMC in plat-s5p/Kconfig\n ARM: S5PV210: Override FIMC driver name on Aquila board\n ARM: S5PC100: enable FIMC on SMDKC100\n ...\n\nFix up conflicts in arch/arm/mach-{s5pc100,s5pv210}/cpu.c due to\ndifferent subsystem \u0027setname\u0027 calls, and trivial port types in\ninclude/linux/serial_core.h\n" } ], "next": "c7ff0d9c92435e836e13aaa8d0e56d4000424bcc" }