23 Jul, 2011

40 commits

  • This moves the double fault data used at boot time into a single struct
    which can then easily be addressed with indexed loads rather than having
    to explicitly load multiple addresses.

    Signed-off-by: Mike Frysinger

    Mike Frysinger
     
  • Signed-off-by: Mike Frysinger

    Mike Frysinger
     
  • This just imports all of the optimization work done in the
    common startup code.

    Signed-off-by: Mike Frysinger

    Mike Frysinger
     
  • The default for the Blackfin SPI driver is 8 bits and dma disabled,
    so many of the bfin5xx_spi_chip resources are redundant. So punt
    those parts.

    Further, drivers should themselves be declaring 16 bit transfers,
    so for those that do, and for the ones which no longer do 16 bit
    transfers, drop the bfin5xx_spi_chip resources.

    Signed-off-by: Mike Frysinger

    Mike Frysinger
     
  • Signed-off-by: Mike Frysinger

    Mike Frysinger
     
  • No need for one line header stubs. Just declare it in Kbuild.

    Signed-off-by: Mike Frysinger

    Mike Frysinger
     
  • * 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86-64, vdso: Do not allocate memory for the vDSO
    clocksource: Change __ARCH_HAS_CLOCKSOURCE_DATA to a CONFIG option
    x86, vdso: Drop now wrong comment
    Document the vDSO and add a reference parser
    ia64: Replace clocksource.fsys_mmio with generic arch data
    x86-64: Move vread_tsc and vread_hpet into the vDSO
    clocksource: Replace vread with generic arch data
    x86-64: Add --no-undefined to vDSO build
    x86-64: Allow alternative patching in the vDSO
    x86: Make alternative instruction pointers relative
    x86-64: Improve vsyscall emulation CS and RIP handling
    x86-64: Emulate legacy vsyscalls
    x86-64: Fill unused parts of the vsyscall page with 0xcc
    x86-64: Remove vsyscall number 3 (venosys)
    x86-64: Map the HPET NX
    x86-64: Remove kernel.vsyscall64 sysctl
    x86-64: Give vvars their own page
    x86-64: Document some of entry_64.S
    x86-64: Fix alignment of jiffies variable

    Linus Torvalds
     
  • * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, UV: Correct UV2 BAU destination timeout
    x86, UV: Correct failed topology memory leak
    x86, UV: Remove cpumask_t from the stack
    x86, UV: Rename hubmask to pnmask
    x86, UV: Correct reset_with_ipi()
    x86, UV: Allow for non-consecutive sockets
    x86, UV: Inline header file functions
    x86, UV: Fix smp_processor_id() use in a preemptable region
    x66, UV: Enable 64-bit ACPI MFCG support for SGI UV2 platform
    x86, UV: Clean up uv_mmrs.h

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    * 'x86-signal-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Kill handle_signal()->set_fs()
    x86, do_signal: Simplify the TS_RESTORE_SIGMASK logic
    x86, signals: Convert the X86_32 code to use set_current_blocked()
    x86, signals: Convert the IA32_EMULATION code to use set_current_blocked()

    Linus Torvalds
     
  • * 'x86-numa-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, numa: Implement pfn -> nid mapping granularity check
    x86, mm: s/PAGES_PER_ELEMENT/PAGES_PER_SECTION/

    Linus Torvalds
     
  • * 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, mtrr: Use pci_dev->revision
    x86, mtrr: use stop_machine APIs for doing MTRR rendezvous
    stop_machine: implement stop_machine_from_inactive_cpu()
    stop_machine: reorganize stop_cpus() implementation
    x86, mtrr: lock stop machine during MTRR rendezvous sequence

    Linus Torvalds
     
  • …nel/git/tip/linux-2.6-tip

    * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, microcode, AMD: Fix section header size check
    x86, microcode, AMD: Correct buf references

    Linus Torvalds
     
  • * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, mce: Use mce_sysdev_ prefix to group functions
    x86, mce: Use mce_chrdev_ prefix to group functions
    x86, mce: Cleanup mce_read()
    x86, mce: Cleanup mce_create()/remove_device()
    x86, mce: Check the result of ancient_init()
    x86, mce: Introduce mce_gather_info()
    x86, mce: Replace MCM_ with MCI_MISC_
    x86, mce: Replace MCE_SELF_VECTOR by irq_work
    x86, mce, severity: Clean up trivial coding style problems
    x86, mce, severity: Cleanup severity table
    x86, mce, severity: Make formatting a bit more readable
    x86, mce, severity: Fix two severities table signatures

    Linus Torvalds
     
  • * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, efi: Properly pre-initialize table pointers
    x86, efi: Add infrastructure for UEFI 2.0 runtime services
    x86, efi: Fix argument types for SetVariable()

    Linus Torvalds
     
  • * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, intel, power: Correct the MSR_IA32_ENERGY_PERF_BIAS message
    x86, msr: Fix typo in ENERGY_PERF_BIAS_POWERSAVE
    x86, intel, power: Initialize MSR_IA32_ENERGY_PERF_BIAS

    Linus Torvalds
     
  • …el/git/tip/linux-2.6-tip

    * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, smpboot: Mark the names[] array in __inquire_remote_apic() as const
    x86: Convert vmalloc()+memset() to vzalloc()

    Linus Torvalds
     
  • * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Fix write lock scalability 64-bit issue
    x86: Unify rwsem assembly implementation
    x86: Unify rwlock assembly implementation
    x86, asm: Fix binutils 2.16 issue with __USER32_CS
    x86, asm: Cleanup thunk_64.S
    x86, asm: Flip RESTORE_ARGS arguments logic
    x86, asm: Flip SAVE_ARGS arguments logic
    x86, asm: Thin down SAVE/RESTORE_* asm macros

    Linus Torvalds
     
  • * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, ioapic: Print IR_IO_APIC_route_entry when IR is enabled
    x86, ioapic: Print IRTE when IR is enabled
    x86, x2apic: Preserve high 32-bits of IA32_APIC_BASE MSR
    x86, ioapic: Also print Dest field
    x86, ioapic: Format clean up for IOAPIC output
    x86: print APIC data a little later during boot

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    * 'timers-rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Serialize EFI time accesses on rtc_lock
    x86: Serialize SMP bootup CMOS accesses on rtc_lock
    rtc: stmp3xxx: Remove UIE handlers
    rtc: stmp3xxx: Get rid of mach-specific accessors
    rtc: stmp3xxx: Initialize drvdata before registering device
    rtc: stmp3xxx: Port stmp-functions to mxs-equivalents
    rtc: stmp3xxx: Restore register definitions
    rtc: vt8500: Use define instead of hardcoded value for status bit

    Linus Torvalds
     
  • …l/git/tip/linux-2.6-tip

    * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    time: Fix stupid KERN_WARN compile issue
    rtc: Avoid accumulating time drift in suspend/resume
    time: Avoid accumulating time drift in suspend/resume
    time: Catch invalid timespec sleep values in __timekeeping_inject_sleeptime

    Linus Torvalds
     
  • …rnel/git/tip/linux-2.6-tip

    * 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    mips: Fix i8253 clockevent fallout
    i8253: Cleanup outb/inb magic
    arm: Footbridge: Use common i8253 clockevent
    mips: Use common i8253 clockevent
    x86: Use common i8253 clockevent
    i8253: Create common clockevent implementation
    i8253: Export i8253_lock unconditionally
    pcpskr: MIPS: Make config dependencies finer grained
    pcspkr: Cleanup Kconfig dependencies
    i8253: Move remaining content and delete asm/i8253.h
    i8253: Consolidate definitions of PIT_LATCH
    x86: i8253: Consolidate definitions of global_clock_event
    i8253: Alpha, PowerPC: Remove unused asm/8253pit.h
    alpha: i8253: Cleanup remaining users of i8253pit.h
    i8253: Remove I8253_LOCK config
    i8253: Make pcsp sound driver use the shared i8253_lock
    i8253: Make pcspkr input driver use the shared i8253_lock
    i8253: Consolidate all kernel definitions of i8253_lock
    i8253: Unify all kernel declarations of i8253_lock
    i8253: Create linux/i8253.h and use it in all 8253 related files

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (24 commits)
    sched: Cleanup duplicate local variable in [enqueue|dequeue]_task_fair
    sched: Replace use of entity_key()
    sched: Separate group-scheduling code more clearly
    sched: Reorder root_domain to remove 64 bit alignment padding
    sched: Do not attempt to destroy uninitialized rt_bandwidth
    sched: Remove unused function cpu_cfs_rq()
    sched: Fix (harmless) typo 'CONFG_FAIR_GROUP_SCHED'
    sched, cgroup: Optimize load_balance_fair()
    sched: Don't update shares twice on on_rq parent
    sched: update correct entity's runtime in check_preempt_wakeup()
    xtensa: Use generic config PREEMPT definition
    h8300: Use generic config PREEMPT definition
    m32r: Use generic PREEMPT config
    sched: Skip autogroup when looking for all rt sched groups
    sched: Simplify mutex_spin_on_owner()
    sched: Remove rcu_read_lock() from wake_affine()
    sched: Generalize sleep inside spinlock detection
    sched: Make sleeping inside spinlock detection working in !CONFIG_PREEMPT
    sched: Isolate preempt counting in its own config option
    sched: Remove pointless in_atomic() definition check
    ...

    Linus Torvalds
     
  • …git/tip/linux-2.6-tip

    * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (123 commits)
    perf: Remove the nmi parameter from the oprofile_perf backend
    x86, perf: Make copy_from_user_nmi() a library function
    perf: Remove perf_event_attr::type check
    x86, perf: P4 PMU - Fix typos in comments and style cleanup
    perf tools: Make test use the preset debugfs path
    perf tools: Add automated tests for events parsing
    perf tools: De-opt the parse_events function
    perf script: Fix display of IP address for non-callchain path
    perf tools: Fix endian conversion reading event attr from file header
    perf tools: Add missing 'node' alias to the hw_cache[] array
    perf probe: Support adding probes on offline kernel modules
    perf probe: Add probed module in front of function
    perf probe: Introduce debuginfo to encapsulate dwarf information
    perf-probe: Move dwarf library routines to dwarf-aux.{c, h}
    perf probe: Remove redundant dwarf functions
    perf probe: Move strtailcmp to string.c
    perf probe: Rename DIE_FIND_CB_FOUND to DIE_FIND_CB_END
    tracing/kprobe: Update symbol reference when loading module
    tracing/kprobes: Support module init function probing
    kprobes: Return -ENOENT if probe point doesn't exist
    ...

    Linus Torvalds
     
  • * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    rcu: Fix wrong check in list_splice_init_rcu()
    net,rcu: Convert call_rcu(xt_rateest_free_rcu) to kfree_rcu()
    sysctl,rcu: Convert call_rcu(free_head) to kfree
    vmalloc,rcu: Convert call_rcu(rcu_free_vb) to kfree_rcu()
    vmalloc,rcu: Convert call_rcu(rcu_free_va) to kfree_rcu()
    ipc,rcu: Convert call_rcu(ipc_immediate_free) to kfree_rcu()
    ipc,rcu: Convert call_rcu(free_un) to kfree_rcu()
    security,rcu: Convert call_rcu(sel_netport_free) to kfree_rcu()
    security,rcu: Convert call_rcu(sel_netnode_free) to kfree_rcu()
    ia64,rcu: Convert call_rcu(sn_irq_info_free) to kfree_rcu()
    block,rcu: Convert call_rcu(disk_free_ptbl_rcu_cb) to kfree_rcu()
    scsi,rcu: Convert call_rcu(fc_rport_free_rcu) to kfree_rcu()
    audit_tree,rcu: Convert call_rcu(__put_tree) to kfree_rcu()
    security,rcu: Convert call_rcu(whitelist_item_free) to kfree_rcu()
    md,rcu: Convert call_rcu(free_conf) to kfree_rcu()

    Linus Torvalds
     
  • …l/git/tip/linux-2.6-tip

    * 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    lockdep: Fix trace_[soft,hard]irqs_[on,off]() recursion
    printk: Fix console_sem vs logbuf_lock unlock race
    printk: Release console_sem after logbuf_lock

    Linus Torvalds
     
  • …el/git/tip/linux-2.6-tip

    * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    lockdep: Fix lockdep_no_validate against IRQ states
    mutex: Make mutex_destroy() an inline function
    plist: Remove the need to supply locks to plist heads
    lockup detector: Fix reference to the non-existent CONFIG_DETECT_SOFTLOCKUP option

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    * 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    iommu/core: Fix build with INTR_REMAP=y && CONFIG_DMAR=n
    iommu/amd: Don't use MSI address range for DMA addresses
    iommu/amd: Move missing parts to drivers/iommu
    iommu: Move iommu Kconfig entries to submenu
    x86/ia64: intel-iommu: move to drivers/iommu/
    x86: amd_iommu: move to drivers/iommu/
    msm: iommu: move to drivers/iommu/
    drivers: iommu: move to a dedicated folder
    x86/amd-iommu: Store device alias as dev_data pointer
    x86/amd-iommu: Search for existind dev_data before allocting a new one
    x86/amd-iommu: Allow dev_data->alias to be NULL
    x86/amd-iommu: Use only dev_data in low-level domain attach/detach functions
    x86/amd-iommu: Use only dev_data for dte and iotlb flushing routines
    x86/amd-iommu: Store ATS state in dev_data
    x86/amd-iommu: Store devid in dev_data
    x86/amd-iommu: Introduce global dev_data_list
    x86/amd-iommu: Remove redundant device_flush_dte() calls
    iommu-api: Add missing header file

    Fix up trivial conflicts (independent additions close to each other) in
    drivers/Makefile and include/linux/pci.h

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (51 commits)
    PM: Improve error code of pm_notifier_call_chain()
    PM: Add "RTC" to PM trace time stamps to avoid confusion
    PM / Suspend: Export suspend_set_ops, suspend_valid_only_mem
    PM / Suspend: Add .suspend_again() callback to suspend_ops
    PM / OPP: Introduce function to free cpufreq table
    ARM / shmobile: Return -EBUSY from A4LC power off if A3RV is active
    PM / Domains: Take .power_off() error code into account
    ARM / shmobile: Use genpd_queue_power_off_work()
    ARM / shmobile: Use pm_genpd_poweroff_unused()
    PM / Domains: Introduce function to power off all unused PM domains
    OMAP: PM: disable idle on suspend for GPIO and UART
    OMAP: PM: omap_device: add API to disable idle on suspend
    OMAP: PM: omap_device: add system PM methods for PM domain handling
    OMAP: PM: omap_device: conditionally use PM domain runtime helpers
    PM / Runtime: Add new helper function: pm_runtime_status_suspended()
    PM / Domains: Queue up power off work only if it is not pending
    PM / Domains: Improve handling of wakeup devices during system suspend
    PM / Domains: Do not restore all devices on power off error
    PM / Domains: Allow callbacks to execute all runtime PM helpers
    PM / Domains: Do not execute device callbacks under locks
    ...

    Linus Torvalds
     
  • * 'for-linus-core' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (38 commits)
    target: Bump version to v4.1.0-rc1-ml
    target: remove custom hex2bin() implementation
    target: fix typo Assoication -> Association
    target: Update QUEUE ALGORITHM MODIFIER control page default
    target: ->map_task_SG conversion to ->map_control_SG and ->map_data_SG
    target: Follow up core updates from AGrover and HCH (round 4)
    target: Eliminate usage of struct se_mem
    target: Pass 2nd param of transport_split_cdb by value
    target: Enforce 1 page max for control cdb buffer sizes
    target: Make all control CDBs scatter-gather
    target: Implement Block Device Characteristics VPD page
    target: Fix reporting of supported VPD pages
    target: Allow for built-in target modules
    tcm_fc: Convert to wake_up_process and schedule_timeout_interruptible
    tcm_fc: Makefile cleanups
    loopback: Fix memory leak in tcm_loop_make_scsi_hba()
    loopback: Remove duplicate scsi/scsi_tcq.h include
    loopback: off by one in tcm_loop_make_naa_tpg()
    target/iblock: Remove unused iblock_dev members
    target/iblock: Use request_queue->nr_request for se_device defaults
    ...

    Linus Torvalds
     
  • * 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
    percpu: Fixup __this_cpu_xchg* operations

    Linus Torvalds
     
  • * 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
    workqueue: separate out drain_workqueue() from destroy_workqueue()
    workqueue: remove cancel_rearming_delayed_work[queue]()

    Linus Torvalds
     
  • * 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc: (39 commits)
    ptrace: do_wait(traced_leader_killed_by_mt_exec) can block forever
    ptrace: fix ptrace_signal() && STOP_DEQUEUED interaction
    connector: add an event for monitoring process tracers
    ptrace: dont send SIGSTOP on auto-attach if PT_SEIZED
    ptrace: mv send-SIGSTOP from do_fork() to ptrace_init_task()
    ptrace_init_task: initialize child->jobctl explicitly
    has_stopped_jobs: s/task_is_stopped/SIGNAL_STOP_STOPPED/
    ptrace: make former thread ID available via PTRACE_GETEVENTMSG after PTRACE_EVENT_EXEC stop
    ptrace: wait_consider_task: s/same_thread_group/ptrace_reparented/
    ptrace: kill real_parent_is_ptracer() in in favor of ptrace_reparented()
    ptrace: ptrace_reparented() should check same_thread_group()
    redefine thread_group_leader() as exit_signal >= 0
    do not change dead_task->exit_signal
    kill task_detached()
    reparent_leader: check EXIT_DEAD instead of task_detached()
    make do_notify_parent() __must_check, update the callers
    __ptrace_detach: avoid task_detached(), check do_notify_parent()
    kill tracehook_notify_death()
    make do_notify_parent() return bool
    ptrace: s/tracehook_tracer_task()/ptrace_parent()/
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (31 commits)
    HID: fix support for Microsoft comfort mouse 4500
    HID: hid-multitouch: add one new multitouch device's VID/PID
    HID: prodikeys: remove a redundant forward declaration of struct pcmidi_snd
    HID: prodikeys: make needlessly global symbols static
    HID: emsff: properly handle emsff_init failure
    HID: ACRUX - add missing hid_hw_stop() in ax_probe() error path
    HID: fix horizontal wheel for ms comfort mouse 4500
    HID: uclogic: Add support for UC-Logic WP1062
    HID: wiimote: Add sysfs support to wiimote driver
    HID: wiimote: Cache wiimote led state
    HID: wiimote: Add wiimote led request
    HID: wiimote: Add wiimote input button parser
    HID: wiimote: Add wiimote event handler
    HID: wiimote: Add output queue for wiimote driver
    HID: wiimote: Add wiimote send function
    HID: wiimote: Synchronize wiimote input and hid event handling
    HID: wiimote: Register input device in wiimote hid driver
    HID: wiimote: Add wiimote device structure
    HID: wiimote: Register wiimote hid driver stub
    HID: wiimote: Add Nintendo Wii Remote driver stub
    ...

    Linus Torvalds
     
  • * 'of-pci' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
    pci/of: Consolidate pci_bus_to_OF_node()
    pci/of: Consolidate pci_device_to_OF_node()
    x86/devicetree: Use generic PCI OF matching
    microblaze/pci: Move the remains of pci_32.c to pci-common.c
    microblaze/pci: Remove powermac originated cruft
    pci/of: Match PCI devices to OF nodes dynamically

    Linus Torvalds
     
  • * 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6:
    dt: include linux/errno.h in linux/of_address.h
    of/address: Add of_find_matching_node_by_address helper
    dt: remove extra xsysace platform_driver registration
    tty/serial: Add devicetree support for nVidia Tegra serial ports
    dt: add empty of_property_read_u32[_array] for non-dt
    dt: bindings: move SEC node under new crypto/
    dt: add helper function to read u32 arrays
    tty/serial: change of_serial to use new of_property_read_u32() api
    dt: add 'const' for of_property_read_string parameter **out_string
    dt: add helper functions to read u32 and string property values
    tty: of_serial: support for 32 bit accesses
    dt: document the of_serial bindings
    dt/platform: allow device name to be overridden
    drivers/amba: create devices from device tree
    dt: add of_platform_populate() for creating device from the device tree
    dt: Add default match table for bus ids

    Linus Torvalds
     
  • * 'spi/next' of git://git.secretlab.ca/git/linux-2.6: (34 commits)
    spi/imx: add device tree probe support
    spi/imx: copy gpio number passed by platform data into driver private data
    spi/imx: use soc name in spi device type naming scheme
    spi/imx: merge type SPI_IMX_VER_0_7 into SPI_IMX_VER_0_4
    spi/imx: do not use spi_imx2_3 to name SPI_IMX_VER_2_3 function and macro
    spi/imx: use mx21 to name SPI_IMX_VER_0_0 function and macro
    spi/imx: do not make copy of spi_imx_devtype_data
    spi/dw: Add spi number into spi irq desc
    spi/tegra: Use engineering names in DT compatible property
    spi/fsl_spi: fix CPM spi driver
    mach-s3c2410: remove unused spi-gpio.h file
    spi: remove obsolete spi-s3c24xx-gpio driver
    mach-gta2: remove unused spi-gpio.h include
    mach-qt2410: convert to spi_gpio
    mach-jive: convert to spi_gpio
    spi/pxa2xx: Remove unavailable ssp_type from documentation
    spi/bfin_spi: uninline fat queue funcs
    spi/bfin_spi: constify pin array
    spi/bfin_spi: use structs for accessing hardware regs
    spi/topcliff-pch: Support new device ML7223 IOH
    ...

    Fix up trivial conflict in arch/arm/mach-ep93xx/Makefile

    Linus Torvalds
     
  • * 'gpio/next' of git://git.secretlab.ca/git/linux-2.6: (61 commits)
    gpio/mxc/mxs: fix build error introduced by the irq_gc_ack() renaming
    mcp23s08: add i2c support
    mcp23s08: isolate spi specific parts
    mcp23s08: get rid of setup/teardown callbacks
    gpio/tegra: dt: add binding for gpio polarity
    mcp23s08: remove unused work queue
    gpio/da9052: remove a redundant assignment for gpio->da9052
    gpio/mxc: add device tree probe support
    ARM: mxc: use ARCH_NR_GPIOS to define gpio number
    gpio/mxc: get rid of the uses of cpu_is_mx()
    gpio/mxc: add missing initialization of basic_mmio_gpio shadow variables
    gpio: Move mpc5200 gpio driver to drivers/gpio
    GPIO: DA9052 GPIO module v3
    gpio/tegra: Use engineering names in DT compatible property
    of/gpio: Add new method for getting gpios under different property names
    gpio/dt: Refine GPIO device tree binding
    gpio/ml-ioh: fix off-by-one for displaying variable i in dev_err
    gpio/pca953x: Deprecate meaningless device-tree bindings
    gpio/pca953x: Remove dynamic platform data pointer
    gpio/pca953x: Fix IRQ support.
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (26 commits)
    IB/qib: Defer HCA error events to tasklet
    mlx4_core: Bump the driver version to 1.0
    RDMA/cxgb4: Use printk_ratelimited() instead of printk_ratelimit()
    IB/mlx4: Support PMA counters for IBoE
    IB/mlx4: Use flow counters on IBoE ports
    IB/pma: Add include file for IBA performance counters definitions
    mlx4_core: Add network flow counters
    mlx4_core: Fix location of counter index in QP context struct
    mlx4_core: Read extended capabilities into the flags field
    mlx4_core: Extend capability flags to 64 bits
    IB/mlx4: Generate GID change events in IBoE code
    IB/core: Add GID change event
    RDMA/cma: Don't allow IPoIB port space for IBoE
    RDMA: Allow for NULL .modify_device() and .modify_port() methods
    IB/qib: Update active link width
    IB/qib: Fix potential deadlock with link down interrupt
    IB/qib: Add sysfs interface to read free contexts
    IB/mthca: Remove unnecessary read of PCI_CAP_ID_EXP
    IB/qib: Remove double define
    IB/qib: Remove unnecessary read of PCI_CAP_ID_EXP
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
    firewire: document the sysfs ABIs
    firewire: cdev: ABI documentation enhancements
    firewire: cdev: prevent race between first get_info ioctl and bus reset event queuing
    firewire: cdev: return -ENOTTY for unimplemented ioctls, not -EINVAL
    firewire: ohci: skip soft reset retries after card ejection
    firewire: ohci: fix PHY reg access after card ejection
    firewire: ohci: add a comment on PHY reg access serialization
    firewire: ohci: reduce potential context_stop latency
    firewire: ohci: remove superfluous posted write flushes
    firewire: net: replacing deprecated __attribute__((packed)) with __packed

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1287 commits)
    icmp: Fix regression in nexthop resolution during replies.
    net: Fix ppc64 BPF JIT dependencies.
    acenic: include NET_SKB_PAD headroom to incoming skbs
    ixgbe: convert to ndo_fix_features
    ixgbe: only enable WoL for magic packet by default
    ixgbe: remove ifdef check for non-existent define
    ixgbe: Pass staterr instead of re-reading status and error bits from descriptor
    ixgbe: Move interrupt related values out of ring and into q_vector
    ixgbe: add structure for containing RX/TX rings to q_vector
    ixgbe: inline the ixgbe_maybe_stop_tx function
    ixgbe: Update ATR to use recorded TX queues instead of CPU for routing
    igb: Fix for DH89xxCC near end loopback test
    e1000: always call e1000_check_for_link() on e1000_ce4100 MACs.
    netxen: add fw version compatibility check
    be2net: request native mode each time the card is reset
    ipv4: Constrain UFO fragment sizes to multiples of 8 bytes
    virtio_net: Fix panic in virtnet_remove
    ipv6: make fragment identifications less predictable
    ipv6: unshare inetpeers
    can: make function can_get_bittiming static
    ...

    Linus Torvalds