29 Oct, 2010

6 commits

  • and branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm

    * 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm:
    xen: register xen pci notifier
    xen: initialize cpu masks for pv guests in xen_smp_init
    xen: add a missing #include to arch/x86/pci/xen.c
    xen: mask the MTRR feature from the cpuid
    xen: make hvc_xen console work for dom0.
    xen: add the direct mapping area for ISA bus access
    xen: Initialize xenbus for dom0.
    xen: use vcpu_ops to setup cpu masks
    xen: map a dummy page for local apic and ioapic in xen_set_fixmap
    xen: remap MSIs into pirqs when running as initial domain
    xen: remap GSIs as pirqs when running as initial domain
    xen: introduce XEN_DOM0 as a silent option
    xen: map MSIs into pirqs
    xen: support GSI -> pirq remapping in PV on HVM guests
    xen: add xen hvm acpi_register_gsi variant
    acpi: use indirect call to register gsi in different modes
    xen: implement xen_hvm_register_pirq
    xen: get the maximum number of pirqs from xen
    xen: support pirq != irq

    * 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (27 commits)
    X86/PCI: Remove the dependency on isapnp_disable.
    xen: Update Makefile with CONFIG_BLOCK dependency for biomerge.c
    MAINTAINERS: Add myself to the Xen Hypervisor Interface and remove Chris Wright.
    x86: xen: Sanitse irq handling (part two)
    swiotlb-xen: On x86-32 builts, select SWIOTLB instead of depending on it.
    MAINTAINERS: Add myself for Xen PCI and Xen SWIOTLB maintainer.
    xen/pci: Request ACS when Xen-SWIOTLB is activated.
    xen-pcifront: Xen PCI frontend driver.
    xenbus: prevent warnings on unhandled enumeration values
    xenbus: Xen paravirtualised PCI hotplug support.
    xen/x86/PCI: Add support for the Xen PCI subsystem
    x86: Introduce x86_msi_ops
    msi: Introduce default_[teardown|setup]_msi_irqs with fallback.
    x86/PCI: Export pci_walk_bus function.
    x86/PCI: make sure _PAGE_IOMAP it set on pci mappings
    x86/PCI: Clean up pci_cache_line_size
    xen: fix shared irq device passthrough
    xen: Provide a variant of xen_poll_irq with timeout.
    xen: Find an unbound irq number in reverse order (high to low).
    xen: statically initialize cpu_evtchn_mask_p
    ...

    Fix up trivial conflicts in drivers/pci/Makefile

    Linus Torvalds
     
  • * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (39 commits)
    Revert "namespace: add source file location exceptions"
    Coccinelle: Add contextual message
    Coccinelle: Fix documentation
    Coccinelle: Find doubled arguments to boolean or bit operators.
    Coccinelle: Find nested lock+irqsave functions that use the same flags variables.
    namespace: add source file location exceptions
    scripts/extract-ikconfig: add support for bzip2, lzma and lzo
    kbuild: check return value of asprintf()
    scripts/namespace.pl: improve to get more correct results
    scripts/namespace.pl: some bug fixes
    scripts/namespace.pl: update file exclusion list
    scripts/namespace.pl: fix wrong source path
    Coccinelle: Use the -no_show_diff option for org and report mode
    Coccinelle: Add a new mode named 'chain'
    Coccinelle: Use new comment format to explain kfree.cocci
    Coccinelle: Improve user information with a new kind of comment
    Coccinelle: Update documentation
    MAINTAINERS: Coccinelle: Update email address
    Documentation/kbuild: modules.txt cleanup
    Documentation/kbuild: major edit of modules.txt sections 5-8
    ...

    Linus Torvalds
     
  • * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: (68 commits)
    hwmon: (it87) Add support for the IT8721F/IT8758E
    hwmon: (it87) Move conversion functions
    hwmon: Remove many EXPERIMENTAL flags
    hwmon: (lm85) Add support for ADT7468 high-frequency PWM mode
    hwmon: (lm85) Document the ADT7468 as supported
    hwmon: (lm85) Fix ADT7468 frequency table
    hwmon: I2C addresses are constant
    Move ams driver to macintosh
    hwmon: (pcf8591) Don't attempt to detect devices
    hwmon: (pcf8591) Register as a hwmon device
    hwmon: (w83795) Use standard attributes for chassis intrusion
    hwmon: (w83795) Exclude fan control feature by default
    hwmon: (w83795) Add myself as co-author and maintainer
    hwmon: (w83795) More style cleanups
    hwmon: (w83795) Fix LSB reading of voltage limits
    hwmon: (w83795) Use dev_get_drvdata() where possible
    hwmon: (w83795) Delay reading pwm config registers
    hwmon: (w83795) Delay reading limit registers
    hwmon: (w83795) Move register reads to dedicated functions
    hwmon: (w83795) Pack similar register reads
    ...

    Linus Torvalds
     
  • The ams driver isn't a hardware monitoring driver, so it shouldn't
    live under driver/hwmon. drivers/macintosh seems much more
    appropriate, as the driver is only useful on PowerBooks and iBooks.

    Signed-off-by: Jean Delvare
    Cc: Guenter Roeck
    Cc: Stelian Pop
    Cc: Michael Hanselmann
    Cc: Benjamin Herrenschmidt
    Cc: Grant Likely

    Jean Delvare
     
  • I've made so many changes to the w83795 driver that it's only fair to
    list myself as a co-author. I'll also maintain the driver for some
    time. There's more work needed on the driver for sure.

    Signed-off-by: Jean Delvare
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • This merges the staging-next tree to Linus's tree and resolves
    some conflicts that were present due to changes in other trees that were
    affected by files here.

    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

