| da5cabf | Linus Torvalds | 16 August 2010, 00:41:37 UTC | Linux 2.6.36-rc1 | 16 August 2010, 00:41:37 UTC |
| 2245ba2 | Linus Torvalds | 16 August 2010, 00:37:07 UTC | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: gcc-4.6: ACPI: fix unused but set variables in ACPI ACPI thermal: make procfs I/F depend on CONFIG_ACPI_PROCFS ACPI video: make procfs I/F depend on CONFIG_ACPI_PROCFS ACPI processor: remove deprecated ACPI procfs I/F ACPI power_resource: remove unused procfs I/F ACPI: remove deprecated ACPI procfs I/F ACPI: introduce drivers/acpi/sysfs.c ACPI: introduce module parameter acpi.aml_debug_output ACPI: introduce drivers/acpi/debugfs.c ACPI, APEI, ERST debug support ACPI, APEI, Manage GHES as platform devices ACPI, APEI, Rename CPER and GHES severity constants ACPI, APEI, Fix a typo of error path of apei_resources_request ACPI / ACPICA: Fix reference counting problems with GPE handlers ACPI: Add the check of ADR flag in course of finding ACPI handle for PCI device ACPI / Sleep: Drop acpi_suspend_finish() ACPI / Sleep: Consolidate suspend and hibernation routines ACPI / Wakeup: Simplify enabling of wakeup devices ACPI / Sleep: Rework enabling wakeup devices ACPI / Sleep: Free NVS copy if suspending of devices fails Fixed up totally buggered "ACPI: fix unused but set variables in ACPI" patch that doesn't even compile in the merge. Thanks to Sedat Dilek <sedat.dilek@googlemail.com> for noticing the breakage before I even pulled. And a big "Grrr.." at Len for not even bothering to compile the tree before asking me to pull. | 16 August 2010, 00:37:07 UTC |
| e2e96c6 | Linus Torvalds | 16 August 2010, 00:34:20 UTC | Merge git://git.infradead.org/iommu-2.6 * git://git.infradead.org/iommu-2.6: intel-iommu: Fix 32-bit build warning with __cmpxchg() intr-remap: allow disabling source id checking | 16 August 2010, 00:34:20 UTC |
| 7355a5a | Linus Torvalds | 16 August 2010, 00:32:47 UTC | Merge git://git.infradead.org/mtd-2.6 * git://git.infradead.org/mtd-2.6: mtd/nand_ids: Fix buswidth mtd/m25p80: fix test for end of loop mtd/m25p80: retlen is never NULL MIPS: Fix gen_nand probe structures contents gen_nand: Test if nr_chips field is valid BFIN: Fix gen_nand probe structures contents nand/denali: move all hardware initialization work to denali_hw_init nand/denali: Add a page check in denali_read_page & denali_read_page_raw nand/denali: use cpu_relax() while waiting for hardware interrupt nand/denali: change read_status function method nand/denali: Fixed check patch warnings ARM: Fix gen_nand probe structures contents mtd/nand_base: fix kernel-doc warnings & typos nand/denali: use dev_xx debug function to replace nand_dbg_print and some printk nand/denali: Fixed handle ECC error bugs nand/denali: use iowrite32() to replace denali_write32() nand/denali: Fixed probe function bugs | 16 August 2010, 00:32:47 UTC |
| 7a1b29a | Linus Torvalds | 16 August 2010, 00:31:43 UTC | Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: arch/tile: don't validate CROSS_COMPILE needlessly arch/tile: export only COMMAND_LINE_SIZE to userspace. arch/tile: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN arch/tile: Rename the hweight() implementations to __arch_hweight() arch/tile: extend syscall ABI to set r1 on return as well. arch/tile: Various cleanups. arch/tile: support backtracing on TILE-Gx arch/tile: Fix a couple of issues with the COMPAT code for TILE-Gx. arch/tile: Use separate, better minsec values for clocksource and sched_clock. arch/tile: correct a bug in freeing bootmem by VA for the optional second initrd. arch: tile: mm: pgtable.c: Removed duplicated #include arch: tile: kernel/proc.c Removed duplicated #include Add fanotify syscalls to <asm-generic/unistd.h>. arch/tile: support new kunmap_atomic() naming convention. tile: remove unused ISA_DMA_THRESHOLD define Conflicts in arch/tile/configs/tile_defconfig (pick the mainline version with the reduced defconfig). | 16 August 2010, 00:31:43 UTC |
| a5854dd | Chris Metcalf | 15 August 2010, 19:01:45 UTC | arch/tile: don't validate CROSS_COMPILE needlessly With this change, the arch/tile Makefile will only check for a valid combination of CROSS_COMPILE vs "uname -m" for a few common targets that are typically the ones we get wrong (vmlinux, all, and modules). The change handles the case of an empty "make" goal like "make all". Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> Reviewed-by: Sam Ravnborg <sam@ravnborg.org> | 15 August 2010, 20:14:07 UTC |
| d782437 | Linus Torvalds | 15 August 2010, 18:35:52 UTC | mm: fix up some user-visible effects of the stack guard page This commit makes the stack guard page somewhat less visible to user space. It does this by: - not showing the guard page in /proc/<pid>/maps It looks like lvm-tools will actually read /proc/self/maps to figure out where all its mappings are, and effectively do a specialized "mlockall()" in user space. By not showing the guard page as part of the mapping (by just adding PAGE_SIZE to the start for grows-up pages), lvm-tools ends up not being aware of it. - by also teaching the _real_ mlock() functionality not to try to lock the guard page. That would just expand the mapping down to create a new guard page, so there really is no point in trying to lock it in place. It would perhaps be nice to show the guard page specially in /proc/<pid>/maps (or at least mark grow-down segments some way), but let's not open ourselves up to more breakage by user space from programs that depends on the exact deails of the 'maps' file. Special thanks to Henrique de Moraes Holschuh for diving into lvm-tools source code to see what was going on with the whole new warning. Reported-and-tested-by: François Valenduc <francois.valenduc@tvcablenet.be Reported-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Cc: stable@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | 15 August 2010, 18:35:52 UTC |
| 1b68c95 | Linus Torvalds | 15 August 2010, 18:22:00 UTC | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: sound/usb/format: silence uninitialized variable warnings MAINTAINERS: Add Ian Lartey as comaintaner for Wolfson devices MAINTAINERS: Make Wolfson entry also cover CODEC drivers ASoC: Only tweak WM8994 chip configuration on devices up to rev D ASoC: Optimise DSP performance for WM8994 ALSA: hda - Fix dynamic ADC change working again ALSA: hda - Restrict PCM parameters per ELD information over HDMI sound: oss: sh_dac_audio.c removed duplicated #include | 15 August 2010, 18:22:00 UTC |
| 5a41794 | Linus Torvalds | 15 August 2010, 18:17:52 UTC | Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6 * 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6: intel_idle: recognize Lincroft Atom Processor intel_idle: no longer EXPERIMENTAL intel_idle: disable module support intel_idle: add support for Westmere-EX intel_idle: delete power_policy modparam, and choose substate functions intel_idle: delete substates DEBUG modparam | 15 August 2010, 18:17:52 UTC |
| 3b3c1b9 | Chris Metcalf | 15 August 2010, 16:14:41 UTC | arch/tile: export only COMMAND_LINE_SIZE to userspace. This fixes a failure in "make headers_check" for tile. I hadn't realized this file was exported to userspace by default. Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> | 15 August 2010, 16:14:41 UTC |
| b3ae98a | Chris Metcalf | 14 August 2010, 00:43:39 UTC | arch/tile: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN See commit a6eb9fe105d5de0053b261148cee56c94b4720ca. Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 15 August 2010, 15:05:33 UTC |
| aaae527 | Takashi Iwai | 15 August 2010, 12:34:02 UTC | Merge branch 'fix/asoc' into for-linus | 15 August 2010, 12:34:02 UTC |
| 18c5ef3 | Takashi Iwai | 15 August 2010, 12:33:56 UTC | Merge branch 'fix/hda' into for-linus | 15 August 2010, 12:33:56 UTC |
| 38d7b08 | Dan Carpenter | 14 August 2010, 17:29:53 UTC | ALSA: sound/usb/format: silence uninitialized variable warnings Gcc complains that ret might be used uninitialized: sound/usb/format.c: In function ‘snd_usb_parse_audio_format’: sound/usb/format.c:354: warning: ‘ret’ may be used uninitialized in this function sound/usb/format.c:354: note: ‘ret’ was declared here sound/usb/format.c:414: warning: ‘ret’ may be used uninitialized in this function sound/usb/format.c:414: note: ‘ret’ was declared here I suppose it could be uninitialized if there is ever a UAC_VERSION_3 released. Anyway this patch is worthwhile if only to silence the gcc warning. Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Takashi Iwai <tiwai@suse.de> | 15 August 2010, 12:28:20 UTC |
| 95ee46a | Len Brown | 15 August 2010, 05:06:31 UTC | Merge branch 'linus' into release Conflicts: drivers/acpi/debug.c Signed-off-by: Len Brown <len.brown@intel.com> | 15 August 2010, 05:06:31 UTC |
| cfa806f | Andi Kleen | 20 July 2010, 22:18:36 UTC | gcc-4.6: ACPI: fix unused but set variables in ACPI Some minor improvements in error handling, but overall it was mostly dead code. Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Len Brown <len.brown@intel.com> | 15 August 2010, 04:53:08 UTC |
| 43d9f87 | Zhang Rui | 15 July 2010, 02:46:44 UTC | ACPI thermal: make procfs I/F depend on CONFIG_ACPI_PROCFS Mark the ACPI thermal procfs I/F deprecated, because /sys/class/thermal/ is already available and has been working for years w/o any problem. The ACPI thermal procfs I/F will be removed in 2.6.37. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> | 15 August 2010, 04:37:33 UTC |
| 6e37c65 | Zhang Rui | 15 July 2010, 02:46:43 UTC | ACPI video: make procfs I/F depend on CONFIG_ACPI_PROCFS Mark ACPI video driver procfs I/F deprecated, including: /proc/acpi/video/*/info /proc/acpi/video/*/DOS /proc/acpi/video/*/ROM /proc/acpi/video/*/POST /proc/acpi/video/*/POST_info /proc/acpi/video/*/*/info /proc/acpi/video/*/*/state /proc/acpi/video/*/*/EDID and /proc/acpi/video/*/*/brightness, because 1. we already have the sysfs I/F /sysclass/backlight/ as the replacement of /proc/acpi/video/*/*/brightness. 2. the other procfs I/F is not useful for userspace. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> | 15 August 2010, 04:34:06 UTC |
| d09fe55 | Zhang Rui | 15 July 2010, 02:46:41 UTC | ACPI processor: remove deprecated ACPI procfs I/F Remove deprecated ACPI processor procfs I/F, including: /proc/acpi/processor/CPUX/power /proc/acpi/processor/CPUX/limit /proc/acpi/processor/CPUX/info /proc/acpi/processor/CPUX/throttling still exists, as we don't have sysfs I/F available for now. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> | 15 August 2010, 04:31:45 UTC |
| 06af7eb | Zhang Rui | 15 July 2010, 02:46:38 UTC | ACPI power_resource: remove unused procfs I/F Remove unused ACPI power procfs I/F. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> | 15 August 2010, 04:28:26 UTC |
| 47f5c89 | Zhang Rui | 15 July 2010, 02:46:33 UTC | ACPI: remove deprecated ACPI procfs I/F Rmove deprecated ACPI procfs I/F, including /proc/acpi/debug_layer /proc/acpi/debug_level /proc/acpi/info /proc/acpi/dsdt /proc/acpi/fadt /proc/acpi/sleep because the sysfs I/F is already available and has been working well for years. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> | 15 August 2010, 04:27:51 UTC |
| 1c8fce2 | Zhang Rui | 15 July 2010, 02:46:30 UTC | ACPI: introduce drivers/acpi/sysfs.c Introduce drivers/acpi/sysfs.c. code for ACPI sysfs I/F, including #ifdef ACPI_DEBUG /sys/module/acpi/parameters/debug_layer /sys/module/acpi/parameters/debug_level /sys/module/acpi/parameters/trace_method_name /sys/module/acpi/parameters/trace_debug_layer /sys/module/acpi/parameters/trace_debug_level /sys/module/acpi/parameters/trace_state #endif /sys/module/acpi/parameters/acpica_version /sys/firmware/acpi/tables/ /sys/firmware/acpi/interrupts/ is moved to this file. No function change in this patch. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> | 15 August 2010, 04:26:30 UTC |
| c172cb7 | Len Brown | 15 August 2010, 04:25:40 UTC | Merge branch 'acpica-gpe' into release | 15 August 2010, 04:25:40 UTC |
| e8eb622 | Len Brown | 15 August 2010, 03:57:32 UTC | Merge branch 'bugzilla-16422' into release | 15 August 2010, 03:57:32 UTC |
| ecd8ee0 | Len Brown | 15 August 2010, 03:55:57 UTC | Merge branch 'procfs-cleanup' into release | 15 August 2010, 03:55:57 UTC |
| feb29c5 | Len Brown | 15 August 2010, 03:55:47 UTC | Merge branch 'apei' into release | 15 August 2010, 03:55:47 UTC |
| f2a6618 | Len Brown | 15 August 2010, 03:55:44 UTC | Merge branch 'nvs' into release | 15 August 2010, 03:55:44 UTC |
| c637e48 | Zhang Rui | 15 July 2010, 02:46:17 UTC | ACPI: introduce module parameter acpi.aml_debug_output Introduce module parameter acpi.aml_debug_output. With acpi.aml_debug_output set, we can get AML debug object output (Store (AAA, Debug)), even with CONFIG_ACPI_DEBUG cleared. Together with the runtime custom method mechanism, we can debug AML code problems without rebuilding the kernel. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> | 15 August 2010, 03:02:14 UTC |
| a25ee92 | Zhang Rui | 15 July 2010, 02:46:15 UTC | ACPI: introduce drivers/acpi/debugfs.c Introduce drivers/acpi/debugfs.c. Code for ACPI debugfs I/F, i.e. /sys/kernel/debug/acpi/custom_method, is moved to this file. And make ACPI debugfs always built in, even if CONFIG_ACPI_DEBUG is cleared. BTW:this adds about 400bytes code to ACPI, when CONFIG_ACPI_DEBUG is cleared. [uaccess.h build fix from Andrew Morton <akpm@linux-foundation.org>] Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> | 15 August 2010, 03:02:00 UTC |
| 4725fd3 | Arjan van de Ven | 22 July 2010, 03:42:25 UTC | intel_idle: recognize Lincroft Atom Processor Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com> | 15 August 2010, 02:54:52 UTC |
| 2ff729d | Huang Ying | 12 August 2010, 03:55:17 UTC | ACPI, APEI, ERST debug support This patch adds debugging/testing support to ERST. A misc device is implemented to export raw ERST read/write/clear etc operations to user space. With this patch, we can add ERST testing support to linuxfirmwarekit ISO (linuxfirmwarekit.org) to verify the kernel support and the firmware implementation. Signed-off-by: Huang Ying <ying.huang@intel.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com> | 15 August 2010, 02:47:55 UTC |
| 5d7cb15 | Linus Torvalds | 14 August 2010, 23:21:50 UTC | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup * git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup: defconfig reduction kbuild: drop unifdef-y support archs: replace unifdef-y with header-y include: replace unifdef-y with header-y | 14 August 2010, 23:21:50 UTC |
| fc58fb1 | Randy Dunlap | 14 August 2010, 20:05:57 UTC | fusion: add function parameter names to kernel-doc Fix fusion missing kernel-doc: Warning(drivers/message/fusion/mptbase.c:649): No description found for parameter 'func_name' Warning(drivers/message/fusion/mptbase.c:8010): No description found for parameter 'cb_idx' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | 14 August 2010, 23:21:00 UTC |
| cd956a1 | Randy Dunlap | 14 August 2010, 20:05:31 UTC | fs/dcache: fix function param name in kernel-doc Fix parameter name in kernel-doc notation (causes a warning). Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | 14 August 2010, 23:21:00 UTC |
| 1f5cfe2 | Randy Dunlap | 14 August 2010, 20:05:50 UTC | fusion: fix non-kernel-doc comment block Fix comment begin notation not to look like kernel-doc since it's not. Removes kernel-doc warnings. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | 14 August 2010, 23:20:59 UTC |
| 03ab450 | Randy Dunlap | 14 August 2010, 20:05:17 UTC | mm/page-writeback: fix non-kernel-doc function comments Remove leading /** from non-kernel-doc function comments to prevent kernel-doc warnings. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | 14 August 2010, 23:20:59 UTC |
| 163475f | Randy Dunlap | 14 August 2010, 19:36:14 UTC | Documentation: move SCSI parameters to their own text file Move SCSI parameters from kernel-parameters.txt to their own text file. This continues a trend of moving non-core parameters out of kernel-parameters.txt. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | 14 August 2010, 23:20:59 UTC |
| d310ad0 | Linus Torvalds | 14 August 2010, 21:57:58 UTC | Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: (22 commits) hwmon: (via-cputemp) Remove bogus "SHOW" global variable hwmon: jc42 depends on I2C hwmon: (pc87427) Add a maintainer hwmon: (pc87427) Move sysfs file removal to a separate function hwmon: (pc87427) Add temperature monitoring support hwmon: (pc87427) Add support for the second logical device hwmon: (pc87427) Add support for manual fan speed control hwmon: (pc87427) Minor style cleanups hwmon: (pc87427) Handle disabled fan inputs properly hwmon: (w83627ehf) Add support for W83667HG-B hwmon: (w83627ehf) Driver cleanup hwmon: Add driver for SMSC EMC2103 temperature monitor and fan controller hwmon: Remove in[0-*]_fault from sysfs-interface hwmon: Add 4 current alarm/beep attributes to sysfs-interface hwmon: Add 3 critical limit attributes to sysfs-interface hwmon: (asc7621) Clean up and improve detect function hwmon: (it87) Export labels for internal sensors hwmon: (lm75) Add suspend/resume feature hwmon: (emc1403) Add power support hwmon: (ltc4245) Expose all GPIO pins as analog voltages ... | 14 August 2010, 21:57:58 UTC |
| 8b1bb90 | Sam Ravnborg | 14 August 2010, 20:05:58 UTC | defconfig reduction Use the defconfig files generated by "make savedefconfig" for remaining defconfig files. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> | 14 August 2010, 20:26:53 UTC |
| 7cfddee | Sam Ravnborg | 14 August 2010, 08:22:58 UTC | kbuild: drop unifdef-y support unifdef-y is not used anymore - drop remaining references Signed-off-by: Sam Ravnborg <sam@ravnborg.org> | 14 August 2010, 20:26:52 UTC |
| bf56fba | Sam Ravnborg | 14 August 2010, 08:20:19 UTC | archs: replace unifdef-y with header-y unifdef-y and header-y have same semantic, so drop unifdef-y Signed-off-by: Sam Ravnborg <sam@ravnborg.org> | 14 August 2010, 20:26:51 UTC |
| 60641aa | Sam Ravnborg | 14 August 2010, 08:15:12 UTC | include: replace unifdef-y with header-y unifdef-y and header-y has same semantic. So there is no need to have both. Drop the unifdef-y variant and sort all lines again Signed-off-by: Sam Ravnborg <sam@ravnborg.org> | 14 August 2010, 20:26:51 UTC |
| c29c08b | Linus Torvalds | 14 August 2010, 19:34:34 UTC | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (28 commits) [SCSI] qla4xxx: fix compilation warning [SCSI] make error handling more robust in the face of reservations [SCSI] tgt: fix warning [SCSI] drivers/message/fusion: Adjust confusing if indentation [SCSI] Return NEEDS_RETRY for eh commands with status BUSY [SCSI] ibmvfc: Driver version 1.0.9 [SCSI] ibmvfc: Fix terminate_rport_io [SCSI] ibmvfc: Fix rport add/delete race resulting in oops [SCSI] lpfc 8.3.16: Change LPFC driver version to 8.3.16 [SCSI] lpfc 8.3.16: FCoE Discovery and Failover Fixes [SCSI] lpfc 8.3.16: SLI Additions, updates, and code cleanup [SCSI] pm8001: introduce missing kfree [SCSI] qla4xxx: Update driver version to 5.02.00-k3 [SCSI] qla4xxx: Added AER support for ISP82xx [SCSI] qla4xxx: Handle outstanding mbx cmds on hung f/w scenarios [SCSI] qla4xxx: updated mbx_sys_info struct to sync with FW 4.6.x [SCSI] qla4xxx: clear AF_DPC_SCHEDULED flage when exit from do_dpc [SCSI] qla4xxx: Stop firmware before doing init firmware. [SCSI] qla4xxx: Use the correct request queue. [SCSI] qla4xxx: set correct value in sess->recovery_tmo ... | 14 August 2010, 19:34:34 UTC |
| f279941 | H. Peter Anvin | 14 August 2010, 19:09:02 UTC | hwmon: (via-cputemp) Remove bogus "SHOW" global variable The via-cputemp hwmon driver was probably intending "typedef enum { ... } SHOW;", but the "typedef" was missing creating a global variable named "SHOW". There is absolutely no reason to have this in the global namespace. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Acked-by: Harald Welte <HaraldWelte@viatech.com> Cc: Juerg Haefliger <juergh@gmail.com> Signed-off-by: Jean Delvare <khali@linux-fr.org> | 14 August 2010, 19:09:02 UTC |
| 4bd2691 | Randy Dunlap | 14 August 2010, 19:09:01 UTC | hwmon: jc42 depends on I2C jc42 uses i2c interfaces, so it should depend on I2C. drivers/hwmon/jc42.c:426: error: implicit declaration of function 'i2c_check_functionality' drivers/hwmon/jc42.c:521: error: implicit declaration of function 'i2c_smbus_read_word_data' drivers/hwmon/jc42.c:529: error: implicit declaration of function 'i2c_smbus_write_word_data' drivers/hwmon/jc42.c:580: error: implicit declaration of function 'i2c_add_driver' drivers/hwmon/jc42.c:585: error: implicit declaration of function 'i2c_del_driver' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Acked-by: Guenter Roeck <guenter.roeck@ericsson.com> Signed-off-by: Jean Delvare <khali@linux-fr.org> | 14 August 2010, 19:09:01 UTC |
| 1ad107f | Jean Delvare | 14 August 2010, 19:09:00 UTC | hwmon: (pc87427) Add a maintainer As I made significant changes to the pc87427 driver, I'll be maintaining it for the year to come. Signed-off-by: Jean Delvare <khali@linux-fr.org> | 14 August 2010, 19:09:00 UTC |
| c6b8724 | Jean Delvare | 14 August 2010, 19:09:00 UTC | hwmon: (pc87427) Move sysfs file removal to a separate function The sysfs file removal code is the same in the probe error path and in the remove function, so move it to a separate function to avoid code duplication. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Guenter Roeck <guenter.roeck@ericsson.com> | 14 August 2010, 19:09:00 UTC |
| 008e5f3 | Jean Delvare | 14 August 2010, 19:08:59 UTC | hwmon: (pc87427) Add temperature monitoring support Add support for the 6 temperature monitoring channels of the PC87427. Note that the sensors resolution can vary, and I couldn't find a way to figure it out, so we might have to compensate in user-space. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Guenter Roeck <guenter.roeck@ericsson.com> | 14 August 2010, 19:08:59 UTC |
| 9d32df1 | Jean Delvare | 14 August 2010, 19:08:58 UTC | hwmon: (pc87427) Add support for the second logical device The second logical device contains the voltage and temperature registers. We have to extend the driver to support a second logical device before we can add support for these features. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Guenter Roeck <guenter.roeck@ericsson.com> | 14 August 2010, 19:08:58 UTC |
| 328716b | Jean Delvare | 14 August 2010, 19:08:58 UTC | hwmon: (pc87427) Add support for manual fan speed control Add initial support for PWM outputs of the PC87427 Super-I/O chip. Only mode change and manual fan speed control are supported. Automatic mode configuration isn't supported, and won't be until at least one board is known, which makes uses of the PWM outputs. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Guenter Roeck <guenter.roeck@ericsson.com> | 14 August 2010, 19:08:58 UTC |
| 0d22d58 | Jean Delvare | 14 August 2010, 19:08:57 UTC | hwmon: (pc87427) Minor style cleanups Follow the best practice of the day. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Guenter Roeck <guenter.roeck@ericsson.com> | 14 August 2010, 19:08:57 UTC |
| 4e7d99e | Jean Delvare | 14 August 2010, 19:08:56 UTC | hwmon: (pc87427) Handle disabled fan inputs properly Most fan input pins of the PC87427 can have alternate functions. Update the driver to check the configuration register and only support fan inputs which are really used for fan monitoring. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Guenter Roeck <guenter.roeck@ericsson.com> | 14 August 2010, 19:08:56 UTC |
| c39aeda | Guenter Roeck | 14 August 2010, 19:08:55 UTC | hwmon: (w83627ehf) Add support for W83667HG-B Add support for W83667HG-B (very similar to the W83667HG). Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Signed-off-by: Jean Delvare <khali@linux-fr.org> | 14 August 2010, 19:08:55 UTC |
| da2e025 | Guenter Roeck | 14 August 2010, 19:08:55 UTC | hwmon: (w83627ehf) Driver cleanup - Moved fan pwm register array pointers into per-instance data. - Only read fan pwm data for installed/supported fans. - Update fan max output and fan step output information from data in registers. - Create max_output and step_output attribute files only if respective fan pwm registers exist. Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Signed-off-by: Jean Delvare <khali@linux-fr.org> | 14 August 2010, 19:08:55 UTC |
| 9df7305 | Steve Glendinning | 14 August 2010, 19:08:54 UTC | hwmon: Add driver for SMSC EMC2103 temperature monitor and fan controller SMSC's EMC2103 family of temperature/fan controllers have 1 onboard and up to 3 external temperature sensors, and allow closed-loop control of one fan. This patch adds support for them. Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com> Signed-off-by: Jean Delvare <khali@linux-fr.org> | 14 August 2010, 19:08:54 UTC |
| 5a9c2cd | Jean Delvare | 14 August 2010, 19:08:54 UTC | hwmon: Remove in[0-*]_fault from sysfs-interface Fault files are for hardware failures that can be reported. So far we've seen chips reporting such failures for temperature sensors and fans, but not for voltages. Remove in[0-*]_fault for now. It can be added back later if really needed, but I doubt it. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Guenter Roeck <guenter.roeck@ericsson.com> | 14 August 2010, 19:08:54 UTC |
| e04a715 | Guenter Roeck | 14 August 2010, 19:08:53 UTC | hwmon: Add 4 current alarm/beep attributes to sysfs-interface Add currX_alarm, currX_min_alarm, currX_max_alarm and currX_beep attributes to the hwmon sysfs API. currX_min_alarm and currX_max_alarm are already supported by the LTC4215 and LTC4245 drivers. currX_alarm is supported by the LTC4261 driver. Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Signed-off-by: Jean Delvare <khali@linux-fr.org> | 14 August 2010, 19:08:53 UTC |
| f46fc8c | Guenter Roeck | 14 August 2010, 19:08:52 UTC | hwmon: Add 3 critical limit attributes to sysfs-interface Added _lcrit and _crit to voltage attributes. Added _lcrit to temperature attributes. Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Signed-off-by: Jean Delvare <khali@linux-fr.org> | 14 August 2010, 19:08:52 UTC |
| 28cbd46 | Jean Delvare | 14 August 2010, 19:08:52 UTC | hwmon: (asc7621) Clean up and improve detect function * The dev variable is never used. * Detect functions only need to set info->type, not client->name. * Include the device address in the log message. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: George Joseph <george.joseph@fairview5.com> Cc: Ken Milmore <ken.milmore@googlemail.com> | 14 August 2010, 19:08:52 UTC |
| 738e5e0 | Jean Delvare | 14 August 2010, 19:08:50 UTC | hwmon: (it87) Export labels for internal sensors Some voltage sensors can be wired internally to the IT87xxF chip's own power supply channels. In that case, we can inform user-space that the wiring is known by exporting proper labels for these sensors. Signed-off-by: Jean Delvare <khali@linux-fr.org> | 14 August 2010, 19:08:50 UTC |
| 9914518 | Shubhrajyoti Datta | 14 August 2010, 19:08:50 UTC | hwmon: (lm75) Add suspend/resume feature There is a shutdown feature at suspend it can be enabled to reduce current consumption and resume it can be switched off. Signed-off-by: Shubhrajyoti Datta <shubhrajyoti@ti.com> Signed-off-by: Jean Delvare <khali@linux-fr.org> | 14 August 2010, 19:08:50 UTC |
| 960f12f | Alan Cox | 14 August 2010, 19:08:49 UTC | hwmon: (emc1403) Add power support Add back the power interface we lost due to a slight misunderstanding of the maintainers wishes. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Jean Delvare <khali@linux-fr.org> | 14 August 2010, 19:08:49 UTC |
| 5950ec8 | Ira W. Snyder | 14 August 2010, 19:08:49 UTC | hwmon: (ltc4245) Expose all GPIO pins as analog voltages Add support for exposing all GPIO pins as analog voltages. Though this is not an ideal use of the chip, some hardware engineers may decide that the LTC4245 meets their design requirements when studying the datasheet. The GPIO pins are sampled in round-robin fashion, meaning that a slow reader will see stale data. A userspace application can detect this, because it will get -EAGAIN when reading from a sysfs file which contains stale data. Users can choose to use this feature on a per-chip basis by using either platform data or the OF device tree (where applicable). Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu> Signed-off-by: Jean Delvare <khali@linux-fr.org> | 14 August 2010, 19:08:49 UTC |
| b9783dc | Jean Delvare | 14 August 2010, 19:08:48 UTC | hwmon: (pc87360) Fix device resource declaration It's not OK to call platform_device_add_resources() multiple times in a row. Despite its name, this functions sets the resources, it doesn't add them. So we have to prepare an array with all the resources, and then call platform_device_add_resources() once. Before this fix, only the last I/O resource would be actually registered. The other I/O resources were leaked. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Jim Cromie <jim.cromie@gmail.com> Cc: stable@kernel.org | 14 August 2010, 19:08:48 UTC |
| df149d0 | Julia Lawall | 14 August 2010, 19:08:47 UTC | hwmon: (k8temp) Adjust confusing if indentation Move the if(err) statement after the if into the if branch indicated by its indentation. The preceding if(err) test implies that err cannot be nonzero unless the if branch is taken. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r disable braces5@ position p1,p2; statement S1,S2; @@ ( if (...) { ... } | if (...) S1@p1 S2@p2 ) @script:python@ p1 << r.p1; p2 << r.p2; @@ if (p1[0].column == p2[0].column): cocci.print_main("branch",p4) cocci.print_secs("after",p5) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Jean Delvare <khali@linux-fr.org> | 14 August 2010, 19:08:47 UTC |
| bbbfb91 | Linus Torvalds | 14 August 2010, 18:59:44 UTC | Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux * 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux: DMAENGINE: correct PL080 register header file ARM: SAMSUNG: Fix on build warning about dependency in Kconfig ARM: SMDK6410: Make virtual screen twice depth of real ARM: S3C64XX: Update consistent DMA size to 8MiB ARM: S3C64XX: Add audio support to SmartQ ARM: S3C64XX: Framebuffer fix for SmartQ5 ARM: S3C64XX: Set wifi and iNAND as permanently connected SD devices on SmartQ boards ARM: S3C64XX: Move SmartQ LCD control platform definition to shared file ARM: mach-real6410: add sdhc device support ARM: mach-real6410: add dm9000 ethernet support for mach-real6410 ARM: S3C64XX: Support for Real6410 Fix up trivial conflicts in arch/arm/mach-s3c64xx/mach-smartq5.c ("remove pixclock" vs "Framebuffer fix for SmartQ5") | 14 August 2010, 18:59:44 UTC |
| d0a0c28 | Linus Torvalds | 14 August 2010, 18:57:54 UTC | Merge branch 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linux * 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linux: i2c/nuc900: add i2c driver support for nuc900 i2c: Enable NXP LPC support in Kconfig i2c-pxa: fix compiler warning, due to missing const i2c: davinci: bus recovery procedure to clear the bus i2c: davinci: Add cpufreq support i2c: davinci: Add suspend/resume support i2c: davinci: Add helper functions for power management i2c: davinci: misc. cleanups: remove MOD_REG_BIT and IO_ADDRESS usage i2c: davinci: Fix smbus Oops with AIC33 usage | 14 August 2010, 18:57:54 UTC |
| ce00f7f | FUJITA Tomonori | 14 August 2010, 07:36:17 UTC | Documentation: DMA-API-HOWTO.txt: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN ARCH_KMALLOC_MINALIGN was renamed to ARCH_DMA_MINALIGN (the commit a6eb9fe105d5de0053b261148cee56c94b4720ca). ARCH_DMA_MINALIGN must be defined instead of ARCH_KMALLOC_MINALIGN to ensure that kmalloc'ed buffer is DMA-safe. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | 14 August 2010, 18:56:46 UTC |
| b171aa2 | Linus Torvalds | 14 August 2010, 18:54:09 UTC | Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: spi/amba_pl022: Fix probe and remove hook section annotations. spi/mpc5121: change annotations for probe and remove functions spi/bitbang: reinitialize transfer parameters for every message spi/spi-gpio: add support for controllers without MISO or MOSI pin spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes SPI100k: Fix 8-bit and RX-only transfers spi/mmc_spi: mmc_spi adaptations for SPI bus locking API spi/mmc_spi: SPI bus locking API, using mutex Fix trivial conflict in drivers/spi/mpc512x_psc_spi.c due to 'struct of_device' => 'struct platform_device' rename and __init/__exit to __devinit/__devexit fix. | 14 August 2010, 18:54:09 UTC |
| 11ac552 | Linus Torvalds | 14 August 2010, 18:44:56 UTC | mm: fix page table unmap for stack guard page properly We do in fact need to unmap the page table _before_ doing the whole stack guard page logic, because if it is needed (mainly 32-bit x86 with PAE and CONFIG_HIGHPTE, but other architectures may use it too) then it will do a kmap_atomic/kunmap_atomic. And those kmaps will create an atomic region that we cannot do allocations in. However, the whole stack expand code will need to do anon_vma_prepare() and vma_lock_anon_vma() and they cannot do that in an atomic region. Now, a better model might actually be to do the anon_vma_prepare() when _creating_ a VM_GROWSDOWN segment, and not have to worry about any of this at page fault time. But in the meantime, this is the straightforward fix for the issue. See https://bugzilla.kernel.org/show_bug.cgi?id=16588 for details. Reported-by: Wylda <wylda@volny.cz> Reported-by: Sedat Dilek <sedat.dilek@gmail.com> Reported-by: Mike Pagano <mpagano@gentoo.org> Reported-by: François Valenduc <francois.valenduc@tvcablenet.be> Tested-by: Ed Tomlinson <edt@aei.ca> Cc: Pekka Enberg <penberg@kernel.org> Cc: Greg KH <gregkh@suse.de> Cc: stable@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | 14 August 2010, 18:44:56 UTC |
| 5a5e28d | Len Brown | 14 August 2010, 18:44:08 UTC | intel_idle: no longer EXPERIMENTAL This is a fully supported driver. Signed-off-by: Len Brown <len.brown@intel.com> | 14 August 2010, 18:44:08 UTC |
| 6ce9cd8 | Len Brown | 14 August 2010, 18:40:36 UTC | intel_idle: disable module support Right now the module capability is cauing more trouble than it is worth. At least one distro built intel_idle as a module where it lost the init race with ACPI, making it useless. Make intel_idle bool so that if you select it, you will use it. We can restore module capability after cpuidle is enhanced to handle run-time changing of idle drivers. Signed-off-by: Len Brown <len.brown@intel.com> | 14 August 2010, 18:40:36 UTC |
| a739260 | Ben Dooks | 14 August 2010, 15:34:38 UTC | Merge branch 'for-2636/s3c64xx' into for-linus/samsung-2635 | 14 August 2010, 15:34:38 UTC |
| d92342d | Linus Walleij | 09 August 2010, 10:47:52 UTC | DMAENGINE: correct PL080 register header file This PL008 among all other variables named PL080 doesn't seem right. Fix it. Also add some missing defined that I use in the new PL08x driver. Acked-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org> | 14 August 2010, 15:29:55 UTC |
| 2d4a3b7 | Kukjin Kim | 13 August 2010, 05:38:52 UTC | ARM: SAMSUNG: Fix on build warning about dependency in Kconfig This patch fixes on following build warning. warning: (PLAT_S5P && (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5PV310) || ARCH_S3C64XX && <choice>) selects PLAT_SAMSUNG which has unmet direct dependencies (ARCH_S3C2410 || ARCH_S3C24A0 || ARCH_S3C64XX) Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Cc: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Ben Dooks <ben-linux@fluff.org> | 14 August 2010, 15:27:40 UTC |
| 001ca74 | Ben Dooks | 26 July 2010, 09:56:40 UTC | ARM: SMDK6410: Make virtual screen twice depth of real For situations where double buffering is needed (such as the current Android) make the screen virtual y size twice the LCD size so that there is space for a second screen that can be switched to. Signed-off-by: Ben Dooks <ben-linux@fluff.org> | 14 August 2010, 15:24:33 UTC |
| 46d0ad3 | Ben Dooks | 26 July 2010, 09:54:00 UTC | ARM: S3C64XX: Update consistent DMA size to 8MiB Change the area available for consitent DMA allocations from the default to 8MiB to allow drivers such as the framebuffer to get more memory (for situations where larger virtual screen resolutions are needed). Signed-off-by: Ben Dooks <ben-linux@fluff.org> | 14 August 2010, 15:24:15 UTC |
| 4e13c0e | Maurus Cuelenaere | 13 August 2010, 19:17:59 UTC | ARM: S3C64XX: Add audio support to SmartQ This adds the I²C board information for the WM8987 used in the SmartQ as audio codec and adds the I²C/I²S platform drivers. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org> | 14 August 2010, 15:16:28 UTC |
| 08ee000 | Patrick Georgi | 13 August 2010, 19:17:56 UTC | ARM: S3C64XX: Framebuffer fix for SmartQ5 The following change makes the framebuffer work on SmartQ5. There are still some problems with ADC, so this patch alone won't make the device run (or even give a working fb), but it's one issue less to think about. Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org> | 14 August 2010, 15:15:56 UTC |
| eeda5fc | Maurus Cuelenaere | 13 August 2010, 19:17:54 UTC | ARM: S3C64XX: Set wifi and iNAND as permanently connected SD devices on SmartQ boards This patch changes the platform data definitions of the wifi and iNAND chip on the SmartQ 5 and 7 to indicate that they don't have a CD line available and are thus hard-wired to the SDHCI data lines. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org> | 14 August 2010, 15:13:23 UTC |
| 49f91b9 | Maurus Cuelenaere | 13 August 2010, 19:17:52 UTC | ARM: S3C64XX: Move SmartQ LCD control platform definition to shared file This shares the common LCD control platform definition used in the SmartQ 5 and 7. This also corrects it as a GPIO bitbanged SPI device instead of an I²C one, which was wrong. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org> | 14 August 2010, 15:13:06 UTC |
| ce611d7 | Darius Augulis | 01 August 2010, 22:39:25 UTC | ARM: mach-real6410: add sdhc device support Register SHDCI devices Signed-off-by: Darius Augulis <augulis.darius@gmail.com> [ben-linux@fluff.org: rewrite header[ Signed-off-by: Ben Dooks <ben-linux@fluff.org> | 14 August 2010, 15:10:23 UTC |
| ff266c0 | Darius Augulis | 01 August 2010, 20:38:43 UTC | ARM: mach-real6410: add dm9000 ethernet support for mach-real6410 This patch is based on "[PATCH v2] Support for Real6410" Signed-off-by: Darius Augulis <augulis.darius@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org> | 14 August 2010, 15:10:23 UTC |
| eab5cfa | Darius Augulis | 28 July 2010, 20:03:43 UTC | ARM: S3C64XX: Support for Real6410 Add support for CoreWind Real6410 board, based on Samsung s3c6410 processor. Signed-off-by: Darius Augulis <augulis.darius@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org> | 14 August 2010, 15:10:22 UTC |
| 92fa5bd | Linus Torvalds | 14 August 2010, 04:23:57 UTC | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Add latest crop of syscalls [IA64] Fix 64-bit atomic routines to return "long" | 14 August 2010, 04:23:57 UTC |
| a78b2de | Tony Luck | 12 August 2010, 18:56:57 UTC | [IA64] Add latest crop of syscalls Three new syscalls for 2.6.36: prlimit64, fanotify_init and fanotify_mark. Wire up the ia64 syscall table for them. Signed-off-by: Tony Luck <tony.luck@intel.com> | 14 August 2010, 03:55:51 UTC |
| eb3bbf8 | Linus Torvalds | 14 August 2010, 01:06:37 UTC | Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm * 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm: mmc: msm_sdcc: Rename config MMC_MSM7X00A to MMC_MSM mmc: msm_sdcc: Compile the driver for msm7x30 mmc: msm: fix up build breakage on !PM | 14 August 2010, 01:06:37 UTC |
| 5e85308 | Linus Torvalds | 14 August 2010, 01:06:15 UTC | Merge branch 'stable/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6 * 'stable/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6: firmware: ibft depends on SCSI ibft: Kernel oops when rmmoding iscsi_ibft with no iBFT present. | 14 August 2010, 01:06:15 UTC |
| 75a1e32 | Linus Torvalds | 14 August 2010, 01:04:52 UTC | Merge git://git.infradead.org/~dwmw2/ideapad-2.6 * git://git.infradead.org/~dwmw2/ideapad-2.6: Call acpi_video_register() in intel_opregion_init() failure path ideapad: Only allow camera state to be set to 0 or 1 ideapad: Stop using global variables Add Lenovo ideapad driver | 14 August 2010, 01:04:52 UTC |
| c206d44 | Linus Torvalds | 14 August 2010, 01:00:25 UTC | Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, UV: Make kdump avoid stack dumps - fix !CONFIG_KEXEC breakage x86, UV: Initialize BAU hub map x86, UV: Make kdump avoid stack dumps | 14 August 2010, 01:00:25 UTC |
| 83ae170 | Linus Torvalds | 14 August 2010, 00:59:26 UTC | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: clean up compiler warning in start_this_handle() | 14 August 2010, 00:59:26 UTC |
| 78b1486 | Linus Torvalds | 14 August 2010, 00:59:09 UTC | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] acpi-cpufreq: add missing __percpu markup | 14 August 2010, 00:59:09 UTC |
| 7ec3fa1 | Linus Torvalds | 14 August 2010, 00:58:54 UTC | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: watchdog: hpwdt (12/12): Make NMI decoding a compile-time option watchdog: hpwdt (11/12): move NMI-decoding init and exit to seperate functions watchdog: hpwdt (10/12): Use "decoding" instead of "sourcing" watchdog: hpwdt (9/12): hpwdt_pretimeout reorganization watchdog: hpwdt (8/12): implement WDIOC_GETTIMELEFT watchdog: hpwdt (7/12): allow full range of timer values supported by hardware watchdog: hpwdt (6/12): Introduce SECS_TO_TICKS() macro watchdog: hpwdt (5/12): Make x86 assembly ifdef guard more strict watchdog: hpwdt (4/12): Despecificate driver from iLO2 watchdog: hpwdt (3/12): Group NMI sourcing specific items together watchdog: hpwdt (2/12): Group options that affect watchdog behavior together watchdog: hpwdt (1/12): clean-up include-files. | 14 August 2010, 00:58:54 UTC |
| 9a459f6 | Linus Torvalds | 14 August 2010, 00:57:56 UTC | Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: setlocalversion: fix version for untaged nontip mercurial revs Fix CONFIG_CROSS_COMPILE issue in .config | 14 August 2010, 00:57:56 UTC |
| 090b710 | Linus Torvalds | 14 August 2010, 00:56:27 UTC | Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: kconfig: Fix warning: ignoring return value of 'fgets' kconfig: Fix warning: ignoring return value of 'fwrite' nconfig: Fix segfault when menu is empty kconfig: fix tristate choice with minimal config kconfig: fix savedefconfig for tristate choices | 14 August 2010, 00:56:27 UTC |
| 10041d2 | Linus Torvalds | 14 August 2010, 00:52:35 UTC | Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing * 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing: bkl: Remove locked .ioctl file operation v4l: Remove reference to bkl ioctl in compat ioctl handling logfs: kill BKL | 14 August 2010, 00:52:35 UTC |
| 947e7dc | Chris Metcalf | 14 August 2010, 00:32:41 UTC | arch/tile: Rename the hweight() implementations to __arch_hweight() See commit 1527bc8b928dd1399c3d3467dd47d9ede210978a. Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> | 14 August 2010, 00:45:54 UTC |
| 7d72e6f | Chris Metcalf | 13 August 2010, 23:59:15 UTC | Merge branch 'master' into for-linus | 13 August 2010, 23:59:15 UTC |
| 4914c7f | Dominik Brodowski | 13 August 2010, 18:33:34 UTC | pcmcia: xirc2ps_cs bugfix We need to set io_lines to 10 unconditionally. Reported-by: Komuro <komurojun-mbn@nifty.com> CC: netdev@vger.kernel.org Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | 13 August 2010, 23:55:26 UTC |
| fe622e7 | David Howells | 13 August 2010, 10:25:12 UTC | NOMMU: Remove an extraneous no_printk() Remove an extraneous no_printk() in mm/nommu.c that got missed when the function got generalised from several things that used it in commit 12fdff3fc248 ("Add a dummy printk function for the maintenance of unused printks"). Without this, the following error is observed: mm/nommu.c:41: error: conflicting types for 'no_printk' include/linux/kernel.h:314: error: previous definition of 'no_printk' was here Reported-by: Michal Simek <monstr@monstr.eu> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | 13 August 2010, 23:55:25 UTC |
