21 Jul, 2008
1 commit
18 Jul, 2008
2 commits
-
This reverts commit 94d9842403f770239a656586442454b7a8f2df29.
Alan says it's not appropriate to remove this driver,
Adrian Bunk also agrees with this revert.Signed-off-by: David S. Miller
-
Conflicts:
Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c
17 Jul, 2008
7 commits
-
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (72 commits)
Revert "x86/PCI: ACPI based PCI gap calculation"
PCI: remove unnecessary volatile in PCIe hotplug struct controller
x86/PCI: ACPI based PCI gap calculation
PCI: include linux/pm_wakeup.h for device_set_wakeup_capable
PCI PM: Fix pci_prepare_to_sleep
x86/PCI: Fix PCI config space for domains > 0
Fix acpi_pm_device_sleep_wake() by providing a stub for CONFIG_PM_SLEEP=n
PCI: Simplify PCI device PM code
PCI PM: Introduce pci_prepare_to_sleep and pci_back_from_sleep
PCI ACPI: Rework PCI handling of wake-up
ACPI: Introduce new device wakeup flag 'prepared'
ACPI: Introduce acpi_device_sleep_wake function
PCI: rework pci_set_power_state function to call platform first
PCI: Introduce platform_pci_power_manageable function
ACPI: Introduce acpi_bus_power_manageable function
PCI: make pci_name use dev_name
PCI: handle pci_name() being const
PCI: add stub for pci_set_consistent_dma_mask()
PCI: remove unused arch pcibios_update_resource() functions
PCI: fix pci_setup_device()'s sprinting into a const buffer
...Fixed up conflicts in various files (arch/x86/kernel/setup_64.c,
arch/x86/pci/irq.c, arch/x86/pci/pci.h, drivers/acpi/sleep/main.c,
drivers/pci/pci.c, drivers/pci/pci.h, include/acpi/acpi_bus.h) from x86
and ACPI updates manually. -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: (68 commits)
sdio_uart: Fix SDIO break control to now return success or an error
mmc: host driver for Ricoh Bay1Controllers
sdio: sdio_io.c Fix sparse warnings
sdio: fix the use of hard coded timeout value.
mmc: OLPC: update vdd/powerup quirk comment
mmc: fix spares errors of sdhci.c
mmc: remove multiwrite capability
wbsd: fix bad dma_addr_t conversion
atmel-mci: Driver for Atmel on-chip MMC controllers
mmc: fix sdio_io sparse errors
mmc: wbsd.c fix shadowing of 'dma' variable
MMC: S3C24XX: Refuse incorrectly aligned transfers
MMC: S3C24XX: Add maintainer entry
MMC: S3C24XX: Update error debugging.
MMC: S3C24XX: Add media presence test to request handling.
MMC: S3C24XX: Fix use of msecs where jiffies are needed
MMC: S3C24XX: Add MODULE_ALIAS() entries for the platform devices
MMC: S3C24XX: Fix s3c2410_dma_request() return code check.
MMC: S3C24XX: Allow card-detect on non-IRQ capable pin
MMC: S3C24XX: Ensure host->mrq->data is valid
...Manually fixed up bogus executable bits on drivers/mmc/core/sdio_io.c
and include/linux/mmc/sdio_func.h when merging. -
* 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6:
UBIFS: include to compilation
UBIFS: add new flash file system
UBIFS: add brief documentation
MAINTAINERS: add UBIFS section
do_mounts: allow UBI root device name
VFS: export sync_sb_inodes
VFS: move inode_lock into sync_sb_inodes -
...while Len is on sabbatical from Intel
Signed-off-by: Len Brown
Signed-off-by: Andi Kleen -
Reflect that Zhang-Rui has been the sub-maintainer for
ACPI THERMAL and FAN for some time now.Also, the Chinese custom is to speak family name first,
so rather than "Rui Zhang", write "Zhang Rui",
as he does on e-mail.Signed-off-by: Len Brown
Signed-off-by: Andi Kleen -
Add additional capabilities to the Fujitsu-laptop driver.
* Brightness hotkey actions are sent to userspace. This can be disabled
using a module parameter if it causes issues with models which handle
these keys transparently in the BIOS.* Actions of additional hotkeys found on some Fujitsu models (eg: the
suspend key and the dedicated "power on passphrase" keys) are broadcast
to userspace.* An alternative brightness control method used by some Fujitsu models
(for example, the S6410) is now supported, enabling software brightness
controls on models using this method.* DMI-based module aliases are configured for the S6410 and S7020.
* The current LCD brightness after booting should now be reflected in the
standard backlight interface sysfs file (previously it was always set to
0). The platform brightness sysfs interface has always been fine.Thanks go to Peter Gruber who provided a significant portion of this code
and tested various iterations of the patch on his S6410.Signed-off-by: Peter Gruber
Signed-off-by: Jonathan Woithe
Signed-off-by: Len Brown
Signed-off-by: Andi Kleen -
This is driver for Compal Laptop: FL90/IFL90, based on MSI driver.
This driver exports a few files in /sys/devices/platform/compal-laptop/:
lcd_level - screen brightness: contains a single integer in the range 0..7 (rw)
wlan - wlan subsystem state: contains 0 or 1 (rw)
bluetooth - bluetooth subsystem state: contains 0 or 1 (rw)
raw - raw value taken from embedded controller register (ro)In addition to these platform device attributes the driver registers itself
in the Linux backlight control subsystem and is available to userspace under
/sys/class/backlight/compal-laptop/.Signed-off-by: Cezary Jackiewicz
Signed-off-by: Andi Kleen
Cc: Richard Purdie
Cc: Henrique de Moraes Holschuh
Cc: Len Brown
Cc: Alexey Starikovskiy
Signed-off-by: Andrew Morton
Signed-off-by: Len Brown
16 Jul, 2008
3 commits
-
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c -
I'm willing to take responsibility for ftrace, and follow up on any
issues that arise due to it.Signed-off-by: Steven Rostedt
Signed-off-by: Linus Torvalds -
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: (56 commits)
i2c: Add detection capability to new-style drivers
i2c: Call client_unregister for new-style devices too
i2c: Clean up old chip drivers
i2c-ibm_iic: Register child nodes
i2c: New-style EEPROM driver using device IDs
i2c: Export the i2c_bus_type symbol
i2c-au1550: Fix PM support
i2c-dev: Delete empty detach_client callback
i2c: Drop stray references to lm_sensors
i2c: Check for ACPI resource conflicts
i2c-ocores: basic PM support
i2c-sibyte: SWARM I2C board initialization
i2c-i801: Fix handling of error conditions
i2c-i801: Rename local variable temp to status
i2c-i801: Properly report bus arbitration loss
i2c-i801: Remove verbose debugging messages
i2c-algo-pcf: Drop unused struct members
i2c-algo-pcf: Multi-master lost-arbitration improvement
i2c: Deprecate the legacy gpio drivers
i2c-pxa: Initialize early
...
15 Jul, 2008
7 commits
-
Signed-off-by: Sascha Sommer
Signed-off-by: Pierre Ossman -
Add Ben Dooks as S3C24XX SD/MMC driver maintainer.
Signed-off-by: Ben Dooks
Signed-off-by: Pierre Ossman -
Signed-off-by: Manuel Lauss
Signed-off-by: Pierre Ossman -
Signed-off-by: Artem Bityutskiy
-
Manual fixup of:
arch/powerpc/Kconfig
-
Signed-off-by: Jochen Friedrich
Signed-off-by: Jean Delvare
14 Jul, 2008
1 commit
13 Jul, 2008
2 commits
-
Cc: Philippe Elie
Cc: John Levon
Cc: Maynard Johnson
Cc: Richard Purdie
Cc: Daniel Hansel
Cc: Jason Yeh
Cc: Andrew Morton
Signed-off-by: Robert Richter
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Linux now supports the MPC5121 part and is handled by the same
maintainer. Update MAINTAINERS to reflect this. Also remove URLs
which are out of date or are not particularly relevant.Signed-off-by: Grant Likely
08 Jul, 2008
1 commit
-
… 'x86/ptrace' and 'x86/amd-iommu' into x86/devel
06 Jul, 2008
1 commit
-
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wan/hdlc_fr.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
05 Jul, 2008
9 commits
-
Acked-By: Debora Velarde
Cc:
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
The old one bounces.
Signed-off-by: Geert Uytterhoeven
Cc: Andreas Dilger
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Maintain the kernel's Documentation/ tree.
This includes tree layout and contents, although not much in terms of new
content production. That will usually have to be done by someone familiar
with the software, at least in some rough form.Includes review and editorial assistance for people contributing changes
to /Documentation.Also includes prodding people for content if something is in need of
documentation.Signed-off-by: Randy Dunlap
Acked-by: Michael Kerrisk
Cc: Jonathan Corbet
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
We probably need someone to look after the few drivers/mfd patches coming
every now and then. As agreed with Andrew, I'm ok to do so and my
employer is fine with me spending a few working hours on it, if needed.
Ben, Philipp, feel free to add your names there too if you wish.Signed-off-by: Samuel Ortiz
Cc: "pHilipp Zabel"
Cc: Ian Molton
Cc: Ben Dooks
Cc: Dmitry Baryshkov
Cc: Russell King
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Starting last month, I reached a long-time goal: man-pages finally has a
paid, full-time maintainer, thanks to a fellowship from the Linux
Foundation. It's still a little unclear how long the LF money will last
for the fellowship, but for the foreseeable future, I'll be working on:* Properly documenting every new Linux kernel-userland (and glibc) API,
and every API change, that is released into the mainline kernel, ideally
before actual release. (That's the ideal, but there's a quite a
backlog, so I'm not going to achieve the ideal immediately.)* Testing new APIs, again ideally before they are released into the
mainline kernel, and probably doing some light bug fixing while I'm at
it (e.g., the recent utimensat() work).* Design review of new APIs, which of course can only usefully be done
before they are released into the mainline kernel.* And of course accepting patches and dealing with bug reports for
existing man pages.Signed-off-by: Michael Kerrisk
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Update the delay accounting and taskstats maintainer to Balbir Singh.
I spoke to Shailabh and he is now busy with other things.Cc: Shailabh Nagar
Cc: Shailabh Nagar
Signed-off-by: Balbir Singh
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Signed-off-by: Miguel Ojeda
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Remove all clameter@sgi.com addresses from the kernel tree since they will
become invalid on June 27th. Change my maintainer email address for the
slab allocators to cl@linux-foundation.org (which will be the new email
address for the future).Signed-off-by: Christoph Lameter
Signed-off-by: Christoph Lameter
Cc: Pekka Enberg
Cc: Stephen Rothwell
Cc: Matt Mackall
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
This updates the MAINTAINERS entries for powerpc. It adds Ben H to
the overall Linux for PowerPC entry and makes it clear this covers
both 32-bit and 64-bit machines. It removes the separate entry we had
for Linux on 64-bit PowerPC where Anton and I were listed as
maintainers - Anton hasn't been involved in the day-to-day maintenance
of the code for several years. Finally, it removes the entry for the
Linux for PowerPC boot code where Tom Rini was listed as the
maintainer. That code got completely rewritten when we merged
32-bit and 64-bit, and I and the various platform maintainers have
been maintaining that code since.Signed-off-by: Paul Mackerras
Acked-by: Tom Rini
Signed-off-by: Linus Torvalds
01 Jul, 2008
1 commit
-
This driver supports video input devices compliant with the USB Video Class
specification. This means lots of currently manufactured webcams, and probably
most of the future ones.Signed-off-by: Laurent Pinchart
Signed-off-by: Mauro Carvalho Chehab
27 Jun, 2008
2 commits
-
Add an entry to the MAINTAINERS file for AMD IOMMU.
Signed-off-by: Joerg Roedel
Cc: iommu@lists.linux-foundation.org
Cc: bhavna.sarathy@amd.com
Cc: Sebastian.Biemueller@amd.com
Cc: robert.richter@amd.com
Cc: joro@8bytes.org
Signed-off-by: Ingo Molnar -
The latest trace about usage of this driver I found was an (unanswered)
request for help by a user trying to get it working reliably five years
ago with kernel 2.4 .And even if it was still working the use cases of this driver (requiring
both the hardware and someone providing this kind of wireless network)
have become practically nonexisting.This patch therefore removes the strip driver.
Signed-off-by: Adrian Bunk
Signed-off-by: John W. Linville
22 Jun, 2008
1 commit
-
* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
hwmon: (lm75) sensor reading bugfix
hwmon: (abituguru3) update driver detection
hwmon: (w83791d) new maintainer
hwmon: (abituguru3) Identify Abit AW8D board as such
hwmon: Update the sysfs interface documentation
hwmon: (adt7473) Initialize max_duty_at_overheat before use
hwmon: (lm85) Fix function RANGE_TO_REG()
19 Jun, 2008
1 commit
-
Signed-off-by: Charles Spirakis
Acked-by: Jean Delvare
Signed-off-by: Mark M. Hoffman
18 Jun, 2008
1 commit
-
Add PJ Waskiewicz to the list of maintainers for Intel 10/100/1000/10GbE
adapters.Signed-off-by: Jeff Kirsher
Signed-off-by: PJ Waskiewicz
Signed-off-by: Jeff Garzik