28 Oct, 2010

2 commits


27 Oct, 2010

12 commits

  • * 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (476 commits)
    vmwgfx: Implement a proper GMR eviction mechanism
    drm/radeon/kms: fix r6xx/7xx 1D tiling CS checker v2
    drm/radeon/kms: properly compute group_size on 6xx/7xx
    drm/radeon/kms: fix 2D tile height alignment in the r600 CS checker
    drm/radeon/kms/evergreen: set the clear state to the blit state
    drm/radeon/kms: don't poll dac load detect.
    gpu: Add Intel GMA500(Poulsbo) Stub Driver
    drm/radeon/kms: MC vram map needs to be >= pci aperture size
    drm/radeon/kms: implement display watermark support for evergreen
    drm/radeon/kms/evergreen: add some additional safe regs v2
    drm/radeon/r600: fix tiling issues in CS checker.
    drm/i915: Move gpu_write_list to per-ring
    drm/i915: Invalidate the to-ring, flush the old-ring when updating domains
    drm/i915/ringbuffer: Write the value passed in to the tail register
    agp/intel: Restore valid PTE bit for Sandybridge after bdd3072
    drm/i915: Fix flushing regression from 9af90d19f
    drm/i915/sdvo: Remove unused encoding member
    i915: enable AVI infoframe for intel_hdmi.c [v4]
    drm/i915: Fix current fb blocking for page flip
    drm/i915: IS_IRONLAKE is synonymous with gen == 5
    ...

    Fix up conflicts in
    - drivers/gpu/drm/i915/{i915_gem.c, i915/intel_overlay.c}: due to the
    new simplified stack-based kmap_atomic() interface
    - drivers/gpu/drm/vmwgfx/vmwgfx_drv.c: added .llseek entry due to BKL
    removal cleanups.

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (63 commits)
    IB/qib: clean up properly if pci_set_consistent_dma_mask() fails
    IB/qib: Allow driver to load if PCIe AER fails
    IB/qib: Fix uninitialized pointer if CONFIG_PCI_MSI not set
    IB/qib: Fix extra log level in qib_early_err()
    RDMA/cxgb4: Remove unnecessary KERN_ use
    RDMA/cxgb3: Remove unnecessary KERN_ use
    IB/core: Add link layer type information to sysfs
    IB/mlx4: Add VLAN support for IBoE
    IB/core: Add VLAN support for IBoE
    IB/mlx4: Add support for IBoE
    mlx4_en: Change multicast promiscuous mode to support IBoE
    mlx4_core: Update data structures and constants for IBoE
    mlx4_core: Allow protocol drivers to find corresponding interfaces
    IB/uverbs: Return link layer type to userspace for query port operation
    IB/srp: Sync buffer before posting send
    IB/srp: Use list_first_entry()
    IB/srp: Reduce number of BUSY conditions
    IB/srp: Eliminate two forward declarations
    IB/mlx4: Signal node desc changes to SM by using FW to generate trap 144
    IB: Replace EXTRA_CFLAGS with ccflags-y
    ...

    Linus Torvalds
     
  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (53 commits)
    ACPI: install ACPI table handler before any dynamic tables being loaded
    ACPI / PM: Blacklist another machine that needs acpi_sleep=nonvs
    ACPI: Page based coalescing of I/O remappings optimization
    ACPI: Convert simple locking to RCU based locking
    ACPI: Pre-map 'system event' related register blocks
    ACPI: Add interfaces for ioremapping/iounmapping ACPI registers
    ACPI: Maintain a list of ACPI memory mapped I/O remappings
    ACPI: Fix ioremap size for MMIO reads and writes
    ACPI / Battery: Return -ENODEV for unknown values in get_property()
    ACPI / PM: Fix reference counting of power resources
    Subject: [PATCH] ACPICA: Fix Scope() op in module level code
    ACPI battery: support percentage battery remaining capacity
    ACPI: Make Embedded Controller command timeout delay configurable
    ACPI dock: move some functions to .init.text
    ACPI: thermal: remove unused limit code
    ACPI: static sleep_states[] and acpi_gts_bfs_check
    ACPI: remove dead code
    ACPI: delete dedicated MAINTAINERS entries for ACPI EC and BATTERY drivers
    ACPI: Only processor needs CPU_IDLE
    ACPICA: Update version to 20101013
    ...

    Linus Torvalds
     
  • Add missing git as a prefix for git repositories in the few places it
    wasn't already used.

    Convert a space delimiter to a tab.

    Signed-off-by: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Removed by commit 0d58cef664e01f ("V4L/DVB: Remove obsolete zc0301 v4l
    driver").

    Signed-off-by: Joe Perches
    Acked-by: Amerigo Wang
    Cc: Mauro Carvalho Chehab
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Removed by commit 7373ab3669aec93 ("V4L/DVB: Remove obsolete ov511
    driver").

    Signed-off-by: Joe Perches
    Acked-by: Amerigo Wang
    Cc: Mauro Carvalho Chehab
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Removed by commit 431107ea5b680a24a ("ARM: S3C64XX: Merge mach-s3c6400 and
    mach-s3c6410").

    Signed-off-by: Joe Perches
    Acked-by: Ben Dooks
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Removed by commit 70556b143ae4c ("ARM: S3C24XX: Remove old mach-s3c2442").

    Signed-off-by: Joe Perches
    Acked-by: Ben Dooks
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Removed by commit dcd925f95194da4 ("pxa: merge stargate2 and imote2 board
    files").

    Signed-off-by: Joe Perches
    Acked-by: Jonathan Cameron
    Acked-by: Eric Miao
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • The original commit 403d29713e0a ("pxa/income: Add Income SBC support")
    started with the wrong file pattern.

    Signed-off-by: Joe Perches
    Acked-by: Marek Vasut
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • …sc', 'mlx4', 'nes', 'qib' and 'srp' into for-next

    Roland Dreier
     
  • Len Brown
     

26 Oct, 2010

2 commits

  • This driver adds support for Linear Technology LTC4261 I2C Negative
    Voltage Hot Swap Controller.

    Reviewed-by: Ira W. Snyder
    Reviewed-by: Tom Grennan
    Signed-off-by: Guenter Roeck

    Guenter Roeck
     
  • …t/khilman/linux-davinci

    * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (50 commits)
    davinci: fix remaining board support after io_pgoffst removal
    davinci: mityomapl138: make file local data static
    arm/davinci: remove duplicated include
    davinci: Initial support for Omapl138-Hawkboard
    davinci: MityDSP-L138/MityARM-1808 read MAC address from I2C Prom
    davinci: add tnetv107x touchscreen platform device
    input: add driver for tnetv107x touchscreen controller
    davinci: add keypad config for tnetv107x evm board
    davinci: add tnetv107x keypad platform device
    input: add driver for tnetv107x on-chip keypad controller
    net: davinci_emac: cleanup unused cpdma code
    net: davinci_emac: switch to new cpdma layer
    net: davinci_emac: separate out cpdma code
    net: davinci_emac: cleanup unused mdio emac code
    omap: cleanup unused davinci mdio arch code
    davinci: cleanup mdio arch code and switch to phy_id
    net: davinci_emac: switch to new mdio
    omap: add mdio platform devices
    davinci: add mdio platform devices
    net: davinci_emac: separate out davinci mdio
    ...

    Fix up trivial conflict in drivers/input/keyboard/Kconfig (two entries
    added next to each other - one from the davinci merge, one from the
    input merge)

    Linus Torvalds
     

25 Oct, 2010

9 commits

  • * 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
    uwb: Orphan the UWB and WUSB subsystems
    uwb: Remove the WLP subsystem and drivers

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (44 commits)
    eeepc-wmi: Add cpufv sysfs interface
    eeepc-wmi: add additional hotkeys
    panasonic-laptop: Simplify calls to acpi_pcc_retrieve_biosdata
    panasonic-laptop: Handle errors properly if they happen
    intel_pmic_gpio: fix off-by-one value range checking
    IBM Real-Time "SMI Free" mode driver -v7
    Add OLPC XO-1 rfkill driver
    Move hdaps driver to platform/x86
    ideapad-laptop: Fix Makefile
    intel_pmic_gpio: swap the bits and mask args for intel_scu_ipc_update_register
    ideapad: Add param: no_bt_rfkill
    ideapad: Change the driver name to ideapad-laptop
    ideapad: rewrite the sw rfkill set
    ideapad: rewrite the hw rfkill notify
    ideapad: use EC command to control camera
    ideapad: use return value of _CFG to tell if device exist or not
    ideapad: make sure we bind on the correct device
    ideapad: check VPC bit before sync rfkill hw status
    ideapad: add ACPI helpers
    dell-laptop: Add debugfs support
    ...

    Linus Torvalds
     
  • I'm no longer in a position to be the maintainer for the Ultra-Wide
    Band (UWB) and Ceritified Wireless USB (WUSB) subsystems and no one else
    has volunteered to take over.

    Signed-off-by: David Vrabel

    David Vrabel
     
  • The only Wimedia LLC Protocol (WLP) hardware was an Intel i1480 chip
    with a beta release of firmware that was never commercially available as
    a product. This hardware and firmware is no longer available as Intel
    sold their UWB/WLP IP. I also see little prospect of other WLP
    capable hardware ever being available.

    Signed-off-by: David Vrabel

    David Vrabel
     
  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
    Update broken web addresses in arch directory.
    Update broken web addresses in the kernel.
    Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
    Revert "Fix typo: configuation => configuration" partially
    ida: document IDA_BITMAP_LONGS calculation
    ext2: fix a typo on comment in ext2/inode.c
    drivers/scsi: Remove unnecessary casts of private_data
    drivers/s390: Remove unnecessary casts of private_data
    net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
    drivers/infiniband: Remove unnecessary casts of private_data
    drivers/gpu/drm: Remove unnecessary casts of private_data
    kernel/pm_qos_params.c: Remove unnecessary casts of private_data
    fs/ecryptfs: Remove unnecessary casts of private_data
    fs/seq_file.c: Remove unnecessary casts of private_data
    arm: uengine.c: remove C99 comments
    arm: scoop.c: remove C99 comments
    Fix typo configue => configure in comments
    Fix typo: configuation => configuration
    Fix typo interrest[ing|ed] => interest[ing|ed]
    Fix various typos of valid in comments
    ...

    Fix up trivial conflicts in:
    drivers/char/ipmi/ipmi_si_intf.c
    drivers/usb/gadget/rndis.c
    net/irda/irnet/irnet_ppp.c

    Linus Torvalds
     
  • * 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac: (25 commits)
    i7300_edac: Properly initialize per-csrow memory size
    V4L/DVB: i7300_edac: better initialize page counts
    MAINTAINERS: Add maintainer for i7300-edac driver
    i7300-edac: CodingStyle cleanup
    i7300_edac: Improve comments
    i7300_edac: Cleanup: reorganize the file contents
    i7300_edac: Properly detect channel on CE errors
    i7300_edac: enrich FBD error info for corrected errors
    i7300_edac: enrich FBD error info for fatal errors
    i7300_edac: pre-allocate a buffer used to prepare err messages
    i7300_edac: Fix MTR x4/x8 detection logic
    i7300_edac: Make the debug messages coherent with the others
    i7300_edac: Cleanup: remove get_error_info logic
    i7300_edac: Add a code to cleanup error registers
    i7300_edac: Add support for reporting FBD errors
    i7300_edac: Properly detect the type of error correction
    i7300_edac: Detect if the device is on single mode
    i7300_edac: Adds detection for enhanced scrub mode on x8
    i7300_edac: Clear the error bit after reading
    i7300_edac: Add error detection code for global errors
    ...

    Linus Torvalds
     
  • * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    i2c-viapro: Don't log nacks
    i2c/pca954x: Remove __devinit and __devexit from probe and remove functions
    MAINTAINERS: Add maintainer for PCA9541 I2C bus master selector driver
    i2c/mux: Driver for PCA9541 I2C Master Selector
    i2c: Optimize function i2c_detect()
    i2c: Discard warning message on device instantiation from user-space
    i2c-amd8111: Add proper error handling
    i2c: Change to new flag variable
    i2c: Remove unneeded inclusions of
    i2c: Let i2c_parent_is_i2c_adapter return the parent adapter
    i2c: Simplify i2c_parent_is_i2c_adapter
    i2c-pca-platform: Change device name of request_irq
    i2c: Fix Kconfig dependencies

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
    crypto: Makefile - replace the use of -objs with -y
    crypto: hifn_795x - use cancel_delayed_work_sync()
    crypto: talitos - sparse check endian fixes
    crypto: talitos - fix checkpatch warning
    crypto: talitos - fix warning: 'alg' may be used uninitialized in this function
    crypto: cryptd - Adding the AEAD interface type support to cryptd
    crypto: n2_crypto - Niagara2 driver needs to depend upon CRYPTO_DES
    crypto: Kconfig - update broken web addresses
    crypto: omap-sham - Adjust DMA parameters
    crypto: fips - FIPS requires algorithm self-tests
    crypto: omap-aes - OMAP2/3 AES hw accelerator driver
    crypto: updates to enable omap aes
    padata: add missing __percpu markup in include/linux/padata.h
    MAINTAINERS: Add maintainer entries for padata/pcrypt

    Linus Torvalds
     
  • Signed-off-by: Guenter Roeck
    Signed-off-by: Jean Delvare

    Guenter Roeck
     

24 Oct, 2010

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1699 commits)
    bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.
    vlan: Calling vlan_hwaccel_do_receive() is always valid.
    tproxy: use the interface primary IP address as a default value for --on-ip
    tproxy: added IPv6 support to the socket match
    cxgb3: function namespace cleanup
    tproxy: added IPv6 support to the TPROXY target
    tproxy: added IPv6 socket lookup function to nf_tproxy_core
    be2net: Changes to use only priority codes allowed by f/w
    tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled
    tproxy: added tproxy sockopt interface in the IPV6 layer
    tproxy: added udp6_lib_lookup function
    tproxy: added const specifiers to udp lookup functions
    tproxy: split off ipv6 defragmentation to a separate module
    l2tp: small cleanup
    nf_nat: restrict ICMP translation for embedded header
    can: mcp251x: fix generation of error frames
    can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set
    can-raw: add msg_flags to distinguish local traffic
    9p: client code cleanup
    rds: make local functions/variables static
    ...

    Fix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and
    drivers/net/wireless/ath/ath9k/debug.c as per David

    Linus Torvalds
     

23 Oct, 2010

8 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (141 commits)
    USB: mct_u232: fix broken close
    USB: gadget: amd5536udc.c: fix error path
    USB: imx21-hcd - fix off by one resource size calculation
    usb: gadget: fix Kconfig warning
    usb: r8a66597-udc: Add processing when USB was removed.
    mxc_udc: add workaround for ENGcm09152 for i.MX35
    USB: ftdi_sio: add device ids for ScienceScope
    USB: musb: AM35x: Workaround for fifo read issue
    USB: musb: add musb support for AM35x
    USB: AM35x: Add musb support
    usb: Fix linker errors with CONFIG_PM=n
    USB: ohci-sh - use resource_size instead of defining its own resource_len macro
    USB: isp1362-hcd - use resource_size instead of defining its own resource_len macro
    USB: isp116x-hcd - use resource_size instead of defining its own resource_len macro
    USB: xhci: Fix compile error when CONFIG_PM=n
    USB: accept some invalid ep0-maxpacket values
    USB: xHCI: PCI power management implementation
    USB: xHCI: bus power management implementation
    USB: xHCI: port remote wakeup implementation
    USB: xHCI: port power management implementation
    ...

    Manually fix up (non-data) conflict: the SCSI merge gad renamed the
    'hw_sector_size' member to 'physical_block_size', and the USB tree
    brought a new use of it.

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (49 commits)
    serial8250: ratelimit "too much work" error
    serial: bfin_sport_uart: speed up sport RX sample rate to be 3% faster
    serial: abstraction for 8250 legacy ports
    serial/imx: check that the buffer is non-empty before sending it out
    serial: mfd: add more baud rates support
    jsm: Remove the uart port on errors
    Alchemy: Add UART PM methods.
    8250: allow platforms to override PM hook.
    altera_uart: Don't use plain integer as NULL pointer
    altera_uart: Fix missing prototype for registering an early console
    altera_uart: Fixup type usage of port flags
    altera_uart: Make it possible to use Altera UART and 8250 ports together
    altera_uart: Add support for different address strides
    altera_uart: Add support for getting mapbase and IRQ from resources
    altera_uart: Add support for polling mode (IRQ-less)
    serial: Factor out uart_poll_timeout() from 8250 driver
    serial: mark the 8250 driver as maintained
    serial: 8250: Don't delay after transmitter is ready.
    tty: MAINTAINERS: add drivers/serial/jsm/ as maintained driver
    vcs: invoke the vt update callback when /dev/vcs* is written to
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (31 commits)
    driver core: Display error codes when class suspend fails
    Driver core: Add section count to memory_block struct
    Driver core: Add mutex for adding/removing memory blocks
    Driver core: Move find_memory_block routine
    hpilo: Despecificate driver from iLO generation
    driver core: Convert link_mem_sections to use find_memory_block_hinted.
    driver core: Introduce find_memory_block_hinted which utilizes kset_find_obj_hinted.
    kobject: Introduce kset_find_obj_hinted.
    driver core: fix build for CONFIG_BLOCK not enabled
    driver-core: base: change to new flag variable
    sysfs: only access bin file vm_ops with the active lock
    sysfs: Fail bin file mmap if vma close is implemented.
    FW_LOADER: fix kconfig dependency warning on HOTPLUG
    uio: Statically allocate uio_class and use class .dev_attrs.
    uio: Support 2^MINOR_BITS minors
    uio: Cleanup irq handling.
    uio: Don't clear driver data
    uio: Fix lack of locking in init_uio_class
    SYSFS: Allow boot time switching between deprecated and modern sysfs layout
    driver core: remove CONFIG_SYSFS_DEPRECATED_V2 but keep it for block devices
    ...

    Linus Torvalds
     
  • Stefano Stabellini
     
  • USB Attached SCSI is a new protocol specified jointly by the SCSI T10
    committee and the USB Implementors Forum.

    Signed-off-by: Matthew Wilcox
    Cc: Matthew Dharm
    [mina86@mina86.com: updated to use new USB_ prefix]
    Signed-off-by: Michal Nazarewicz
    Signed-off-by: Greg Kroah-Hartman

    Matthew Wilcox
     
  • Clearly I have gone insane, so I might as well tell the world about it.

    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     
  • Soott Kilau is handing off the maintainership of the jsm serial
    driver to me, and this patch just add the driver as maintained.

    Signed-off-by: Breno Leitao
    Signed-off-by: Greg Kroah-Hartman

    Breno Leitao
     
  • Add DEBUGFS information to my MAINTAINERS entry as some people have
    asked about this recently.

    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman