$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 7284ce6 Linux 2.6.33-rc4 Merging origin/master $ git merge origin/master Updating 7284ce6..6ccf80e Fast-forward MAINTAINERS | 3 +- Makefile | 3 +- arch/alpha/include/asm/topology.h | 3 + arch/arm/mach-davinci/include/mach/keyscan.h | 1 + arch/arm/mach-s3c2440/mach-mini2440.c | 36 ++++---- arch/arm/mach-s3c6410/mach-smdk6410.c | 1 + arch/arm/plat-s3c/dev-nand.c | 4 +- arch/m68knommu/platform/coldfire/pit.c | 1 - arch/powerpc/boot/Makefile | 4 +- arch/s390/include/asm/bug.h | 4 + arch/s390/include/asm/sigp.h | 20 +++-- arch/s390/include/asm/thread_info.h | 12 +-- arch/s390/include/asm/unistd.h | 6 +- arch/s390/kernel/compat_linux.c | 41 ++++----- arch/s390/kernel/compat_wrapper.S | 9 -- arch/s390/kernel/process.c | 3 +- arch/s390/kernel/ptrace.c | 8 ++ arch/s390/kernel/setup.c | 8 -- arch/s390/kernel/signal.c | 10 +-- arch/s390/kernel/smp.c | 9 ++ arch/s390/kernel/syscalls.S | 1 - arch/s390/kernel/topology.c | 2 +- arch/s390/lib/spinlock.c | 2 +- arch/s390/mm/mmap.c | 4 +- arch/sh/boards/mach-ecovec24/setup.c | 8 ++ arch/sh/tools/Makefile | 2 +- arch/x86/include/asm/mce.h | 3 +- arch/x86/include/asm/uv/uv_hub.h | 12 +++ arch/x86/kernel/aperture_64.c | 1 + arch/x86/kernel/apic/x2apic_uv_x.c | 26 ++++-- arch/x86/kernel/dumpstack.c | 14 ++-- arch/x86/kernel/process.c | 2 + arch/x86/xen/enlighten.c | 4 + drivers/base/memory.c | 34 +++++--- drivers/char/agp/amd64-agp.c | 5 +- drivers/char/agp/intel-agp.c | 6 +- drivers/char/hw_random/virtio-rng.c | 6 +- drivers/edac/amd64_edac.c | 2 +- drivers/edac/i5000_edac.c | 8 ++- drivers/gpu/drm/drm_crtc_helper.c | 5 +- drivers/gpu/drm/i915/i915_dma.c | 4 + drivers/gpu/drm/i915/i915_drv.c | 6 ++ drivers/gpu/drm/i915/i915_drv.h | 3 + drivers/gpu/drm/i915/i915_gem.c | 53 +++++++++++- drivers/gpu/drm/i915/i915_irq.c | 68 ++++++-------- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_bios.c | 35 +++++++- drivers/gpu/drm/i915/intel_bios.h | 40 +++++++++ drivers/gpu/drm/i915/intel_display.c | 84 +++++------------- drivers/gpu/drm/i915/intel_dp.c | 75 ++++------------- drivers/gpu/drm/i915/intel_hdmi.c | 50 ----------- drivers/gpu/drm/i915/intel_lvds.c | 17 ++++- drivers/gpu/drm/i915/intel_sdvo.c | 83 +++++++++++++++++- drivers/gpu/drm/i915/intel_tv.c | 2 - drivers/gpu/drm/radeon/r600.c | 8 +- drivers/gpu/drm/radeon/radeon_combios.c | 3 + drivers/gpu/drm/radeon/radeon_connectors.c | 8 ++ drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 21 ++++- drivers/gpu/drm/radeon/radeon_ttm.c | 5 +- drivers/hid/hid-apple.c | 7 ++ drivers/hid/hid-core.c | 4 + drivers/hid/hid-ids.h | 6 ++ drivers/hid/hid-samsung.c | 25 ++++-- drivers/hid/hid-wacom.c | 4 + drivers/i2c/busses/i2c-ali1563.c | 8 +- drivers/i2c/busses/i2c-pca-isa.c | 4 +- drivers/i2c/busses/i2c-pca-platform.c | 4 +- drivers/i2c/busses/i2c-piix4.c | 4 +- drivers/i2c/busses/i2c-viapro.c | 4 +- drivers/i2c/i2c-core.c | 7 +- drivers/input/evdev.c | 3 +- drivers/input/input.c | 86 +++++++++++++++--- drivers/input/joystick/gf2k.c | 2 +- drivers/input/joystick/xpad.c | 4 +- drivers/input/keyboard/atkbd.c | 69 +++++++-------- drivers/input/keyboard/davinci_keyscan.c | 8 ++ drivers/input/mouse/bcm5974.c | 44 +++++++++- drivers/input/mouse/psmouse-base.c | 69 ++++++--------- drivers/input/mouse/sentelic.c | 6 +- drivers/input/mouse/synaptics.c | 10 ++ drivers/input/mouse/synaptics.h | 1 + drivers/input/serio/i8042-x86ia64io.h | 7 ++ drivers/net/e1000e/e1000.h | 1 - drivers/net/e1000e/ich8lan.c | 76 +++++++++++++++- drivers/net/e1000e/phy.c | 85 ------------------ drivers/net/ixgbe/Makefile | 2 +- drivers/net/ixgbe/ixgbe.h | 2 +- drivers/net/ixgbe/ixgbe_82598.c | 2 +- drivers/net/ixgbe/ixgbe_82599.c | 2 +- drivers/net/ixgbe/ixgbe_common.c | 2 +- drivers/net/ixgbe/ixgbe_common.h | 2 +- drivers/net/ixgbe/ixgbe_dcb.c | 2 +- drivers/net/ixgbe/ixgbe_dcb.h | 2 +- drivers/net/ixgbe/ixgbe_dcb_82598.c | 2 +- drivers/net/ixgbe/ixgbe_dcb_82598.h | 2 +- drivers/net/ixgbe/ixgbe_dcb_82599.c | 2 +- drivers/net/ixgbe/ixgbe_dcb_82599.h | 2 +- drivers/net/ixgbe/ixgbe_dcb_nl.c | 2 +- drivers/net/ixgbe/ixgbe_ethtool.c | 2 +- drivers/net/ixgbe/ixgbe_fcoe.c | 2 +- drivers/net/ixgbe/ixgbe_fcoe.h | 2 +- drivers/net/ixgbe/ixgbe_main.c | 8 ++- drivers/net/ixgbe/ixgbe_phy.c | 2 +- drivers/net/ixgbe/ixgbe_phy.h | 2 +- drivers/net/ixgbe/ixgbe_type.h | 2 +- drivers/net/sfc/mcdi.c | 5 +- drivers/net/sfc/selftest.c | 8 ++- drivers/net/tg3.c | 27 ++++-- drivers/net/tg3.h | 3 + drivers/net/wireless/ath/ath5k/eeprom.c | 32 ++++++- drivers/net/wireless/ath/ath5k/eeprom.h | 8 ++ drivers/net/wireless/ath/ath9k/Kconfig | 2 +- drivers/net/wireless/ath/ath9k/ath9k.h | 6 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 2 +- drivers/net/wireless/iwlwifi/iwl-core.c | 45 +++++---- drivers/net/wireless/iwlwifi/iwl-dev.h | 2 +- drivers/net/wireless/mwl8k.c | 4 +- drivers/net/wireless/rt2x00/rt2800lib.c | 2 +- drivers/net/wireless/rt2x00/rt2x00.h | 6 ++ drivers/net/wireless/rt2x00/rt2x00dev.c | 12 +++- drivers/net/wireless/rt2x00/rt2x00queue.c | 6 +- drivers/net/wireless/zd1211rw/zd_mac.c | 13 ++-- drivers/s390/block/dasd_eckd.c | 14 ++- drivers/s390/block/dasd_ioctl.c | 14 ++- drivers/s390/char/con3215.c | 17 ---- drivers/s390/char/fs3270.c | 17 +++-- drivers/s390/char/tape_block.c | 39 -------- drivers/s390/char/tape_char.c | 18 +++- drivers/s390/char/vmcp.c | 12 ++- drivers/s390/cio/chsc_sch.c | 23 +++-- drivers/s390/crypto/zcrypt_api.c | 4 +- drivers/serial/8250_pnp.c | 2 + drivers/serial/sh-sci.c | 13 +++- drivers/video/s3c-fb.c | 14 ++-- drivers/video/via/accel.c | 5 +- drivers/video/via/viafbdev.c | 11 ++- drivers/virtio/virtio_balloon.c | 6 +- drivers/xen/manage.c | 8 +- fs/fcntl.c | 102 ++++++++++++++-------- fs/notify/inotify/inotify_fsnotify.c | 2 +- fs/notify/inotify/inotify_user.c | 4 +- fs/ramfs/file-nommu.c | 26 +----- include/linux/kernel.h | 4 + include/linux/kfifo.h | 42 +++++---- include/linux/mm.h | 1 + include/linux/mm_types.h | 4 +- include/linux/sched.h | 7 +- include/linux/serio.h | 19 ---- include/linux/string.h | 5 +- include/linux/tty.h | 4 +- include/net/ip.h | 2 +- ipc/shm.c | 3 + kernel/futex.c | 27 +++--- kernel/kfifo.c | 107 ++++++++++++++++------- kernel/smp.c | 2 +- kernel/trace/ftrace.c | 6 +- kernel/trace/ring_buffer.c | 4 +- kernel/trace/trace_events_filter.c | 29 ++++-- lib/string.c | 27 ++++++- lib/zlib_inflate/inffast.c | 32 +++++++- mm/memcontrol.c | 11 +-- mm/nommu.c | 102 +++++++++++++++------- mm/page_alloc.c | 4 +- mm/truncate.c | 30 +++---- mm/util.c | 2 +- mm/vmscan.c | 3 + net/ipv6/exthdrs.c | 7 ++- net/mac80211/iface.c | 47 +++++++++- net/mac80211/mlme.c | 8 +- net/mac80211/rx.c | 8 ++- net/mac80211/scan.c | 10 +- net/mac80211/tx.c | 5 +- net/mac80211/util.c | 12 +++ net/mac80211/wme.c | 96 +++++++++++++++------ net/mac80211/wme.h | 8 ++- net/wireless/core.c | 4 +- net/wireless/reg.c | 2 +- scripts/Makefile.lib | 9 ++- scripts/markup_oops.pl | 2 +- scripts/recordmcount.pl | 2 +- tools/perf/Makefile | 44 ++++++---- 181 files changed, 1710 insertions(+), 1059 deletions(-) Merging fixes/fixes $ git merge fixes/fixes Already up-to-date. Merging arm-current/master $ git merge arm-current/master Merge made by recursive. arch/arm/Kconfig | 70 ++++++++++++++++++++++++++-------------------------- arch/arm/Makefile | 4 +- 2 files changed, 37 insertions(+), 37 deletions(-) Merging m68k-current/for-linus $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master Already up-to-date. Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Merge made by recursive. drivers/message/fusion/mptbase.c | 2 + drivers/s390/scsi/zfcp_cfdc.c | 9 +++- drivers/s390/scsi/zfcp_dbf.c | 2 +- drivers/s390/scsi/zfcp_ext.h | 5 +- drivers/s390/scsi/zfcp_fc.c | 84 +++++++++++++++++++++++----------- drivers/s390/scsi/zfcp_fc.h | 2 + drivers/s390/scsi/zfcp_fsf.c | 19 ++++---- drivers/s390/scsi/zfcp_scsi.c | 1 + drivers/scsi/aacraid/aachba.c | 52 ++++++++++++++++----- drivers/scsi/aacraid/aacraid.h | 5 ++- drivers/scsi/aacraid/commctrl.c | 28 ++++++------ drivers/scsi/aacraid/comminit.c | 6 ++- drivers/scsi/aacraid/commsup.c | 72 +++++++++++++++++++++++++----- drivers/scsi/aacraid/dpcsup.c | 36 ++++++++++++--- drivers/scsi/aic7xxx/aic79xx_core.c | 53 +++++++++++++--------- drivers/scsi/qla2xxx/qla_def.h | 3 +- drivers/scsi/qla2xxx/qla_init.c | 12 +++--- drivers/scsi/qla2xxx/qla_os.c | 12 +++--- drivers/scsi/qla2xxx/qla_sup.c | 3 + drivers/scsi/qla2xxx/qla_version.h | 2 +- drivers/scsi/scsi_lib.c | 2 +- drivers/scsi/scsi_transport_fc.c | 5 ++- include/scsi/scsi_bsg_fc.h | 2 +- 23 files changed, 291 insertions(+), 126 deletions(-) mode change 100755 => 100644 drivers/scsi/lpfc/lpfc_hbadisc.c mode change 100755 => 100644 drivers/scsi/lpfc/lpfc_hw4.h Merging net-current/master $ git merge net-current/master Already up-to-date. Merging sound-current/for-linus $ git merge sound-current/for-linus Already up-to-date. Merging pci-current/for-linus $ git merge pci-current/for-linus Already up-to-date. Merging wireless-current/master $ git merge wireless-current/master Merge made by recursive. drivers/net/wireless/iwmc3200wifi/commands.c | 4 ++++ drivers/net/wireless/iwmc3200wifi/commands.h | 1 + net/mac80211/cfg.c | 3 +++ net/wireless/sme.c | 1 + 4 files changed, 9 insertions(+), 0 deletions(-) Merging kbuild-current/for-linus $ git merge kbuild-current/for-linus Auto-merging Makefile Auto-merging scripts/Makefile.lib Merge made by recursive. Merging quilt/driver-core.current $ git merge quilt/driver-core.current Already up-to-date. Merging quilt/tty.current $ git merge quilt/tty.current Auto-merging drivers/serial/8250_pnp.c Merge made by recursive. drivers/char/nozomi.c | 2 +- drivers/char/tty_io.c | 2 +- drivers/serial/8250_pnp.c | 10 +---- drivers/serial/imx.c | 2 +- drivers/serial/serial_core.c | 105 ++++++++++++++++++------------------------ drivers/serial/serial_cs.c | 3 +- fs/compat_ioctl.c | 3 + 7 files changed, 54 insertions(+), 73 deletions(-) Merging quilt/usb.current $ git merge quilt/usb.current Merge made by recursive. drivers/usb/core/devices.c | 2 +- drivers/usb/core/hcd.c | 18 ++++++++++++++++++ drivers/usb/core/hub.c | 18 ++++++++---------- drivers/usb/core/message.c | 8 ++++---- drivers/usb/core/sysfs.c | 6 ++++++ drivers/usb/host/ehci-hcd.c | 5 +++-- drivers/usb/host/ehci-hub.c | 20 +++++++++++++++++++- drivers/usb/host/ehci-q.c | 11 ++++++++--- drivers/usb/host/fhci-hcd.c | 3 ++- drivers/usb/host/isp1362-hcd.c | 25 ++++++++++++++++--------- drivers/usb/host/isp1760-hcd.c | 6 +++--- drivers/usb/host/uhci-hcd.c | 15 ++++++++++++++- drivers/usb/host/uhci-hub.c | 2 +- drivers/usb/serial/generic.c | 10 ++++++---- drivers/usb/storage/unusual_devs.h | 7 ------- drivers/usb/storage/usb.c | 3 ++- include/linux/usb.h | 1 + 17 files changed, 112 insertions(+), 48 deletions(-) Merging quilt/staging.current $ git merge quilt/staging.current Merge made by recursive. drivers/staging/asus_oled/asus_oled.c | 12 ++++-- drivers/staging/et131x/et1310_address_map.h | 18 +++++++--- drivers/staging/et131x/et1310_rx.c | 6 ++-- drivers/staging/hv/Hv.c | 50 +++++++++++++------------- drivers/staging/hv/Hv.h | 6 ++-- drivers/staging/hv/Vmbus.c | 12 ++++--- 6 files changed, 59 insertions(+), 45 deletions(-) Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c Merge made by recursive. Documentation/cpu-freq/governors.txt | 4 ++-- arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 3 ++- drivers/cpufreq/cpufreq_ondemand.c | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) Merging input-current/for-linus $ git merge input-current/for-linus Already up-to-date. Merging md-current/for-linus $ git merge md-current/for-linus Already up-to-date. Merging audit-current/for-linus $ git merge audit-current/for-linus Already up-to-date. Merging crypto-current/master $ git merge crypto-current/master Already up-to-date. Merging ide-curent/master $ git merge ide-curent/master Already up-to-date. Merging mtd-current/master $ git merge mtd-current/master Auto-merging kernel/kexec.c Auto-merging kernel/printk.c Merge made by recursive. drivers/mtd/maps/Kconfig | 17 ++ drivers/mtd/maps/pismo.c | 320 ++++++++++++++++++++++++++++++++++++ drivers/mtd/mtdoops.c | 2 +- drivers/mtd/tests/mtd_readtest.c | 6 +- drivers/mtd/tests/mtd_speedtest.c | 7 +- drivers/mtd/tests/mtd_stresstest.c | 6 +- include/linux/kmsg_dump.h | 1 + include/linux/mtd/pismo.h | 17 ++ kernel/kexec.c | 4 + kernel/panic.c | 3 +- kernel/printk.c | 1 + 11 files changed, 379 insertions(+), 5 deletions(-) create mode 100644 drivers/mtd/maps/pismo.c create mode 100644 include/linux/mtd/pismo.h Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging arm/devel $ git merge arm/devel Recorded preimage for 'arch/arm/Makefile' Auto-merging arch/arm/Kconfig Auto-merging arch/arm/Makefile CONFLICT (content): Merge conflict in arch/arm/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/arm/Makefile'. [master d8acbee] Merge remote branch 'arm/devel' $ git diff -M --stat --summary HEAD^.. .../arm/Samsung/clksrc-change-registers.awk | 167 ++ arch/arm/Kconfig | 18 +- arch/arm/Makefile | 2 + arch/arm/common/clkdev.c | 10 + arch/arm/common/dmabounce.c | 4 +- arch/arm/configs/raumfeld_defconfig | 1898 ++++++++++++++++++++ arch/arm/configs/s5p6440_defconfig | 969 ++++++++++ arch/arm/include/asm/cacheflush.h | 56 +- arch/arm/include/asm/clkdev.h | 3 + arch/arm/include/asm/dma-mapping.h | 79 +- arch/arm/include/asm/entry-macro-vic2.S | 57 + arch/arm/include/asm/io.h | 11 +- arch/arm/include/asm/mach/time.h | 8 - arch/arm/include/asm/page.h | 7 +- arch/arm/include/asm/setup.h | 12 - arch/arm/include/asm/smp_plat.h | 5 + arch/arm/kernel/Makefile | 1 + arch/arm/kernel/asm-offsets.c | 5 + arch/arm/kernel/leds.c | 115 ++ arch/arm/kernel/setup.c | 77 +- arch/arm/kernel/time.c | 178 -- arch/arm/kernel/vmlinux.lds.S | 4 - arch/arm/mach-bcmring/core.c | 3 +- arch/arm/mach-davinci/io.c | 2 +- arch/arm/mach-ep93xx/clock.c | 30 +- arch/arm/mach-ep93xx/core.c | 9 +- arch/arm/mach-ep93xx/dma-m2p.c | 6 +- arch/arm/mach-ep93xx/edb93xx.c | 21 + arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 7 +- arch/arm/mach-footbridge/common.c | 7 +- arch/arm/mach-integrator/core.c | 3 +- arch/arm/mach-integrator/integrator_cp.c | 4 +- arch/arm/mach-iop13xx/io.c | 7 +- arch/arm/mach-mmp/clock.c | 8 - arch/arm/mach-mmp/clock.h | 2 - arch/arm/mach-mmp/pxa168.c | 2 +- arch/arm/mach-mmp/pxa910.c | 2 +- arch/arm/mach-msm/io.c | 3 +- arch/arm/mach-mx1/clock.c | 4 +- arch/arm/mach-mx2/clock_imx21.c | 4 +- arch/arm/mach-mx2/clock_imx27.c | 4 +- arch/arm/mach-mx25/clock.c | 6 +- arch/arm/mach-mx3/clock-imx35.c | 4 +- arch/arm/mach-mx3/clock.c | 4 +- arch/arm/mach-mxc91231/clock.c | 4 +- arch/arm/mach-pnx4008/clock.c | 173 +- arch/arm/mach-pnx4008/clock.h | 6 +- arch/arm/mach-pnx4008/i2c.c | 108 +-- arch/arm/mach-pnx4008/include/mach/clkdev.h | 7 + arch/arm/mach-pnx4008/include/mach/timex.h | 54 - arch/arm/mach-pnx4008/pm.c | 2 + arch/arm/mach-pnx4008/time.c | 2 + arch/arm/mach-pnx4008/time.h | 70 + arch/arm/mach-pxa/Kconfig | 18 + arch/arm/mach-pxa/Makefile | 3 + arch/arm/mach-pxa/clock.c | 8 - arch/arm/mach-pxa/clock.h | 4 - arch/arm/mach-pxa/eseries.c | 2 +- arch/arm/mach-pxa/pxa25x.c | 4 +- arch/arm/mach-pxa/pxa27x.c | 2 +- arch/arm/mach-pxa/pxa300.c | 4 +- arch/arm/mach-pxa/pxa320.c | 2 +- arch/arm/mach-pxa/pxa3xx.c | 2 +- arch/arm/mach-pxa/raumfeld.c | 1100 ++++++++++++ arch/arm/mach-realview/core.c | 5 +- arch/arm/mach-s3c2412/clock.c | 52 +- arch/arm/mach-s3c2440/clock.c | 6 +- arch/arm/mach-s3c2442/clock.c | 6 +- arch/arm/mach-s3c2443/clock.c | 97 +- arch/arm/mach-s3c6400/include/mach/entry-macro.S | 28 +- arch/arm/mach-s3c6400/include/mach/map.h | 4 +- arch/arm/mach-s3c6400/include/mach/tick.h | 2 +- arch/arm/mach-s5p6440/Kconfig | 23 + arch/arm/mach-s5p6440/Makefile | 19 + arch/arm/mach-s5p6440/Makefile.boot | 2 + arch/arm/mach-s5p6440/cpu.c | 114 ++ arch/arm/mach-s5p6440/include/mach/debug-macro.S | 37 + arch/arm/mach-s5p6440/include/mach/entry-macro.S | 16 + arch/arm/mach-s5p6440/include/mach/gpio-core.h | 19 + arch/arm/mach-s5p6440/include/mach/gpio.h | 80 + arch/arm/mach-s5p6440/include/mach/hardware.h | 18 + arch/arm/mach-s5p6440/include/mach/irqs.h | 111 ++ arch/arm/mach-s5p6440/include/mach/map.h | 94 + arch/arm/mach-s5p6440/include/mach/memory.h | 19 + arch/arm/mach-s5p6440/include/mach/pwm-clock.h | 62 + arch/arm/mach-s5p6440/include/mach/regs-clock.h | 130 ++ arch/arm/mach-s5p6440/include/mach/regs-irq.h | 19 + arch/arm/mach-s5p6440/include/mach/system.h | 26 + arch/arm/mach-s5p6440/include/mach/tick.h | 24 + arch/arm/mach-s5p6440/include/mach/uncompress.h | 24 + arch/arm/mach-s5p6440/mach-smdk6440.c | 111 ++ arch/arm/mach-s5pc100/include/mach/tick.h | 2 +- arch/arm/mach-u300/clock.c | 5 +- arch/arm/mach-ux500/clock.c | 5 +- arch/arm/mach-versatile/core.c | 3 +- arch/arm/mach-w90x900/clock.c | 9 - arch/arm/mach-w90x900/clock.h | 1 - arch/arm/mach-w90x900/cpu.c | 2 +- arch/arm/mm/alignment.c | 6 +- arch/arm/mm/cache-fa.S | 32 +- arch/arm/mm/cache-v3.S | 43 +- arch/arm/mm/cache-v4.S | 43 +- arch/arm/mm/cache-v4wb.S | 32 +- arch/arm/mm/cache-v4wt.S | 40 +- arch/arm/mm/cache-v6.S | 34 +- arch/arm/mm/cache-v7.S | 34 +- arch/arm/mm/copypage-feroceon.c | 3 +- arch/arm/mm/copypage-v3.c | 2 +- arch/arm/mm/copypage-v4mc.c | 2 +- arch/arm/mm/copypage-v4wb.c | 3 +- arch/arm/mm/copypage-v4wt.c | 2 +- arch/arm/mm/copypage-v6.c | 4 +- arch/arm/mm/copypage-xsc3.c | 3 +- arch/arm/mm/copypage-xscale.c | 2 +- arch/arm/mm/dma-mapping.c | 159 +- arch/arm/mm/flush.c | 51 +- arch/arm/mm/init.c | 12 +- arch/arm/mm/ioremap.c | 57 +- arch/arm/mm/mmu.c | 41 +- arch/arm/mm/nommu.c | 12 + arch/arm/mm/proc-arm1020.S | 32 +- arch/arm/mm/proc-arm1020e.S | 32 +- arch/arm/mm/proc-arm1022.S | 32 +- arch/arm/mm/proc-arm1026.S | 32 +- arch/arm/mm/proc-arm920.S | 32 +- arch/arm/mm/proc-arm922.S | 32 +- arch/arm/mm/proc-arm925.S | 32 +- arch/arm/mm/proc-arm926.S | 32 +- arch/arm/mm/proc-arm940.S | 32 +- arch/arm/mm/proc-arm946.S | 32 +- arch/arm/mm/proc-feroceon.S | 54 +- arch/arm/mm/proc-mohawk.S | 32 +- arch/arm/mm/proc-xsc3.S | 32 +- arch/arm/mm/proc-xscale.S | 49 +- arch/arm/plat-iop/io.c | 3 +- arch/arm/plat-omap/io.c | 2 +- arch/arm/plat-s3c/Kconfig | 75 - arch/arm/plat-s3c/Makefile | 17 +- arch/arm/plat-s3c/include/plat/cpu.h | 3 + arch/arm/plat-s3c/include/plat/devs.h | 1 + arch/arm/plat-s3c24xx/clock-dclk.c | 22 +- arch/arm/plat-s3c24xx/s3c244x-clock.c | 4 +- arch/arm/plat-s3c64xx/Kconfig | 3 + arch/arm/plat-s3c64xx/clock.c | 10 +- arch/arm/plat-s3c64xx/cpu.c | 4 +- arch/arm/plat-s3c64xx/include/plat/irqs.h | 8 +- arch/arm/plat-s3c64xx/include/plat/regs-clock.h | 71 +- arch/arm/plat-s3c64xx/irq.c | 209 +-- arch/arm/plat-s3c64xx/s3c6400-clock.c | 510 ++---- arch/arm/plat-s5p/Kconfig | 38 + arch/arm/plat-s5p/Makefile | 24 + arch/arm/plat-s5p/clock.c | 136 ++ arch/arm/plat-s5p/cpu.c | 90 + arch/arm/plat-s5p/dev-uart.c | 165 ++ arch/arm/plat-s5p/include/plat/irqs.h | 83 + arch/arm/plat-s5p/include/plat/pll.h | 83 + arch/arm/plat-s5p/include/plat/s5p-clock.h | 38 + arch/arm/plat-s5p/include/plat/s5p6440.h | 37 + arch/arm/plat-s5p/irq.c | 73 + arch/arm/plat-s5p/s5p6440-clock.c | 698 +++++++ arch/arm/plat-s5p/s5p6440-init.c | 50 + arch/arm/plat-s5p/setup-i2c0.c | 25 + arch/arm/plat-s5pc1xx/Kconfig | 3 + arch/arm/plat-s5pc1xx/clock.c | 22 +- arch/arm/plat-s5pc1xx/include/plat/irqs.h | 19 +- arch/arm/plat-s5pc1xx/include/plat/regs-clock.h | 119 +-- arch/arm/plat-s5pc1xx/irq.c | 202 +-- arch/arm/plat-s5pc1xx/s5pc100-clock.c | 770 +++------ arch/arm/plat-samsung/Kconfig | 102 ++ arch/arm/plat-samsung/Makefile | 22 + arch/arm/plat-samsung/clock-clksrc.c | 203 +++ arch/arm/{plat-s3c => plat-samsung}/clock.c | 55 +- arch/arm/{plat-s3c => plat-samsung}/dev-fb.c | 0 arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc.c | 0 arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc1.c | 0 arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc2.c | 0 arch/arm/{plat-s3c => plat-samsung}/dev-i2c0.c | 0 arch/arm/{plat-s3c => plat-samsung}/dev-i2c1.c | 0 arch/arm/{plat-s3c => plat-samsung}/dev-nand.c | 0 .../arm/{plat-s3c => plat-samsung}/dev-usb-hsotg.c | 0 arch/arm/{plat-s3c => plat-samsung}/dev-usb.c | 0 arch/arm/{plat-s3c => plat-samsung}/gpio-config.c | 0 arch/arm/plat-samsung/include/plat/clock-clksrc.h | 83 + .../include/plat/clock.h | 35 +- arch/arm/plat-samsung/include/plat/irq-uart.h | 20 + arch/arm/plat-samsung/include/plat/irq-vic-timer.h | 13 + arch/arm/plat-samsung/irq-uart.c | 143 ++ arch/arm/plat-samsung/irq-vic-timer.c | 86 + arch/arm/{plat-s3c => plat-samsung}/pwm-clock.c | 112 +- arch/arm/plat-stmp3xxx/clock.c | 3 +- drivers/i2c/busses/i2c-pnx.c | 285 ++-- drivers/serial/Kconfig | 8 +- drivers/watchdog/pnx4008_wdt.c | 39 +- include/linux/i2c-pnx.h | 19 +- 194 files changed, 9637 insertions(+), 2890 deletions(-) create mode 100755 Documentation/arm/Samsung/clksrc-change-registers.awk create mode 100644 arch/arm/configs/raumfeld_defconfig create mode 100644 arch/arm/configs/s5p6440_defconfig create mode 100644 arch/arm/include/asm/entry-macro-vic2.S create mode 100644 arch/arm/kernel/leds.c create mode 100644 arch/arm/mach-pnx4008/include/mach/clkdev.h create mode 100644 arch/arm/mach-pnx4008/time.h create mode 100644 arch/arm/mach-pxa/raumfeld.c create mode 100644 arch/arm/mach-s5p6440/Kconfig create mode 100644 arch/arm/mach-s5p6440/Makefile create mode 100644 arch/arm/mach-s5p6440/Makefile.boot create mode 100644 arch/arm/mach-s5p6440/cpu.c create mode 100644 arch/arm/mach-s5p6440/include/mach/debug-macro.S create mode 100644 arch/arm/mach-s5p6440/include/mach/entry-macro.S create mode 100644 arch/arm/mach-s5p6440/include/mach/gpio-core.h create mode 100644 arch/arm/mach-s5p6440/include/mach/gpio.h create mode 100644 arch/arm/mach-s5p6440/include/mach/hardware.h create mode 100644 arch/arm/mach-s5p6440/include/mach/irqs.h create mode 100644 arch/arm/mach-s5p6440/include/mach/map.h create mode 100644 arch/arm/mach-s5p6440/include/mach/memory.h create mode 100644 arch/arm/mach-s5p6440/include/mach/pwm-clock.h create mode 100644 arch/arm/mach-s5p6440/include/mach/regs-clock.h create mode 100644 arch/arm/mach-s5p6440/include/mach/regs-irq.h create mode 100644 arch/arm/mach-s5p6440/include/mach/system.h create mode 100644 arch/arm/mach-s5p6440/include/mach/tick.h create mode 100644 arch/arm/mach-s5p6440/include/mach/uncompress.h create mode 100644 arch/arm/mach-s5p6440/mach-smdk6440.c create mode 100644 arch/arm/plat-s5p/Kconfig create mode 100644 arch/arm/plat-s5p/Makefile create mode 100644 arch/arm/plat-s5p/clock.c create mode 100644 arch/arm/plat-s5p/cpu.c create mode 100644 arch/arm/plat-s5p/dev-uart.c create mode 100644 arch/arm/plat-s5p/include/plat/irqs.h create mode 100644 arch/arm/plat-s5p/include/plat/pll.h create mode 100644 arch/arm/plat-s5p/include/plat/s5p-clock.h create mode 100644 arch/arm/plat-s5p/include/plat/s5p6440.h create mode 100644 arch/arm/plat-s5p/irq.c create mode 100644 arch/arm/plat-s5p/s5p6440-clock.c create mode 100644 arch/arm/plat-s5p/s5p6440-init.c create mode 100644 arch/arm/plat-s5p/setup-i2c0.c create mode 100644 arch/arm/plat-samsung/clock-clksrc.c rename arch/arm/{plat-s3c => plat-samsung}/clock.c (84%) rename arch/arm/{plat-s3c => plat-samsung}/dev-fb.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc1.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc2.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/dev-i2c0.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/dev-i2c1.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/dev-nand.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/dev-usb-hsotg.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/dev-usb.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/gpio-config.c (100%) create mode 100644 arch/arm/plat-samsung/include/plat/clock-clksrc.h rename arch/arm/{plat-s3c => plat-samsung}/include/plat/clock.h (72%) create mode 100644 arch/arm/plat-samsung/include/plat/irq-uart.h create mode 100644 arch/arm/plat-samsung/include/plat/irq-vic-timer.h create mode 100644 arch/arm/plat-samsung/irq-uart.c create mode 100644 arch/arm/plat-samsung/irq-vic-timer.c rename arch/arm/{plat-s3c => plat-samsung}/pwm-clock.c (82%) Merging davinci/davinci-next $ git merge davinci/davinci-next Merge made by recursive. arch/arm/mach-davinci/Kconfig | 4 + arch/arm/mach-davinci/Makefile | 3 +- arch/arm/mach-davinci/board-da830-evm.c | 4 +- arch/arm/mach-davinci/board-da850-evm.c | 34 +++- arch/arm/mach-davinci/board-dm646x-evm.c | 143 +++++++--- arch/arm/mach-davinci/cdce949.c | 289 ++++++++++++++++++++ arch/arm/mach-davinci/clock.c | 71 ++---- arch/arm/mach-davinci/clock.h | 25 ++- arch/arm/mach-davinci/common.c | 2 +- arch/arm/mach-davinci/cpuidle.c | 38 +--- arch/arm/mach-davinci/da830.c | 8 +- arch/arm/mach-davinci/da850.c | 82 +++++- arch/arm/mach-davinci/devices-da8xx.c | 146 +++++++++- arch/arm/mach-davinci/dm355.c | 51 ++-- arch/arm/mach-davinci/dm365.c | 2 +- arch/arm/mach-davinci/dm644x.c | 31 ++- arch/arm/mach-davinci/dm646x.c | 12 +- arch/arm/mach-davinci/dma.c | 67 ++++- arch/arm/mach-davinci/include/mach/cdce949.h | 19 ++ arch/arm/mach-davinci/include/mach/cpuidle.h | 1 + arch/arm/mach-davinci/include/mach/da8xx.h | 18 +- arch/arm/mach-davinci/include/mach/dm365.h | 2 +- arch/arm/mach-davinci/include/mach/dm644x.h | 2 +- arch/arm/mach-davinci/include/mach/dm646x.h | 4 +- arch/arm/mach-davinci/include/mach/edma.h | 2 - arch/arm/mach-davinci/include/mach/memory.h | 5 + arch/arm/mach-davinci/include/mach/mux.h | 1 + arch/arm/mach-davinci/include/mach/pm.h | 54 ++++ arch/arm/mach-davinci/include/mach/psc.h | 15 + arch/arm/mach-davinci/include/mach/timex.h | 7 +- arch/arm/mach-davinci/pm.c | 158 +++++++++++ arch/arm/mach-davinci/psc.c | 11 - arch/arm/mach-davinci/sleep.S | 224 +++++++++++++++ drivers/net/Kconfig | 2 +- drivers/net/davinci_emac.c | 55 +++-- .../mach/emac.h => include/linux/davinci_emac.h | 7 +- 36 files changed, 1331 insertions(+), 268 deletions(-) create mode 100644 arch/arm/mach-davinci/cdce949.c create mode 100644 arch/arm/mach-davinci/include/mach/cdce949.h create mode 100644 arch/arm/mach-davinci/include/mach/pm.h create mode 100644 arch/arm/mach-davinci/pm.c create mode 100644 arch/arm/mach-davinci/sleep.S rename arch/arm/mach-davinci/include/mach/emac.h => include/linux/davinci_emac.h (83%) Merging msm/for-next $ git merge msm/for-next Auto-merging arch/arm/Kconfig Removing arch/arm/mach-msm/clock-7x01a.c Removing arch/arm/mach-msm/idle.S Auto-merging arch/arm/mach-msm/io.c Merge made by recursive. arch/arm/Kconfig | 10 +- arch/arm/mach-msm/Kconfig | 671 ++++++- arch/arm/mach-msm/Makefile | 75 +- arch/arm/mach-msm/Makefile.boot | 18 + arch/arm/mach-msm/acpuclock-8x50.c | 723 +++++++ arch/arm/mach-msm/acpuclock.c | 915 ++++++++ arch/arm/mach-msm/acpuclock.h | 39 + arch/arm/mach-msm/avs.c | 323 +++ arch/arm/mach-msm/avs.h | 52 + arch/arm/mach-msm/avs_hw.S | 158 ++ arch/arm/mach-msm/board-comet.c | 488 +++++ arch/arm/mach-msm/board-halibut-keypad.c | 177 ++ arch/arm/mach-msm/board-halibut.c | 704 +++++++- arch/arm/mach-msm/board-msm7x27.c | 1195 +++++++++++ arch/arm/mach-msm/board-msm7x30.c | 209 ++ arch/arm/mach-msm/board-qsd8x50.c | 538 +++++ arch/arm/mach-msm/board-sapphire-gpio.c | 326 +++ arch/arm/mach-msm/board-sapphire-h2w.c | 545 +++++ arch/arm/mach-msm/board-sapphire-keypad.c | 122 ++ arch/arm/mach-msm/board-sapphire-mmc.c | 479 +++++ arch/arm/mach-msm/board-sapphire-panel.c | 656 ++++++ arch/arm/mach-msm/board-sapphire-rfkill.c | 99 + arch/arm/mach-msm/board-sapphire-wifi.c | 74 + arch/arm/mach-msm/board-sapphire.c | 1175 +++++++++++ arch/arm/mach-msm/board-sapphire.h | 219 ++ arch/arm/mach-msm/board-trout-gpio.c | 305 +++ arch/arm/mach-msm/board-trout-keypad.c | 345 +++ arch/arm/mach-msm/board-trout-mmc.c | 437 ++++ arch/arm/mach-msm/board-trout-panel.c | 642 ++++++ arch/arm/mach-msm/board-trout-rfkill.c | 93 + arch/arm/mach-msm/board-trout-wifi.c | 74 + arch/arm/mach-msm/board-trout.c | 841 ++++++++ arch/arm/mach-msm/board-trout.h | 162 ++ arch/arm/mach-msm/clock-7x01a.c | 126 -- arch/arm/mach-msm/clock-7x30.c | 957 +++++++++ arch/arm/mach-msm/clock-7x30.h | 143 ++ arch/arm/mach-msm/clock-pcom.c | 130 ++ arch/arm/mach-msm/clock-pcom.h | 147 ++ arch/arm/mach-msm/clock.c | 332 +++- arch/arm/mach-msm/clock.h | 69 +- arch/arm/mach-msm/cpufreq.c | 126 ++ arch/arm/mach-msm/dal.c | 1363 ++++++++++++ arch/arm/mach-msm/dal_remotetest.c | 454 ++++ arch/arm/mach-msm/dal_remotetest.h | 187 ++ arch/arm/mach-msm/devices.c | 358 +++- arch/arm/mach-msm/devices.h | 24 +- arch/arm/mach-msm/devices_htc.c | 450 ++++ arch/arm/mach-msm/dma.c | 81 +- arch/arm/mach-msm/dma_test.c | 404 ++++ arch/arm/mach-msm/fiq_glue.S | 64 + arch/arm/mach-msm/generic_gpio.c | 274 +++ arch/arm/mach-msm/gpio.c | 746 +++++++ arch/arm/mach-msm/gpio.h | 35 + arch/arm/mach-msm/gpio_chip.h | 61 + arch/arm/mach-msm/gpio_hw-7x30.h | 112 + arch/arm/mach-msm/gpio_hw-7xxx.h | 73 + arch/arm/mach-msm/gpio_hw-8xxx.h | 112 + arch/arm/mach-msm/gpio_hw.h | 49 + arch/arm/mach-msm/htc_acoustic.c | 239 +++ arch/arm/mach-msm/htc_akm_cal.c | 64 + arch/arm/mach-msm/htc_battery.c | 769 +++++++ arch/arm/mach-msm/htc_headset.c | 1246 +++++++++++ arch/arm/mach-msm/htc_pwrsink.c | 281 +++ arch/arm/mach-msm/htc_wifi_nvs.c | 56 + arch/arm/mach-msm/idle-v6.S | 177 ++ arch/arm/mach-msm/idle-v7.S | 175 ++ arch/arm/mach-msm/idle.S | 36 - arch/arm/mach-msm/idle.h | 36 + arch/arm/mach-msm/include/mach/board.h | 30 +- arch/arm/mach-msm/include/mach/board_htc.h | 78 + arch/arm/mach-msm/include/mach/camera.h | 297 +++ arch/arm/mach-msm/include/mach/clk.h | 53 + arch/arm/mach-msm/include/mach/dal.h | 155 ++ arch/arm/mach-msm/include/mach/dma.h | 40 +- arch/arm/mach-msm/include/mach/dma_test.h | 67 + arch/arm/mach-msm/include/mach/fiq.h | 33 + arch/arm/mach-msm/include/mach/gpio.h | 167 ++ arch/arm/mach-msm/include/mach/htc_headset.h | 173 ++ arch/arm/mach-msm/include/mach/htc_pwrsink.h | 87 + .../mach-msm/include/mach/internal_power_rail.h | 46 + arch/arm/mach-msm/include/mach/io.h | 2 +- arch/arm/mach-msm/include/mach/irqs-7x30.h | 158 ++ arch/arm/mach-msm/include/mach/irqs-7xxx.h | 76 + arch/arm/mach-msm/include/mach/irqs-8xxx.h | 104 + arch/arm/mach-msm/include/mach/irqs.h | 81 +- arch/arm/mach-msm/include/mach/memory.h | 29 +- arch/arm/mach-msm/include/mach/mmc.h | 18 +- arch/arm/mach-msm/include/mach/mpp.h | 73 + arch/arm/mach-msm/include/mach/msm_handset.h | 34 + arch/arm/mach-msm/include/mach/msm_i2ckbd.h | 41 + arch/arm/mach-msm/include/mach/msm_iomap.h | 102 +- arch/arm/mach-msm/include/mach/msm_otg.h | 72 + arch/arm/mach-msm/include/mach/msm_rpcrouter.h | 296 +++ arch/arm/mach-msm/include/mach/msm_smd.h | 82 + arch/arm/mach-msm/include/mach/msm_touch.h | 26 + arch/arm/mach-msm/include/mach/msm_touchpad.h | 37 + arch/arm/mach-msm/include/mach/oem_rapi_client.h | 91 + arch/arm/mach-msm/include/mach/pmic.h | 557 +++++ arch/arm/mach-msm/include/mach/remote_spinlock.h | 115 + arch/arm/mach-msm/include/mach/rpc_hsusb.h | 45 + arch/arm/mach-msm/include/mach/sirc.h | 103 + arch/arm/mach-msm/include/mach/smem_log.h | 245 +++ arch/arm/mach-msm/include/mach/system.h | 5 + arch/arm/mach-msm/include/mach/uncompress.h | 1 - arch/arm/mach-msm/include/mach/usbdiag.h | 44 + arch/arm/mach-msm/include/mach/vmalloc.h | 7 +- arch/arm/mach-msm/include/mach/vreg.h | 2 +- arch/arm/mach-msm/internal_power_rail.c | 90 + arch/arm/mach-msm/io.c | 125 ++- arch/arm/mach-msm/irq.c | 535 +++++- arch/arm/mach-msm/irq.h | 43 + arch/arm/mach-msm/jtag-v7.S | 117 ++ arch/arm/mach-msm/keypad-surf-ffa.c | 316 +++ arch/arm/mach-msm/keypad-surf-ffa.h | 29 + arch/arm/mach-msm/memory.c | 86 + arch/arm/mach-msm/modem_notifier.c | 237 +++ arch/arm/mach-msm/modem_notifier.h | 48 + arch/arm/mach-msm/mpp.c | 176 ++ arch/arm/mach-msm/msm-keypad-devices.h | 22 + arch/arm/mach-msm/msm_vibrator.c | 137 ++ arch/arm/mach-msm/nand_partitions.c | 187 ++ arch/arm/mach-msm/nohlt.c | 86 + arch/arm/mach-msm/oem_rapi_client.c | 489 +++++ arch/arm/mach-msm/ping_mdm_rpc_client.c | 772 +++++++ arch/arm/mach-msm/pm.c | 954 +++++++++ arch/arm/mach-msm/pm.h | 42 + arch/arm/mach-msm/pm2.c | 1666 +++++++++++++++ arch/arm/mach-msm/pmic.c | 1095 ++++++++++ arch/arm/mach-msm/pmic8058-gpio.c | 150 ++ arch/arm/mach-msm/pmic8058-mpp.c | 105 + arch/arm/mach-msm/pmic_debugfs.c | 1200 +++++++++++ arch/arm/mach-msm/proc_comm.c | 93 +- arch/arm/mach-msm/proc_comm.h | 192 +- arch/arm/mach-msm/proc_comm_test.c | 169 ++ arch/arm/mach-msm/remote_spinlock.c | 85 + arch/arm/mach-msm/reset_modem.c | 226 ++ arch/arm/mach-msm/rpc_hsusb.c | 574 +++++ arch/arm/mach-msm/rpc_server_dog_keepalive.c | 77 + arch/arm/mach-msm/rpc_server_handset.c | 380 ++++ arch/arm/mach-msm/rpc_server_time_remote.c | 90 + arch/arm/mach-msm/rpc_server_time_remote.h | 21 + arch/arm/mach-msm/sirc.c | 239 +++ arch/arm/mach-msm/smd.c | 1960 +++++++++++++++++ arch/arm/mach-msm/smd_ctl2.c | 677 ++++++ arch/arm/mach-msm/smd_nmea.c | 249 +++ arch/arm/mach-msm/smd_private.h | 256 +++ arch/arm/mach-msm/smd_qmi.c | 844 ++++++++ arch/arm/mach-msm/smd_rpcrouter.c | 2199 ++++++++++++++++++++ arch/arm/mach-msm/smd_rpcrouter.h | 210 ++ arch/arm/mach-msm/smd_rpcrouter_clients.c | 607 ++++++ arch/arm/mach-msm/smd_rpcrouter_device.c | 380 ++++ arch/arm/mach-msm/smd_rpcrouter_servers.c | 434 ++++ arch/arm/mach-msm/smd_tty.c | 284 +++ arch/arm/mach-msm/smem_log.c | 2024 ++++++++++++++++++ arch/arm/mach-msm/socinfo.c | 430 ++++ arch/arm/mach-msm/socinfo.h | 97 + arch/arm/mach-msm/timer.c | 714 ++++++- arch/arm/mach-msm/timer.h | 38 + arch/arm/mach-msm/vreg.c | 170 ++- include/linux/pm_qos_params.h | 3 +- kernel/pm_qos_params.c | 32 +- 161 files changed, 48299 insertions(+), 679 deletions(-) create mode 100644 arch/arm/mach-msm/acpuclock-8x50.c create mode 100644 arch/arm/mach-msm/acpuclock.c create mode 100644 arch/arm/mach-msm/acpuclock.h create mode 100644 arch/arm/mach-msm/avs.c create mode 100644 arch/arm/mach-msm/avs.h create mode 100644 arch/arm/mach-msm/avs_hw.S create mode 100644 arch/arm/mach-msm/board-comet.c create mode 100644 arch/arm/mach-msm/board-halibut-keypad.c create mode 100644 arch/arm/mach-msm/board-msm7x27.c create mode 100644 arch/arm/mach-msm/board-msm7x30.c create mode 100644 arch/arm/mach-msm/board-qsd8x50.c create mode 100644 arch/arm/mach-msm/board-sapphire-gpio.c create mode 100644 arch/arm/mach-msm/board-sapphire-h2w.c create mode 100644 arch/arm/mach-msm/board-sapphire-keypad.c create mode 100644 arch/arm/mach-msm/board-sapphire-mmc.c create mode 100644 arch/arm/mach-msm/board-sapphire-panel.c create mode 100644 arch/arm/mach-msm/board-sapphire-rfkill.c create mode 100644 arch/arm/mach-msm/board-sapphire-wifi.c create mode 100644 arch/arm/mach-msm/board-sapphire.c create mode 100644 arch/arm/mach-msm/board-sapphire.h create mode 100644 arch/arm/mach-msm/board-trout-gpio.c create mode 100644 arch/arm/mach-msm/board-trout-keypad.c create mode 100644 arch/arm/mach-msm/board-trout-mmc.c create mode 100644 arch/arm/mach-msm/board-trout-panel.c create mode 100644 arch/arm/mach-msm/board-trout-rfkill.c create mode 100644 arch/arm/mach-msm/board-trout-wifi.c create mode 100644 arch/arm/mach-msm/board-trout.c create mode 100644 arch/arm/mach-msm/board-trout.h delete mode 100644 arch/arm/mach-msm/clock-7x01a.c create mode 100644 arch/arm/mach-msm/clock-7x30.c create mode 100644 arch/arm/mach-msm/clock-7x30.h create mode 100644 arch/arm/mach-msm/clock-pcom.c create mode 100644 arch/arm/mach-msm/clock-pcom.h create mode 100644 arch/arm/mach-msm/cpufreq.c create mode 100644 arch/arm/mach-msm/dal.c create mode 100644 arch/arm/mach-msm/dal_remotetest.c create mode 100644 arch/arm/mach-msm/dal_remotetest.h create mode 100644 arch/arm/mach-msm/devices_htc.c create mode 100644 arch/arm/mach-msm/dma_test.c create mode 100644 arch/arm/mach-msm/fiq_glue.S create mode 100644 arch/arm/mach-msm/generic_gpio.c create mode 100644 arch/arm/mach-msm/gpio.c create mode 100644 arch/arm/mach-msm/gpio.h create mode 100644 arch/arm/mach-msm/gpio_chip.h create mode 100644 arch/arm/mach-msm/gpio_hw-7x30.h create mode 100644 arch/arm/mach-msm/gpio_hw-7xxx.h create mode 100644 arch/arm/mach-msm/gpio_hw-8xxx.h create mode 100644 arch/arm/mach-msm/gpio_hw.h create mode 100644 arch/arm/mach-msm/htc_acoustic.c create mode 100644 arch/arm/mach-msm/htc_akm_cal.c create mode 100644 arch/arm/mach-msm/htc_battery.c create mode 100644 arch/arm/mach-msm/htc_headset.c create mode 100644 arch/arm/mach-msm/htc_pwrsink.c create mode 100644 arch/arm/mach-msm/htc_wifi_nvs.c create mode 100644 arch/arm/mach-msm/idle-v6.S create mode 100644 arch/arm/mach-msm/idle-v7.S delete mode 100644 arch/arm/mach-msm/idle.S create mode 100644 arch/arm/mach-msm/idle.h create mode 100644 arch/arm/mach-msm/include/mach/board_htc.h create mode 100644 arch/arm/mach-msm/include/mach/camera.h create mode 100644 arch/arm/mach-msm/include/mach/clk.h create mode 100644 arch/arm/mach-msm/include/mach/dal.h create mode 100644 arch/arm/mach-msm/include/mach/dma_test.h create mode 100644 arch/arm/mach-msm/include/mach/fiq.h create mode 100644 arch/arm/mach-msm/include/mach/gpio.h create mode 100644 arch/arm/mach-msm/include/mach/htc_headset.h create mode 100644 arch/arm/mach-msm/include/mach/htc_pwrsink.h create mode 100644 arch/arm/mach-msm/include/mach/internal_power_rail.h create mode 100644 arch/arm/mach-msm/include/mach/irqs-7x30.h create mode 100644 arch/arm/mach-msm/include/mach/irqs-7xxx.h create mode 100644 arch/arm/mach-msm/include/mach/irqs-8xxx.h create mode 100644 arch/arm/mach-msm/include/mach/mpp.h create mode 100644 arch/arm/mach-msm/include/mach/msm_handset.h create mode 100644 arch/arm/mach-msm/include/mach/msm_i2ckbd.h create mode 100644 arch/arm/mach-msm/include/mach/msm_otg.h create mode 100644 arch/arm/mach-msm/include/mach/msm_rpcrouter.h create mode 100644 arch/arm/mach-msm/include/mach/msm_smd.h create mode 100644 arch/arm/mach-msm/include/mach/msm_touch.h create mode 100644 arch/arm/mach-msm/include/mach/msm_touchpad.h create mode 100644 arch/arm/mach-msm/include/mach/oem_rapi_client.h create mode 100644 arch/arm/mach-msm/include/mach/pmic.h create mode 100644 arch/arm/mach-msm/include/mach/remote_spinlock.h create mode 100644 arch/arm/mach-msm/include/mach/rpc_hsusb.h create mode 100644 arch/arm/mach-msm/include/mach/sirc.h create mode 100644 arch/arm/mach-msm/include/mach/smem_log.h create mode 100644 arch/arm/mach-msm/include/mach/usbdiag.h create mode 100644 arch/arm/mach-msm/internal_power_rail.c create mode 100644 arch/arm/mach-msm/irq.h create mode 100644 arch/arm/mach-msm/jtag-v7.S create mode 100644 arch/arm/mach-msm/keypad-surf-ffa.c create mode 100644 arch/arm/mach-msm/keypad-surf-ffa.h create mode 100644 arch/arm/mach-msm/memory.c create mode 100644 arch/arm/mach-msm/modem_notifier.c create mode 100644 arch/arm/mach-msm/modem_notifier.h create mode 100644 arch/arm/mach-msm/mpp.c create mode 100644 arch/arm/mach-msm/msm-keypad-devices.h create mode 100644 arch/arm/mach-msm/msm_vibrator.c create mode 100644 arch/arm/mach-msm/nand_partitions.c create mode 100644 arch/arm/mach-msm/nohlt.c create mode 100644 arch/arm/mach-msm/oem_rapi_client.c create mode 100644 arch/arm/mach-msm/ping_mdm_rpc_client.c create mode 100644 arch/arm/mach-msm/pm.c create mode 100644 arch/arm/mach-msm/pm.h create mode 100644 arch/arm/mach-msm/pm2.c create mode 100644 arch/arm/mach-msm/pmic.c create mode 100644 arch/arm/mach-msm/pmic8058-gpio.c create mode 100644 arch/arm/mach-msm/pmic8058-mpp.c create mode 100644 arch/arm/mach-msm/pmic_debugfs.c create mode 100644 arch/arm/mach-msm/proc_comm_test.c create mode 100644 arch/arm/mach-msm/remote_spinlock.c create mode 100644 arch/arm/mach-msm/reset_modem.c create mode 100644 arch/arm/mach-msm/rpc_hsusb.c create mode 100644 arch/arm/mach-msm/rpc_server_dog_keepalive.c create mode 100644 arch/arm/mach-msm/rpc_server_handset.c create mode 100644 arch/arm/mach-msm/rpc_server_time_remote.c create mode 100644 arch/arm/mach-msm/rpc_server_time_remote.h create mode 100644 arch/arm/mach-msm/sirc.c create mode 100644 arch/arm/mach-msm/smd.c create mode 100644 arch/arm/mach-msm/smd_ctl2.c create mode 100644 arch/arm/mach-msm/smd_nmea.c create mode 100644 arch/arm/mach-msm/smd_private.h create mode 100644 arch/arm/mach-msm/smd_qmi.c create mode 100644 arch/arm/mach-msm/smd_rpcrouter.c create mode 100644 arch/arm/mach-msm/smd_rpcrouter.h create mode 100644 arch/arm/mach-msm/smd_rpcrouter_clients.c create mode 100644 arch/arm/mach-msm/smd_rpcrouter_device.c create mode 100644 arch/arm/mach-msm/smd_rpcrouter_servers.c create mode 100644 arch/arm/mach-msm/smd_tty.c create mode 100644 arch/arm/mach-msm/smem_log.c create mode 100644 arch/arm/mach-msm/socinfo.c create mode 100644 arch/arm/mach-msm/socinfo.h create mode 100644 arch/arm/mach-msm/timer.h Merging omap/for-next $ git merge omap/for-next Auto-merging arch/arm/Kconfig Auto-merging drivers/mtd/maps/Kconfig Merge made by recursive. arch/arm/Kconfig | 1 + arch/arm/mach-omap1/Makefile | 2 +- arch/arm/mach-omap1/board-fsample.c | 9 +- arch/arm/mach-omap1/board-h2.c | 9 +- arch/arm/mach-omap1/board-h3.c | 9 +- arch/arm/mach-omap1/board-innovator.c | 9 +- arch/arm/mach-omap1/board-osk.c | 9 +- arch/arm/mach-omap1/board-palmte.c | 9 +- arch/arm/mach-omap1/board-palmtt.c | 9 +- arch/arm/mach-omap1/board-palmz71.c | 10 +- arch/arm/mach-omap1/board-perseus2.c | 9 +- arch/arm/mach-omap1/board-sx1.c | 11 +- arch/arm/mach-omap1/board-voiceblue.c | 9 +- arch/arm/mach-omap1/flash.c | 33 +++++ arch/arm/mach-omap2/board-2430sdp.c | 7 +- arch/arm/mach-omap2/board-h4.c | 7 +- arch/arm/mach-omap2/board-zoom-peripherals.c | 9 ++ arch/arm/mach-omap2/board-zoom3.c | 14 ++ arch/arm/mach-omap2/mux.c | 43 +++++-- arch/arm/mach-omap2/serial.c | 19 ++-- arch/arm/plat-omap/dma.c | 2 +- arch/arm/plat-omap/include/plat/flash.h | 16 +++ drivers/mtd/maps/Kconfig | 9 -- drivers/mtd/maps/Makefile | 1 - drivers/mtd/maps/omap_nor.c | 188 -------------------------- 25 files changed, 181 insertions(+), 272 deletions(-) create mode 100644 arch/arm/mach-omap1/flash.c create mode 100644 arch/arm/plat-omap/include/plat/flash.h Merging pxa/for-next $ git merge pxa/for-next Already up-to-date. Merging samsung/next-samsung $ git merge samsung/next-samsung Already up-to-date. Merging avr32/avr32-arch $ git merge avr32/avr32-arch Merge made by recursive. arch/avr32/mach-at32ap/at32ap700x.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) Merging blackfin/for-linus $ git merge blackfin/for-linus Merge made by recursive. arch/blackfin/kernel/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging cris/for-next $ git merge cris/for-next Auto-merging arch/cris/kernel/irq.c Merge made by recursive. arch/cris/arch-v10/kernel/irq.c | 2 +- arch/cris/arch-v32/kernel/irq.c | 2 +- arch/cris/arch-v32/kernel/pinmux.c | 4 ++-- arch/cris/arch-v32/mach-a3/pinmux.c | 2 +- arch/cris/arch-v32/mach-fs/pinmux.c | 4 ++-- arch/cris/kernel/irq.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) Merging ia64/test $ git merge ia64/test Already up-to-date. Merging m68k/for-next $ git merge m68k/for-next Already up-to-date. Merging m68knommu/for-next $ git merge m68knommu/for-next Removing arch/m68k/include/asm/mcfmbus.h Merge made by recursive. arch/m68k/include/asm/m5206sim.h | 2 + arch/m68k/include/asm/m520xsim.h | 4 + arch/m68k/include/asm/m523xsim.h | 8 +++ arch/m68k/include/asm/m5249sim.h | 9 ++- arch/m68k/include/asm/m527xsim.h | 10 +++ arch/m68k/include/asm/m528xsim.h | 38 +------------ arch/m68k/include/asm/m5307sim.h | 3 +- arch/m68k/include/asm/m532xsim.h | 37 +------------ arch/m68k/include/asm/m5407sim.h | 2 + arch/m68k/include/asm/mcfi2c.h | 29 ++++++++++ arch/m68k/include/asm/mcfmbus.h | 77 -------------------------- arch/m68k/include/asm/thread_info_no.h | 1 + arch/m68knommu/Kconfig | 4 + arch/m68knommu/kernel/process.c | 4 + arch/m68knommu/kernel/ptrace.c | 5 ++ arch/m68knommu/kernel/sys_m68k.c | 36 ++++++++++++ arch/m68knommu/kernel/syscalltable.S | 4 + arch/m68knommu/platform/5206/config.c | 41 ++++++++++++++ arch/m68knommu/platform/5206e/config.c | 41 ++++++++++++++ arch/m68knommu/platform/520x/config.c | 45 +++++++++++++++ arch/m68knommu/platform/523x/config.c | 46 +++++++++++++++ arch/m68knommu/platform/5249/config.c | 77 ++++++++++++++++++++++++++ arch/m68knommu/platform/5272/intc.c | 39 ++++++++++--- arch/m68knommu/platform/527x/config.c | 60 ++++++++++++++++++++ arch/m68knommu/platform/528x/config.c | 51 +++++++++++++++++ arch/m68knommu/platform/5307/config.c | 42 ++++++++++++++- arch/m68knommu/platform/532x/config.c | 45 +++++++++++++++ arch/m68knommu/platform/5407/config.c | 41 ++++++++++++++ arch/m68knommu/platform/68328/ints.c | 8 +-- arch/m68knommu/platform/68360/ints.c | 8 +-- arch/m68knommu/platform/coldfire/intc-2.c | 76 +++++++++++++++++++++++-- arch/m68knommu/platform/coldfire/intc-simr.c | 68 +++++++++++++++++++++- arch/m68knommu/platform/coldfire/intc.c | 59 ++++++++++++++++++- fs/binfmt_flat.c | 2 +- 34 files changed, 835 insertions(+), 187 deletions(-) create mode 100644 arch/m68k/include/asm/mcfi2c.h delete mode 100644 arch/m68k/include/asm/mcfmbus.h Merging microblaze/next $ git merge microblaze/next Merge made by recursive. arch/microblaze/Kconfig | 7 +- arch/microblaze/include/asm/device.h | 4 + arch/microblaze/include/asm/dma-mapping.h | 155 ++++++++++++++++++++++++++++- arch/microblaze/include/asm/io.h | 14 +-- arch/microblaze/include/asm/irq.h | 37 +++++++- arch/microblaze/include/asm/ptrace.h | 14 +++ arch/microblaze/include/asm/system.h | 3 + arch/microblaze/include/asm/unistd.h | 5 +- arch/microblaze/kernel/Makefile | 2 +- arch/microblaze/kernel/dma.c | 124 +++++++++++++++++++++++ arch/microblaze/kernel/head.S | 13 --- arch/microblaze/kernel/irq.c | 15 +++ arch/microblaze/kernel/prom_parse.c | 2 +- arch/microblaze/kernel/setup.c | 36 +++++++ arch/microblaze/kernel/syscall_table.S | 2 +- arch/microblaze/mm/init.c | 23 +++++ arch/powerpc/sysdev/xilinx_pci.c | 4 +- include/asm-generic/dma-mapping-common.h | 10 ++ 18 files changed, 434 insertions(+), 36 deletions(-) create mode 100644 arch/microblaze/kernel/dma.c Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Removing arch/mips/alchemy/common/puts.c Removing arch/mips/alchemy/common/reset.c Removing arch/mips/alchemy/devboards/db1x00/irqmap.c Removing arch/mips/alchemy/devboards/pb1200/irqmap.c Removing arch/mips/alchemy/mtx-1/irqmap.c Removing arch/mips/alchemy/xxs1500/irqmap.c Removing arch/mips/include/asm/mach-pb1x00/pb1100.h Removing arch/mips/include/asm/mach-pb1x00/pb1500.h Auto-merging drivers/mtd/maps/Kconfig Auto-merging drivers/mtd/maps/Makefile Removing drivers/mtd/maps/alchemy-flash.c Removing drivers/pcmcia/au1000_db1x00.c Removing drivers/pcmcia/au1000_xxs1500.c Removing sound/soc/au1x/sample-ac97.c Merge made by recursive. arch/mips/Kconfig | 3 +- arch/mips/Makefile | 6 +- arch/mips/alchemy/Kconfig | 28 +- arch/mips/alchemy/common/Makefile | 7 +- arch/mips/alchemy/common/dbdma.c | 74 +- arch/mips/alchemy/common/dma.c | 36 +- arch/mips/alchemy/common/gpiolib-au1000.c | 10 +- arch/mips/alchemy/common/irq.c | 436 +++--- arch/mips/alchemy/common/platform.c | 152 ++- arch/mips/alchemy/common/puts.c | 68 - arch/mips/alchemy/common/reset.c | 188 --- arch/mips/alchemy/common/setup.c | 12 +- arch/mips/alchemy/common/time.c | 35 +- arch/mips/alchemy/devboards/Makefile | 6 +- arch/mips/alchemy/devboards/bcsr.c | 148 ++ arch/mips/alchemy/devboards/db1200/Makefile | 1 + arch/mips/alchemy/devboards/db1200/platform.c | 561 ++++++++ arch/mips/alchemy/devboards/db1200/setup.c | 118 ++ arch/mips/alchemy/devboards/db1x00/Makefile | 2 +- arch/mips/alchemy/devboards/db1x00/board_setup.c | 185 ++- arch/mips/alchemy/devboards/db1x00/irqmap.c | 90 -- arch/mips/alchemy/devboards/db1x00/platform.c | 118 ++ arch/mips/alchemy/devboards/pb1000/board_setup.c | 30 +- arch/mips/alchemy/devboards/pb1100/Makefile | 3 +- arch/mips/alchemy/devboards/pb1100/board_setup.c | 32 +- arch/mips/alchemy/devboards/pb1100/platform.c | 50 + arch/mips/alchemy/devboards/pb1200/Makefile | 2 +- arch/mips/alchemy/devboards/pb1200/board_setup.c | 84 +- arch/mips/alchemy/devboards/pb1200/irqmap.c | 134 -- arch/mips/alchemy/devboards/pb1200/platform.c | 63 +- arch/mips/alchemy/devboards/pb1500/Makefile | 3 +- arch/mips/alchemy/devboards/pb1500/board_setup.c | 40 +- arch/mips/alchemy/devboards/pb1500/platform.c | 49 + arch/mips/alchemy/devboards/pb1550/Makefile | 3 +- arch/mips/alchemy/devboards/pb1550/board_setup.c | 45 +- arch/mips/alchemy/devboards/pb1550/platform.c | 69 + arch/mips/alchemy/devboards/platform.c | 222 +++ arch/mips/alchemy/devboards/platform.h | 21 + arch/mips/alchemy/devboards/prom.c | 5 + arch/mips/alchemy/mtx-1/Makefile | 2 +- arch/mips/alchemy/mtx-1/board_setup.c | 39 +- arch/mips/alchemy/mtx-1/init.c | 6 + arch/mips/alchemy/mtx-1/irqmap.c | 56 - arch/mips/alchemy/xxs1500/Makefile | 4 +- arch/mips/alchemy/xxs1500/board_setup.c | 52 +- arch/mips/alchemy/xxs1500/init.c | 6 + arch/mips/alchemy/xxs1500/irqmap.c | 52 - arch/mips/alchemy/xxs1500/platform.c | 63 + arch/mips/boot/compressed/Makefile | 2 +- arch/mips/boot/compressed/decompress.c | 4 +- arch/mips/cavium-octeon/octeon-irq.c | 40 +- arch/mips/cavium-octeon/octeon-platform.c | 85 ++ arch/mips/configs/db1200_defconfig | 1481 +++++++++++--------- arch/mips/configs/lemote2f_defconfig | 964 +++++++++---- arch/mips/include/asm/atomic.h | 16 +- arch/mips/include/asm/barrier.h | 54 +- arch/mips/include/asm/bitops.h | 8 +- arch/mips/include/asm/cmpxchg.h | 10 +- arch/mips/include/asm/ftrace.h | 2 +- arch/mips/include/asm/io.h | 18 + arch/mips/include/asm/mach-au1x00/au1000.h | 884 ++++++------- arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 23 +- arch/mips/include/asm/mach-au1x00/au1xxx_eth.h | 18 + arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 164 ++-- arch/mips/include/asm/mach-au1x00/gpio.h | 2 +- arch/mips/include/asm/mach-db1x00/bcsr.h | 238 ++++ arch/mips/include/asm/mach-db1x00/db1200.h | 156 +-- arch/mips/include/asm/mach-db1x00/db1x00.h | 100 -- .../asm/mach-loongson/cpu-feature-overrides.h | 2 +- .../include/asm/mach-loongson/cs5536/cs5536_vsm.h | 2 +- arch/mips/include/asm/mach-loongson/loongson.h | 5 +- arch/mips/include/asm/mach-loongson/machine.h | 4 +- arch/mips/include/asm/mach-loongson/mem.h | 2 +- arch/mips/include/asm/mach-loongson/pci.h | 13 +- arch/mips/include/asm/mach-pb1x00/pb1100.h | 85 -- arch/mips/include/asm/mach-pb1x00/pb1200.h | 122 +-- arch/mips/include/asm/mach-pb1x00/pb1500.h | 49 - arch/mips/include/asm/mach-pb1x00/pb1550.h | 96 -- arch/mips/include/asm/octeon/octeon.h | 5 + arch/mips/include/asm/page.h | 12 - arch/mips/include/asm/param.h | 17 +- arch/mips/include/asm/pgalloc.h | 4 +- arch/mips/include/asm/pgtable-64.h | 36 +- arch/mips/include/asm/pgtable.h | 2 +- arch/mips/include/asm/spinlock.h | 4 +- arch/mips/include/asm/system.h | 4 + arch/mips/kernel/asm-offsets.c | 4 + arch/mips/kernel/ftrace.c | 2 +- arch/mips/kernel/linux32.c | 1 - arch/mips/kernel/mcount.S | 2 +- arch/mips/kernel/rtlx.c | 1 - arch/mips/kernel/vpe.c | 1 - arch/mips/loongson/common/cmdline.c | 9 +- arch/mips/loongson/common/cs5536/cs5536_acc.c | 2 +- arch/mips/loongson/common/cs5536/cs5536_ehci.c | 2 +- arch/mips/loongson/common/cs5536/cs5536_ide.c | 2 +- arch/mips/loongson/common/cs5536/cs5536_isa.c | 2 +- arch/mips/loongson/common/cs5536/cs5536_mfgpt.c | 2 +- arch/mips/loongson/common/cs5536/cs5536_ohci.c | 2 +- arch/mips/loongson/common/cs5536/cs5536_pci.c | 2 +- arch/mips/loongson/common/early_printk.c | 2 +- arch/mips/loongson/common/env.c | 29 +- arch/mips/loongson/common/init.c | 2 +- arch/mips/loongson/common/machtype.c | 12 +- arch/mips/loongson/common/mem.c | 7 +- arch/mips/loongson/common/platform.c | 2 +- arch/mips/loongson/common/pm.c | 2 +- arch/mips/loongson/common/reset.c | 7 +- arch/mips/loongson/common/serial.c | 2 +- arch/mips/loongson/common/time.c | 4 +- arch/mips/loongson/common/uart_base.c | 2 +- arch/mips/loongson/fuloong-2e/reset.c | 4 +- arch/mips/loongson/lemote-2f/Makefile | 1 + arch/mips/loongson/lemote-2f/machtype.c | 45 + arch/mips/loongson/lemote-2f/pm.c | 2 +- arch/mips/loongson/lemote-2f/reset.c | 2 +- arch/mips/mm/init.c | 2 +- arch/mips/mm/pgtable-64.c | 44 +- arch/mips/mm/tlbex.c | 2 + arch/mips/oprofile/op_model_loongson2.c | 2 +- arch/mips/pci/fixup-lemote2f.c | 2 +- arch/mips/pci/ops-loongson2.c | 4 +- arch/mips/power/cpu.c | 4 +- arch/mips/power/hibernate.S | 4 +- arch/mips/sibyte/common/sb_tbprof.c | 1 - drivers/i2c/busses/Kconfig | 10 + drivers/i2c/busses/Makefile | 1 + drivers/i2c/busses/i2c-octeon.c | 579 ++++++++ drivers/ide/au1xxx-ide.c | 21 +- drivers/mmc/host/au1xmmc.c | 8 +- drivers/mtd/maps/Kconfig | 6 - drivers/mtd/maps/Makefile | 1 - drivers/mtd/maps/alchemy-flash.c | 166 --- drivers/mtd/nand/au1550nd.c | 4 +- drivers/net/au1000_eth.c | 449 +++--- drivers/net/au1000_eth.h | 9 + drivers/net/irda/au1k_ir.c | 14 +- drivers/pcmcia/Kconfig | 21 + drivers/pcmcia/Makefile | 12 +- drivers/pcmcia/au1000_db1x00.c | 305 ---- drivers/pcmcia/au1000_generic.h | 12 +- drivers/pcmcia/au1000_pb1x00.c | 119 +-- drivers/pcmcia/au1000_xxs1500.c | 188 --- drivers/pcmcia/db1xxx_ss.c | 630 +++++++++ drivers/pcmcia/xxs1500_ss.c | 357 +++++ drivers/serial/8250.c | 15 +- drivers/spi/au1550_spi.c | 6 +- drivers/staging/octeon/Kconfig | 1 + drivers/staging/octeon/ethernet-defines.h | 31 - drivers/staging/octeon/ethernet-mem.c | 89 +- drivers/staging/octeon/ethernet-rx.c | 377 +++--- drivers/staging/octeon/ethernet-rx.h | 25 +- drivers/staging/octeon/ethernet-tx.c | 342 +++--- drivers/staging/octeon/ethernet-tx.h | 27 +- drivers/staging/octeon/ethernet.c | 155 +-- drivers/staging/octeon/octeon-ethernet.h | 48 +- drivers/staging/sm7xx/smtc2d.c | 2 +- drivers/staging/sm7xx/smtc2d.h | 2 +- drivers/staging/sm7xx/smtcfb.c | 2 +- drivers/staging/sm7xx/smtcfb.h | 2 +- drivers/video/tdfxfb.c | 4 +- sound/oss/au1550_ac97.c | 16 +- sound/soc/au1x/Kconfig | 10 +- sound/soc/au1x/Makefile | 4 +- sound/soc/au1x/db1200.c | 141 ++ sound/soc/au1x/dbdma2.c | 14 +- sound/soc/au1x/sample-ac97.c | 144 -- 167 files changed, 7555 insertions(+), 5190 deletions(-) delete mode 100644 arch/mips/alchemy/common/puts.c delete mode 100644 arch/mips/alchemy/common/reset.c create mode 100644 arch/mips/alchemy/devboards/bcsr.c create mode 100644 arch/mips/alchemy/devboards/db1200/Makefile create mode 100644 arch/mips/alchemy/devboards/db1200/platform.c create mode 100644 arch/mips/alchemy/devboards/db1200/setup.c delete mode 100644 arch/mips/alchemy/devboards/db1x00/irqmap.c create mode 100644 arch/mips/alchemy/devboards/db1x00/platform.c create mode 100644 arch/mips/alchemy/devboards/pb1100/platform.c delete mode 100644 arch/mips/alchemy/devboards/pb1200/irqmap.c create mode 100644 arch/mips/alchemy/devboards/pb1500/platform.c create mode 100644 arch/mips/alchemy/devboards/pb1550/platform.c create mode 100644 arch/mips/alchemy/devboards/platform.c create mode 100644 arch/mips/alchemy/devboards/platform.h delete mode 100644 arch/mips/alchemy/mtx-1/irqmap.c delete mode 100644 arch/mips/alchemy/xxs1500/irqmap.c create mode 100644 arch/mips/alchemy/xxs1500/platform.c create mode 100644 arch/mips/include/asm/mach-au1x00/au1xxx_eth.h create mode 100644 arch/mips/include/asm/mach-db1x00/bcsr.h delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1100.h delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1500.h create mode 100644 arch/mips/loongson/lemote-2f/machtype.c create mode 100644 drivers/i2c/busses/i2c-octeon.c delete mode 100644 drivers/mtd/maps/alchemy-flash.c delete mode 100644 drivers/pcmcia/au1000_db1x00.c delete mode 100644 drivers/pcmcia/au1000_xxs1500.c create mode 100644 drivers/pcmcia/db1xxx_ss.c create mode 100644 drivers/pcmcia/xxs1500_ss.c create mode 100644 sound/soc/au1x/db1200.c delete mode 100644 sound/soc/au1x/sample-ac97.c Merging parisc/next $ git merge parisc/next Merge made by recursive. arch/parisc/include/asm/unistd.h | 4 +++- arch/parisc/kernel/syscall_table.S | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-) Merging powerpc/next $ git merge powerpc/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging 52xx-and-virtex/next $ git merge 52xx-and-virtex/next Merge made by recursive. arch/powerpc/boot/wrapper | 7 +- arch/powerpc/configs/52xx/cm5200_defconfig | 75 ++++++++++++++--- arch/powerpc/configs/52xx/lite5200b_defconfig | 90 +++++++++++++++++----- arch/powerpc/configs/52xx/motionpro_defconfig | 79 +++++++++++++++--- arch/powerpc/configs/52xx/pcm030_defconfig | 83 +++++++++++++++----- arch/powerpc/configs/52xx/tqm5200_defconfig | 79 +++++++++++++++--- arch/powerpc/configs/mpc5200_defconfig | 106 ++++++++++++++++++++----- 7 files changed, 418 insertions(+), 101 deletions(-) Merging galak/next $ git merge galak/next Already up-to-date. Merging s390/features $ git merge s390/features Merge made by recursive. Documentation/s390/CommonIO | 6 ++ Documentation/s390/driver-model.txt | 4 +- arch/s390/Kconfig.debug | 13 +++ arch/s390/include/asm/atomic.h | 86 +++---------------- arch/s390/include/asm/bitops.h | 83 ++++------------- arch/s390/include/asm/crw.h | 1 + arch/s390/include/asm/etr.h | 12 ++-- arch/s390/include/asm/irqflags.h | 36 -------- arch/s390/include/asm/lowcore.h | 26 ++---- arch/s390/include/asm/processor.h | 18 ++-- arch/s390/include/asm/rwsem.h | 147 +++++++++++++++--------------- arch/s390/include/asm/smp.h | 2 +- arch/s390/include/asm/spinlock.h | 18 ---- arch/s390/include/asm/swab.h | 16 ++-- arch/s390/include/asm/system.h | 168 ++++++++++++++++++----------------- arch/s390/include/asm/timex.h | 22 ++---- arch/s390/include/asm/uaccess.h | 12 +++ arch/s390/kernel/asm-offsets.c | 8 ++ arch/s390/kernel/head64.S | 70 +-------------- arch/s390/kernel/smp.c | 19 +---- arch/s390/kvm/kvm-s390.c | 20 ++-- arch/s390/lib/Makefile | 2 +- arch/s390/lib/usercopy.c | 8 ++ drivers/s390/char/zcore.c | 140 ++++++++++------------------- drivers/s390/cio/crw.c | 29 +++--- drivers/s390/cio/css.c | 79 ++++++++++++++--- drivers/s390/cio/css.h | 4 +- drivers/s390/cio/device.c | 39 +++----- drivers/s390/cio/device.h | 1 - 29 files changed, 438 insertions(+), 651 deletions(-) create mode 100644 arch/s390/lib/usercopy.c Merging sh/master $ git merge sh/master Auto-merging arch/sh/boards/mach-ecovec24/setup.c Removing arch/sh/include/asm/ubc.h Removing arch/sh/include/cpu-sh2/cpu/ubc.h Removing arch/sh/include/cpu-sh3/cpu/ubc.h Removing arch/sh/include/cpu-sh4/cpu/ubc.h Removing arch/sh/kernel/early_printk.c Merge made by recursive. arch/sh/Kconfig | 8 +- arch/sh/Makefile | 9 +- arch/sh/boards/Kconfig | 8 + arch/sh/boards/board-polaris.c | 15 +- arch/sh/boards/board-sh7785lcr.c | 21 +- arch/sh/boards/board-urquell.c | 21 +- arch/sh/boards/mach-ecovec24/setup.c | 16 +- arch/sh/boards/mach-sdk7780/setup.c | 23 +- arch/sh/boards/mach-sdk7786/Makefile | 1 + arch/sh/boards/mach-sdk7786/setup.c | 252 ++++++ arch/sh/boards/mach-se/7206/setup.c | 15 +- arch/sh/boards/mach-se/7343/irq.c | 35 +- arch/sh/boards/mach-se/7343/setup.c | 37 +- arch/sh/boards/mach-se/770x/setup.c | 15 +- arch/sh/boards/mach-se/7721/setup.c | 15 +- arch/sh/boards/mach-se/7722/setup.c | 21 +- arch/sh/boards/mach-se/7724/setup.c | 21 +- arch/sh/boards/mach-se/7780/setup.c | 21 +- arch/sh/boot/Makefile | 30 +- arch/sh/boot/compressed/Makefile | 3 + arch/sh/boot/compressed/misc.c | 4 + arch/sh/configs/sdk7786_defconfig | 1440 +++++++++++++++++++++++++++++++++ arch/sh/drivers/heartbeat.c | 22 +- arch/sh/drivers/pci/Makefile | 3 +- arch/sh/include/asm/Kbuild | 4 +- arch/sh/include/asm/addrspace.h | 12 +- arch/sh/include/asm/alignment.h | 21 + arch/sh/include/asm/atomic-grb.h | 46 -- arch/sh/include/asm/atomic-llsc.h | 27 - arch/sh/include/asm/atomic.h | 73 +- arch/sh/include/asm/fpu.h | 35 +- arch/sh/include/asm/hw_breakpoint.h | 67 ++ arch/sh/include/asm/io.h | 27 +- arch/sh/include/asm/kdebug.h | 2 + arch/sh/include/asm/mmu.h | 19 + arch/sh/include/asm/page.h | 2 +- arch/sh/include/asm/pgalloc.h | 32 +- arch/sh/include/asm/pgtable-2level.h | 23 + arch/sh/include/asm/pgtable-3level.h | 56 ++ arch/sh/include/asm/pgtable.h | 26 +- arch/sh/include/asm/pgtable_64.h | 11 - arch/sh/include/asm/processor_32.h | 37 +- arch/sh/include/asm/ptrace.h | 6 + arch/sh/include/asm/setup.h | 1 - arch/sh/include/asm/sh_bios.h | 15 +- arch/sh/include/asm/system.h | 4 +- arch/sh/include/asm/thread_info.h | 10 +- arch/sh/include/asm/ubc.h | 64 -- arch/sh/include/cpu-sh2/cpu/ubc.h | 32 - arch/sh/include/cpu-sh3/cpu/ubc.h | 42 - arch/sh/include/cpu-sh4/cpu/ubc.h | 64 -- arch/sh/include/mach-se/mach/se7343.h | 52 +- arch/sh/kernel/Makefile | 7 +- arch/sh/kernel/cpu/Makefile | 2 + arch/sh/kernel/cpu/fpu.c | 82 ++ arch/sh/kernel/cpu/init.c | 98 ++- arch/sh/kernel/cpu/sh2a/fpu.c | 111 +-- arch/sh/kernel/cpu/sh3/ex.S | 2 +- arch/sh/kernel/cpu/sh4/fpu.c | 159 +--- arch/sh/kernel/cpu/sh4/probe.c | 3 +- arch/sh/kernel/cpu/sh4a/Makefile | 9 +- arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +- arch/sh/kernel/cpu/sh4a/ubc.c | 133 +++ arch/sh/kernel/debugtraps.S | 1 - arch/sh/kernel/early_printk.c | 85 -- arch/sh/kernel/head_32.S | 4 +- arch/sh/kernel/head_64.S | 2 - arch/sh/kernel/hw_breakpoint.c | 463 +++++++++++ arch/sh/kernel/kgdb.c | 46 +- arch/sh/kernel/machine_kexec.c | 8 +- arch/sh/kernel/process.c | 100 +++ arch/sh/kernel/process_32.c | 114 +--- arch/sh/kernel/ptrace_32.c | 82 ++- arch/sh/kernel/setup.c | 3 - arch/sh/kernel/sh_bios.c | 129 +++- arch/sh/kernel/signal_32.c | 4 +- arch/sh/kernel/traps_32.c | 182 +---- arch/sh/kernel/vmlinux.lds.S | 15 +- arch/sh/math-emu/math.c | 12 +- arch/sh/mm/Kconfig | 35 +- arch/sh/mm/Makefile | 6 +- arch/sh/mm/alignment.c | 159 ++++ arch/sh/mm/cache-sh4.c | 13 +- arch/sh/mm/cache.c | 13 +- arch/sh/mm/fault_32.c | 3 + arch/sh/mm/init.c | 35 +- arch/sh/mm/nommu.c | 4 + arch/sh/mm/pgtable.c | 56 ++ arch/sh/mm/pmb.c | 106 ++- arch/sh/tools/mach-types | 1 + mm/Kconfig | 2 +- 91 files changed, 3713 insertions(+), 1447 deletions(-) create mode 100644 arch/sh/boards/mach-sdk7786/Makefile create mode 100644 arch/sh/boards/mach-sdk7786/setup.c create mode 100644 arch/sh/configs/sdk7786_defconfig create mode 100644 arch/sh/include/asm/alignment.h create mode 100644 arch/sh/include/asm/hw_breakpoint.h create mode 100644 arch/sh/include/asm/pgtable-2level.h create mode 100644 arch/sh/include/asm/pgtable-3level.h delete mode 100644 arch/sh/include/asm/ubc.h delete mode 100644 arch/sh/include/cpu-sh2/cpu/ubc.h delete mode 100644 arch/sh/include/cpu-sh3/cpu/ubc.h delete mode 100644 arch/sh/include/cpu-sh4/cpu/ubc.h create mode 100644 arch/sh/kernel/cpu/fpu.c create mode 100644 arch/sh/kernel/cpu/sh4a/ubc.c delete mode 100644 arch/sh/kernel/early_printk.c create mode 100644 arch/sh/kernel/hw_breakpoint.c create mode 100644 arch/sh/kernel/process.c create mode 100644 arch/sh/mm/alignment.c create mode 100644 arch/sh/mm/pgtable.c Merging sparc/master $ git merge sparc/master Already up-to-date. Merging xtensa/master $ git merge xtensa/master Auto-merging arch/xtensa/Kconfig Merge made by recursive. Merging ceph/for-next $ git merge ceph/for-next Resolved 'Documentation/ioctl/ioctl-number.txt' using previous resolution. Auto-merging Documentation/ioctl/ioctl-number.txt CONFLICT (content): Merge conflict in Documentation/ioctl/ioctl-number.txt Auto-merging MAINTAINERS Auto-merging fs/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 79d5462] Merge remote branch 'ceph/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/filesystems/ceph.txt | 139 ++ Documentation/ioctl/ioctl-number.txt | 1 + MAINTAINERS | 9 + fs/Kconfig | 1 + fs/Makefile | 1 + fs/ceph/Kconfig | 26 + fs/ceph/Makefile | 37 + fs/ceph/README | 20 + fs/ceph/addr.c | 1115 +++++++++++++ fs/ceph/auth.c | 225 +++ fs/ceph/auth.h | 77 + fs/ceph/auth_none.c | 120 ++ fs/ceph/auth_none.h | 28 + fs/ceph/buffer.c | 61 + fs/ceph/buffer.h | 37 + fs/ceph/caps.c | 2863 ++++++++++++++++++++++++++++++++ fs/ceph/ceph_debug.h | 37 + fs/ceph/ceph_frag.c | 21 + fs/ceph/ceph_frag.h | 109 ++ fs/ceph/ceph_fs.c | 74 + fs/ceph/ceph_fs.h | 648 ++++++++ fs/ceph/ceph_hash.c | 118 ++ fs/ceph/ceph_hash.h | 13 + fs/ceph/ceph_strings.c | 176 ++ fs/ceph/crush/crush.c | 151 ++ fs/ceph/crush/crush.h | 180 ++ fs/ceph/crush/hash.c | 149 ++ fs/ceph/crush/hash.h | 17 + fs/ceph/crush/mapper.c | 596 +++++++ fs/ceph/crush/mapper.h | 20 + fs/ceph/debugfs.c | 450 +++++ fs/ceph/decode.h | 159 ++ fs/ceph/dir.c | 1222 ++++++++++++++ fs/ceph/export.c | 223 +++ fs/ceph/file.c | 904 +++++++++++ fs/ceph/inode.c | 1627 +++++++++++++++++++ fs/ceph/ioctl.c | 160 ++ fs/ceph/ioctl.h | 40 + fs/ceph/mds_client.c | 2975 ++++++++++++++++++++++++++++++++++ fs/ceph/mds_client.h | 332 ++++ fs/ceph/mdsmap.c | 170 ++ fs/ceph/mdsmap.h | 54 + fs/ceph/messenger.c | 2092 ++++++++++++++++++++++++ fs/ceph/messenger.h | 256 +++ fs/ceph/mon_client.c | 751 +++++++++ fs/ceph/mon_client.h | 115 ++ fs/ceph/msgpool.c | 181 ++ fs/ceph/msgpool.h | 27 + fs/ceph/msgr.h | 167 ++ fs/ceph/osd_client.c | 1363 ++++++++++++++++ fs/ceph/osd_client.h | 155 ++ fs/ceph/osdmap.c | 916 +++++++++++ fs/ceph/osdmap.h | 124 ++ fs/ceph/rados.h | 370 +++++ fs/ceph/snap.c | 887 ++++++++++ fs/ceph/super.c | 984 +++++++++++ fs/ceph/super.h | 895 ++++++++++ fs/ceph/types.h | 29 + fs/ceph/xattr.c | 844 ++++++++++ 59 files changed, 25541 insertions(+), 0 deletions(-) create mode 100644 Documentation/filesystems/ceph.txt create mode 100644 fs/ceph/Kconfig create mode 100644 fs/ceph/Makefile create mode 100644 fs/ceph/README create mode 100644 fs/ceph/addr.c create mode 100644 fs/ceph/auth.c create mode 100644 fs/ceph/auth.h create mode 100644 fs/ceph/auth_none.c create mode 100644 fs/ceph/auth_none.h create mode 100644 fs/ceph/buffer.c create mode 100644 fs/ceph/buffer.h create mode 100644 fs/ceph/caps.c create mode 100644 fs/ceph/ceph_debug.h create mode 100644 fs/ceph/ceph_frag.c create mode 100644 fs/ceph/ceph_frag.h create mode 100644 fs/ceph/ceph_fs.c create mode 100644 fs/ceph/ceph_fs.h create mode 100644 fs/ceph/ceph_hash.c create mode 100644 fs/ceph/ceph_hash.h create mode 100644 fs/ceph/ceph_strings.c create mode 100644 fs/ceph/crush/crush.c create mode 100644 fs/ceph/crush/crush.h create mode 100644 fs/ceph/crush/hash.c create mode 100644 fs/ceph/crush/hash.h create mode 100644 fs/ceph/crush/mapper.c create mode 100644 fs/ceph/crush/mapper.h create mode 100644 fs/ceph/debugfs.c create mode 100644 fs/ceph/decode.h create mode 100644 fs/ceph/dir.c create mode 100644 fs/ceph/export.c create mode 100644 fs/ceph/file.c create mode 100644 fs/ceph/inode.c create mode 100644 fs/ceph/ioctl.c create mode 100644 fs/ceph/ioctl.h create mode 100644 fs/ceph/mds_client.c create mode 100644 fs/ceph/mds_client.h create mode 100644 fs/ceph/mdsmap.c create mode 100644 fs/ceph/mdsmap.h create mode 100644 fs/ceph/messenger.c create mode 100644 fs/ceph/messenger.h create mode 100644 fs/ceph/mon_client.c create mode 100644 fs/ceph/mon_client.h create mode 100644 fs/ceph/msgpool.c create mode 100644 fs/ceph/msgpool.h create mode 100644 fs/ceph/msgr.h create mode 100644 fs/ceph/osd_client.c create mode 100644 fs/ceph/osd_client.h create mode 100644 fs/ceph/osdmap.c create mode 100644 fs/ceph/osdmap.h create mode 100644 fs/ceph/rados.h create mode 100644 fs/ceph/snap.c create mode 100644 fs/ceph/super.c create mode 100644 fs/ceph/super.h create mode 100644 fs/ceph/types.h create mode 100644 fs/ceph/xattr.c Merging cifs/master $ git merge cifs/master Merge made by recursive. fs/cifs/CHANGES | 4 ++++ fs/cifs/cifsfs.h | 2 +- fs/cifs/cifsglob.h | 1 + fs/cifs/connect.c | 30 ++++++++++++++++++++++++++---- 4 files changed, 32 insertions(+), 5 deletions(-) Merging configfs/linux-next $ git merge configfs/linux-next Already up-to-date. Merging ecryptfs/next $ git merge ecryptfs/next Merge made by recursive. fs/ecryptfs/file.c | 15 +++---- fs/ecryptfs/inode.c | 115 ++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 90 insertions(+), 40 deletions(-) Merging ext3/for_next $ git merge ext3/for_next Auto-merging fs/quota/dquot.c Merge made by recursive. fs/ext3/file.c | 4 +- fs/ext3/inode.c | 18 ++++++++-------- fs/ext3/xattr.c | 14 ++++++------ fs/quota/dquot.c | 47 ++++++++++---------------------------------- include/linux/ext3_fs.h | 33 +++++++++++++++++++++++------- include/linux/ext3_fs_i.h | 2 +- 6 files changed, 55 insertions(+), 63 deletions(-) Merging ext4/next $ git merge ext4/next Already up-to-date. Merging fatfs/master $ git merge fatfs/master Merge made by recursive. fs/fat/namei_vfat.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) Merging fuse/for-next $ git merge fuse/for-next Already up-to-date. Merging gfs2/master $ git merge gfs2/master Merge made by recursive. fs/gfs2/aops.c | 4 +- fs/gfs2/glock.c | 75 ++++++++++++++---------------------------- fs/gfs2/glock.h | 7 ++++ fs/gfs2/glops.c | 16 +++++---- fs/gfs2/incore.h | 5 +-- fs/gfs2/inode.c | 6 +-- fs/gfs2/lock_dlm.c | 5 ++- fs/gfs2/main.c | 28 ++++++++++++++++ fs/gfs2/meta_io.c | 46 +++----------------------- fs/gfs2/meta_io.h | 12 ++++++- fs/gfs2/ops_fstype.c | 4 +-- fs/gfs2/ops_inode.c | 3 +- fs/gfs2/super.c | 27 +++++---------- fs/gfs2/sys.c | 2 - fs/gfs2/util.c | 1 + fs/gfs2/util.h | 1 + include/linux/gfs2_ondisk.h | 30 +---------------- 17 files changed, 110 insertions(+), 162 deletions(-) Merging jfs/next $ git merge jfs/next Already up-to-date. Merging logfs/master $ git merge logfs/master Auto-merging Documentation/filesystems/00-INDEX Auto-merging MAINTAINERS Auto-merging fs/Kconfig Auto-merging fs/Makefile Auto-merging lib/Kconfig Auto-merging lib/Makefile Merge made by recursive. Documentation/filesystems/00-INDEX | 2 + Documentation/filesystems/logfs.txt | 241 ++++ MAINTAINERS | 7 + fs/Kconfig | 1 + fs/Makefile | 1 + fs/logfs/Kconfig | 17 + fs/logfs/Makefile | 13 + fs/logfs/compr.c | 95 ++ fs/logfs/dev_bdev.c | 263 ++++ fs/logfs/dev_mtd.c | 253 ++++ fs/logfs/dir.c | 827 +++++++++++++ fs/logfs/file.c | 263 ++++ fs/logfs/gc.c | 730 ++++++++++++ fs/logfs/inode.c | 417 +++++++ fs/logfs/journal.c | 879 ++++++++++++++ fs/logfs/logfs.h | 722 +++++++++++ fs/logfs/logfs_abi.h | 627 ++++++++++ fs/logfs/readwrite.c | 2246 +++++++++++++++++++++++++++++++++++ fs/logfs/segment.c | 924 ++++++++++++++ fs/logfs/super.c | 634 ++++++++++ include/linux/btree-128.h | 109 ++ include/linux/btree-type.h | 147 +++ include/linux/btree.h | 243 ++++ lib/Kconfig | 3 + lib/Makefile | 1 + lib/btree.c | 797 +++++++++++++ 26 files changed, 10462 insertions(+), 0 deletions(-) create mode 100644 Documentation/filesystems/logfs.txt create mode 100644 fs/logfs/Kconfig create mode 100644 fs/logfs/Makefile create mode 100644 fs/logfs/compr.c create mode 100644 fs/logfs/dev_bdev.c create mode 100644 fs/logfs/dev_mtd.c create mode 100644 fs/logfs/dir.c create mode 100644 fs/logfs/file.c create mode 100644 fs/logfs/gc.c create mode 100644 fs/logfs/inode.c create mode 100644 fs/logfs/journal.c create mode 100644 fs/logfs/logfs.h create mode 100644 fs/logfs/logfs_abi.h create mode 100644 fs/logfs/readwrite.c create mode 100644 fs/logfs/segment.c create mode 100644 fs/logfs/super.c create mode 100644 include/linux/btree-128.h create mode 100644 include/linux/btree-type.h create mode 100644 include/linux/btree.h create mode 100644 lib/btree.c Merging nfs/linux-next $ git merge nfs/linux-next Merge made by recursive. fs/nfs/nfs3proc.c | 9 ++++--- fs/nfs/nfs4proc.c | 11 ++++++++- fs/nfs/nfs4state.c | 1 + fs/nfs/proc.c | 41 ++++++++++++++++++++++++++++++++++++++++ net/sunrpc/auth_gss/auth_gss.c | 11 ++++++++- 5 files changed, 65 insertions(+), 8 deletions(-) Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Merge made by recursive. fs/nfsd/nfs4state.c | 4 +++- fs/nfsd/nfs4xdr.c | 2 +- fs/nfsd/vfs.c | 49 +++++++++++++++++-------------------------------- 3 files changed, 21 insertions(+), 34 deletions(-) Merging nilfs2/for-next $ git merge nilfs2/for-next Already up-to-date. Merging ocfs2/linux-next $ git merge ocfs2/linux-next Already up-to-date. Merging squashfs/master $ git merge squashfs/master Auto-merging lib/Kconfig Auto-merging lib/Makefile Merge made by recursive. fs/squashfs/Kconfig | 6 ++ fs/squashfs/Makefile | 3 +- fs/squashfs/block.c | 76 +--------------- fs/squashfs/cache.c | 1 - fs/squashfs/decompressor.c | 72 ++++++++++++++++ fs/squashfs/decompressor.h | 55 ++++++++++++ fs/squashfs/dir.c | 1 - fs/squashfs/export.c | 1 - fs/squashfs/file.c | 1 - fs/squashfs/fragment.c | 1 - fs/squashfs/id.c | 1 - fs/squashfs/inode.c | 1 - fs/squashfs/lzma_wrapper.c | 151 +++++++++++++++++++++++++++++++++ fs/squashfs/namei.c | 1 - fs/squashfs/squashfs.h | 11 ++- fs/squashfs/squashfs_fs.h | 4 +- fs/squashfs/squashfs_fs_sb.h | 41 +++++----- fs/squashfs/super.c | 49 ++++++----- fs/squashfs/symlink.c | 1 - fs/squashfs/zlib_wrapper.c | 150 ++++++++++++++++++++++++++++++++ include/linux/decompress/bunzip2_mm.h | 13 +++ include/linux/decompress/inflate_mm.h | 13 +++ include/linux/decompress/mm.h | 4 - include/linux/decompress/unlzma_mm.h | 20 +++++ include/linux/decompress/unlzo_mm.h | 13 +++ lib/Kconfig | 3 + lib/Makefile | 2 +- lib/decompress_bunzip2.c | 1 + lib/decompress_inflate.c | 1 + lib/decompress_unlzma.c | 88 ++++++++++--------- lib/decompress_unlzo.c | 1 + 31 files changed, 614 insertions(+), 172 deletions(-) create mode 100644 fs/squashfs/decompressor.c create mode 100644 fs/squashfs/decompressor.h create mode 100644 fs/squashfs/lzma_wrapper.c create mode 100644 fs/squashfs/zlib_wrapper.c create mode 100644 include/linux/decompress/bunzip2_mm.h create mode 100644 include/linux/decompress/inflate_mm.h create mode 100644 include/linux/decompress/unlzma_mm.h create mode 100644 include/linux/decompress/unlzo_mm.h Merging udf/for_next $ git merge udf/for_next Merge made by recursive. fs/udf/inode.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) Merging v9fs/for-next $ git merge v9fs/for-next Resolved 'fs/9p/cache.c' using previous resolution. Auto-merging fs/9p/cache.c CONFLICT (add/add): Merge conflict in fs/9p/cache.c Auto-merging fs/9p/vfs_inode.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 57d0441] Merge remote branch 'v9fs/for-next' $ git diff -M --stat --summary HEAD^.. Merging ubifs/linux-next $ git merge ubifs/linux-next Already up-to-date. Merging xfs/master $ git merge xfs/master Merge made by recursive. fs/xfs/linux-2.6/xfs_buf.c | 167 ++++++++++++++++++++++++++++++- fs/xfs/linux-2.6/xfs_buf.h | 25 +---- fs/xfs/linux-2.6/xfs_lrw.c | 47 --------- fs/xfs/linux-2.6/xfs_lrw.h | 3 - fs/xfs/linux-2.6/xfs_super.c | 21 ++--- fs/xfs/linux-2.6/xfs_sync.c | 208 +++++++++++++++++++--------------------- fs/xfs/linux-2.6/xfs_sync.h | 3 +- fs/xfs/linux-2.6/xfs_trace.h | 80 +++++++++++++++ fs/xfs/quota/xfs_qm_syscalls.c | 2 +- fs/xfs/xfs_ag.h | 16 +-- fs/xfs/xfs_alloc.c | 94 +++++++++--------- fs/xfs/xfs_alloc_btree.c | 9 ++- fs/xfs/xfs_attr.c | 2 +- fs/xfs/xfs_attr.h | 1 - fs/xfs/xfs_bmap.c | 15 ++-- fs/xfs/xfs_bmap_btree.c | 2 +- fs/xfs/xfs_bmap_btree.h | 1 - fs/xfs/xfs_dfrag.c | 149 ++++++++++++++++++++++------ fs/xfs/xfs_dfrag.h | 3 - fs/xfs/xfs_dir2_node.c | 2 +- fs/xfs/xfs_dir2_node.h | 2 - fs/xfs/xfs_filestream.c | 42 +++------ fs/xfs/xfs_filestream.h | 28 +++++- fs/xfs/xfs_fsops.c | 42 ++++---- fs/xfs/xfs_ialloc.c | 60 +++++------ fs/xfs/xfs_iget.c | 11 +- fs/xfs/xfs_inode.c | 34 +++++-- fs/xfs/xfs_itable.c | 4 - fs/xfs/xfs_log.c | 67 ++++++------- fs/xfs/xfs_log_priv.h | 5 - fs/xfs/xfs_log_recover.c | 211 ++++++++++++++-------------------------- fs/xfs/xfs_log_recover.h | 23 ++--- fs/xfs/xfs_mount.c | 121 +++++++++++++++++++---- fs/xfs/xfs_mount.h | 22 ++--- fs/xfs/xfs_mru_cache.c | 2 +- fs/xfs/xfs_mru_cache.h | 1 - fs/xfs/xfs_rtalloc.c | 2 + fs/xfs/xfs_rw.c | 113 --------------------- fs/xfs/xfs_rw.h | 3 - fs/xfs/xfs_trans_ail.c | 19 ++-- 40 files changed, 901 insertions(+), 761 deletions(-) Merging reiserfs-bkl/reiserfs/kill-bkl $ git merge reiserfs-bkl/reiserfs/kill-bkl Already up-to-date. Merging vfs/for-next $ git merge vfs/for-next Resolved 'fs/gfs2/ops_inode.c' using previous resolution. Auto-merging fs/ecryptfs/inode.c Auto-merging fs/ext3/inode.c Auto-merging fs/gfs2/ops_inode.c CONFLICT (content): Merge conflict in fs/gfs2/ops_inode.c Auto-merging fs/gfs2/super.c Auto-merging fs/nfsd/vfs.c Auto-merging fs/udf/inode.c Auto-merging fs/xfs/linux-2.6/xfs_super.c Auto-merging include/linux/ext3_fs.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 5e086a8] Merge remote branch 'vfs/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/filesystems/sharedsubtree.txt | 16 ++++- arch/um/drivers/mconsole_kern.c | 49 ++++------- fs/9p/vfs_inode.c | 41 +---------- fs/adfs/adfs.h | 2 +- fs/adfs/inode.c | 5 +- fs/affs/affs.h | 3 +- fs/affs/inode.c | 2 +- fs/afs/internal.h | 1 - fs/afs/super.c | 1 - fs/afs/write.c | 21 ----- fs/bfs/inode.c | 5 +- fs/btrfs/ctree.h | 2 +- fs/btrfs/inode.c | 4 +- fs/cifs/cifs_dfs_ref.c | 3 +- fs/cifs/file.c | 4 +- fs/configfs/symlink.c | 4 +- fs/dcache.c | 45 +++++------ fs/debugfs/inode.c | 2 +- fs/ecryptfs/inode.c | 24 +++--- fs/exofs/exofs.h | 2 +- fs/exofs/inode.c | 4 +- fs/ext2/ext2.h | 2 +- fs/ext2/inode.c | 11 ++- fs/ext3/inode.c | 4 +- fs/ext4/ext4.h | 2 +- fs/ext4/inode.c | 6 +- fs/fat/inode.c | 9 ++- fs/fs-writeback.c | 22 +++-- fs/gfs2/ops_inode.c | 113 +++++++-------------------- fs/gfs2/super.c | 5 +- fs/hfs/hfs_fs.h | 2 +- fs/hfs/inode.c | 2 +- fs/hfsplus/super.c | 3 +- fs/hppfs/hppfs.c | 18 +++-- fs/jfs/inode.c | 5 +- fs/jfs/jfs_inode.h | 2 +- fs/libfs.c | 77 +++++++++--------- fs/locks.c | 5 +- fs/minix/inode.c | 8 +- fs/namei.c | 104 ++++++++++++------------- fs/namespace.c | 16 +++- fs/nfs/inode.c | 10 +-- fs/nfs/internal.h | 2 +- fs/nfsctl.c | 5 +- fs/nfsd/vfs.c | 4 +- fs/ntfs/dir.c | 2 +- fs/ntfs/file.c | 2 +- fs/ntfs/inode.c | 2 +- fs/ntfs/inode.h | 4 +- fs/ntfs/super.c | 8 ++ fs/omfs/inode.c | 10 ++- fs/open.c | 2 +- fs/pnode.c | 28 ++++--- fs/pnode.h | 3 +- fs/proc/base.c | 25 +++++-- fs/proc/generic.c | 5 + fs/proc/root.c | 6 -- fs/reiserfs/inode.c | 4 +- fs/super.c | 18 ++++- fs/sysv/inode.c | 10 ++- fs/sysv/sysv.h | 2 +- fs/ubifs/dir.c | 2 +- fs/ubifs/file.c | 8 +- fs/ubifs/super.c | 2 +- fs/udf/inode.c | 4 +- fs/udf/udfdecl.h | 2 +- fs/ufs/inode.c | 5 +- fs/ufs/ufs.h | 2 +- fs/xfs/linux-2.6/xfs_super.c | 10 +-- include/linux/audit.h | 11 +-- include/linux/ext3_fs.h | 2 +- include/linux/fs.h | 6 +- include/linux/fsnotify.h | 11 ++- include/linux/reiserfs_fs.h | 2 +- kernel/auditsc.c | 7 +- kernel/sysctl_binary.c | 7 +- security/tomoyo/tomoyo.c | 7 +-- 77 files changed, 421 insertions(+), 475 deletions(-) $ git am -3 ../patches/0001-ceph-update-for-write_inode-API-change.patch Applying: ceph: update for write_inode API change $ git reset HEAD^ Unstaged changes after reset: M fs/ceph/caps.c M fs/ceph/super.h $ git add . $ git commit -v -a --amend [master 223c606] Merge remote branch 'vfs/for-next' $ git am -3 ../patches/0001-logfs-fixup-for-write_inode-API-change.patch Applying: logfs: fixup for write_inode API change $ git reset HEAD^ Unstaged changes after reset: M fs/logfs/inode.c $ git add . $ git commit -v -a --amend [master 8501ee7] Merge remote branch 'vfs/for-next' Merging pci/linux-next $ git merge pci/linux-next Removing drivers/pci/legacy.c Merge made by recursive. Documentation/kernel-parameters.txt | 8 + arch/alpha/kernel/pci.c | 6 +- arch/arm/kernel/bios32.c | 8 +- arch/cris/arch-v32/drivers/pci/bios.c | 16 +- arch/frv/mb93090-mb00/pci-frv.c | 16 +- arch/ia64/pci/pci.c | 5 +- arch/mips/pci/pci.c | 6 +- arch/mips/pmc-sierra/yosemite/ht.c | 10 +- arch/mn10300/unit-asb2305/pci-asb2305.c | 16 +- arch/parisc/kernel/pci.c | 10 +- arch/powerpc/kernel/pci-common.c | 13 +- arch/sh/drivers/pci/pci.c | 6 +- arch/sparc/kernel/pci.c | 5 +- arch/sparc/kernel/pcic.c | 5 +- arch/x86/pci/amd_bus.c | 7 +- arch/x86/pci/bus_numa.c | 21 +- arch/x86/pci/bus_numa.h | 5 +- arch/x86/pci/i386.c | 14 +- arch/x86/pci/intel_bus.c | 49 +- arch/x86/pci/irq.c | 2 + arch/xtensa/kernel/pci.c | 15 +- drivers/acpi/acpica/acevents.h | 6 +- drivers/acpi/acpica/aclocal.h | 2 + drivers/acpi/acpica/evgpe.c | 147 +-- drivers/acpi/acpica/evgpeblk.c | 67 +- drivers/acpi/acpica/evxface.c | 14 - drivers/acpi/acpica/evxfevnt.c | 139 ++- drivers/acpi/button.c | 19 +- drivers/acpi/ec.c | 6 +- drivers/acpi/internal.h | 2 - drivers/acpi/pci_bind.c | 14 +- drivers/acpi/pci_root.c | 8 + drivers/acpi/scan.c | 37 +- drivers/acpi/wakeup.c | 60 +- drivers/isdn/hisax/Kconfig | 18 +- drivers/isdn/hisax/avm_pci.c | 13 +- drivers/isdn/hisax/bkm_a4t.c | 2 +- drivers/isdn/hisax/bkm_a8.c | 2 +- drivers/isdn/hisax/diva.c | 18 +- drivers/isdn/hisax/elsa.c | 14 +- drivers/isdn/hisax/enternow_pci.c | 2 +- drivers/isdn/hisax/gazel.c | 10 +- drivers/isdn/hisax/hfc_pci.c | 2 +- drivers/isdn/hisax/hisax.h | 23 + drivers/isdn/hisax/niccy.c | 8 +- drivers/isdn/hisax/nj_s.c | 2 +- drivers/isdn/hisax/nj_u.c | 2 +- drivers/isdn/hisax/sedlbauer.c | 13 +- drivers/isdn/hisax/telespci.c | 2 +- drivers/isdn/hisax/w6692.c | 2 +- drivers/pci/Kconfig | 11 - drivers/pci/Makefile | 5 +- drivers/pci/bus.c | 6 +- drivers/pci/hotplug/acpiphp_core.c | 2 - drivers/pci/hotplug/acpiphp_glue.c | 23 +- drivers/pci/hotplug/cpqphp.h | 2 - drivers/pci/hotplug/cpqphp_core.c | 57 +- drivers/pci/hotplug/cpqphp_ctrl.c | 27 +- drivers/pci/hotplug/ibmphp_core.c | 106 +- drivers/pci/hotplug/ibmphp_ebda.c | 11 +- drivers/pci/hotplug/pci_hotplug_core.c | 132 -- drivers/pci/hotplug/pciehp_core.c | 25 - drivers/pci/hotplug/pciehp_ctrl.c | 1 + drivers/pci/hotplug/pciehp_hpc.c | 72 +- drivers/pci/hotplug/rpaphp_core.c | 24 +- drivers/pci/hotplug/shpchp.h | 2 - drivers/pci/hotplug/shpchp_core.c | 35 - drivers/pci/hotplug/shpchp_ctrl.c | 14 +- drivers/pci/hotplug/shpchp_hpc.c | 149 +- drivers/pci/legacy.c | 34 - drivers/pci/pci-acpi.c | 341 +++ drivers/pci/pci-driver.c | 105 +- drivers/pci/pci.c | 152 ++- drivers/pci/pci.h | 16 + drivers/pci/pcie/Kconfig | 4 + drivers/pci/pcie/Makefile | 2 + drivers/pci/pcie/pme/Makefile | 8 + drivers/pci/pcie/pme/pcie_pme.c | 505 +++++ drivers/pci/pcie/pme/pcie_pme.h | 28 + drivers/pci/pcie/pme/pcie_pme_acpi.c | 54 + drivers/pci/pcie/portdrv.h | 17 + drivers/pci/pcie/portdrv_core.c | 12 +- drivers/pci/pcie/portdrv_pci.c | 27 + drivers/pci/probe.c | 194 ++- drivers/pci/quirks.c | 14 +- drivers/pci/setup-bus.c | 69 +- drivers/pci/slot.c | 55 + drivers/pcmcia/rsrc_mgr.c | 13 +- drivers/pcmcia/rsrc_nonstatic.c | 22 +- include/acpi/acpi_bus.h | 6 + include/acpi/acpixf.h | 8 + include/acpi/actypes.h | 32 +- include/linux/autoconf.h | 3454 +++++++++++++++++++++++++++++++ include/linux/bounds.h | 13 + include/linux/compile.h | 9 + include/linux/ioport.h | 7 +- include/linux/pci-acpi.h | 10 + include/linux/pci.h | 69 +- include/linux/pci_hotplug.h | 41 +- include/linux/pci_ids.h | 3 + include/linux/utsrelease.h | 1 + kernel/power/Kconfig | 5 + kernel/resource.c | 44 +- 103 files changed, 5800 insertions(+), 1175 deletions(-) delete mode 100644 drivers/pci/legacy.c create mode 100644 drivers/pci/pcie/pme/Makefile create mode 100644 drivers/pci/pcie/pme/pcie_pme.c create mode 100644 drivers/pci/pcie/pme/pcie_pme.h create mode 100644 drivers/pci/pcie/pme/pcie_pme_acpi.c create mode 100644 include/linux/autoconf.h create mode 100644 include/linux/bounds.h create mode 100644 include/linux/compile.h create mode 100644 include/linux/utsrelease.h Merging hid/for-next $ git merge hid/for-next Merge made by recursive. drivers/hid/Kconfig | 26 ++++ drivers/hid/Makefile | 6 + drivers/hid/hid-3m-pct.c | 291 +++++++++++++++++++++++++++++++++++++++++ drivers/hid/hid-apple.c | 17 ++- drivers/hid/hid-core.c | 9 +- drivers/hid/hid-debug.c | 6 +- drivers/hid/hid-ids.h | 14 ++- drivers/hid/hid-input.c | 7 +- drivers/hid/hid-lg.c | 7 +- drivers/hid/hid-lg.h | 6 + drivers/hid/hid-lg3ff.c | 176 +++++++++++++++++++++++++ drivers/hid/hid-lgff.c | 1 + drivers/hid/hid-quanta.c | 259 ++++++++++++++++++++++++++++++++++++ drivers/hid/hid-stantum.c | 283 +++++++++++++++++++++++++++++++++++++++ drivers/hid/usbhid/hid-core.c | 2 +- include/linux/hid.h | 2 +- include/linux/input.h | 42 ++++++ 17 files changed, 1135 insertions(+), 19 deletions(-) create mode 100644 drivers/hid/hid-3m-pct.c create mode 100644 drivers/hid/hid-lg3ff.c create mode 100644 drivers/hid/hid-quanta.c create mode 100644 drivers/hid/hid-stantum.c Merging quilt/i2c $ git merge quilt/i2c Merge made by recursive. drivers/i2c/busses/i2c-ali1535.c | 2 +- drivers/i2c/busses/i2c-ali1563.c | 2 +- drivers/i2c/busses/i2c-ali15x3.c | 2 +- drivers/i2c/busses/i2c-amd756.c | 2 +- drivers/i2c/busses/i2c-amd8111.c | 2 +- drivers/i2c/busses/i2c-hydra.c | 2 +- drivers/i2c/busses/i2c-i801.c | 2 +- drivers/i2c/busses/i2c-isch.c | 2 +- drivers/i2c/busses/i2c-nforce2.c | 2 +- drivers/i2c/busses/i2c-pasemi.c | 2 +- drivers/i2c/busses/i2c-piix4.c | 2 +- drivers/i2c/busses/i2c-scmi.c | 33 +++++++++++++++++++++++++-------- drivers/i2c/busses/i2c-sis5595.c | 2 +- drivers/i2c/busses/i2c-sis630.c | 2 +- drivers/i2c/busses/i2c-sis96x.c | 2 +- drivers/i2c/busses/i2c-tiny-usb.c | 2 +- drivers/i2c/busses/i2c-via.c | 2 +- drivers/i2c/busses/i2c-viapro.c | 2 +- 18 files changed, 42 insertions(+), 25 deletions(-) Merging bjdooks-i2c/next-i2c $ git merge bjdooks-i2c/next-i2c Already up-to-date. Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. Documentation/hwmon/lm90 | 10 ++++++++++ drivers/hwmon/Kconfig | 5 +++-- drivers/hwmon/amc6821.c | 1 - drivers/hwmon/lm90.c | 12 +++++++++++- drivers/hwmon/smsc47m1.c | 2 +- 5 files changed, 25 insertions(+), 5 deletions(-) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Merge made by recursive. scripts/kernel-doc | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) Merging v4l-dvb/master $ git merge v4l-dvb/master Auto-merging MAINTAINERS Merge made by recursive. Documentation/feature-removal-schedule.txt | 49 + Documentation/video4linux/CARDLIST.saa7134 | 1 + Documentation/video4linux/gspca.txt | 3 + MAINTAINERS | 7 +- drivers/media/IR/Makefile | 2 +- drivers/media/IR/ir-functions.c | 2 +- drivers/media/IR/ir-keytable.c | 63 +- drivers/media/IR/ir-sysfs.c | 211 +++ drivers/media/common/tuners/tda8290.c | 12 +- drivers/media/common/tuners/tuner-xc2028.c | 20 +- drivers/media/common/tuners/tuner-xc2028.h | 2 + drivers/media/dvb/Kconfig | 4 + drivers/media/dvb/Makefile | 14 +- drivers/media/dvb/bt8xx/bt878.c | 4 +- drivers/media/dvb/dm1105/dm1105.c | 4 +- drivers/media/dvb/dvb-core/dvb_frontend.c | 6 +- drivers/media/dvb/dvb-usb/cxusb.c | 3 + drivers/media/dvb/dvb-usb/dib0700.h | 1 - drivers/media/dvb/dvb-usb/dib0700_core.c | 196 ++- drivers/media/dvb/dvb-usb/dib0700_devices.c | 160 +-- drivers/media/dvb/dvb-usb/dw2102.c | 95 +- drivers/media/dvb/dvb-usb/friio-fe.c | 2 +- drivers/media/dvb/firewire/firedtv-1394.c | 10 +- drivers/media/dvb/frontends/Kconfig | 19 + drivers/media/dvb/frontends/Makefile | 2 + drivers/media/dvb/frontends/atbm8830.c | 16 + drivers/media/dvb/frontends/dib8000.c | 2 + drivers/media/dvb/frontends/dib8000.h | 2 +- drivers/media/dvb/frontends/lgdt3305.h | 6 +- drivers/media/dvb/frontends/mb86a16.c | 1878 ++++++++++++++++++++ drivers/media/dvb/frontends/mb86a16.h | 52 + drivers/media/dvb/frontends/mb86a16_priv.h | 151 ++ drivers/media/dvb/frontends/si21xx.c | 38 +- drivers/media/dvb/frontends/stv0900.h | 2 + drivers/media/dvb/frontends/stv0900_core.c | 87 +- drivers/media/dvb/frontends/stv0900_priv.h | 11 + drivers/media/dvb/frontends/stv0900_reg.h | 6 + drivers/media/dvb/frontends/stv0900_sw.c | 44 +- drivers/media/dvb/frontends/tda10021.c | 4 + drivers/media/dvb/frontends/tda665x.c | 257 +++ drivers/media/dvb/frontends/tda665x.h | 52 + drivers/media/dvb/frontends/zl10036.c | 2 +- drivers/media/dvb/frontends/zl10039.c | 1 - drivers/media/dvb/mantis/Kconfig | 32 + drivers/media/dvb/mantis/Makefile | 28 + drivers/media/dvb/mantis/hopper_cards.c | 275 +++ drivers/media/dvb/mantis/hopper_vp3028.c | 88 + drivers/media/dvb/mantis/hopper_vp3028.h | 30 + drivers/media/dvb/mantis/mantis_ca.c | 207 +++ drivers/media/dvb/mantis/mantis_ca.h | 27 + drivers/media/dvb/mantis/mantis_cards.c | 305 ++++ drivers/media/dvb/mantis/mantis_common.h | 179 ++ drivers/media/dvb/mantis/mantis_core.c | 238 +++ drivers/media/dvb/mantis/mantis_core.h | 57 + drivers/media/dvb/mantis/mantis_dma.c | 256 +++ drivers/media/dvb/mantis/mantis_dma.h | 30 + drivers/media/dvb/mantis/mantis_dvb.c | 296 +++ drivers/media/dvb/mantis/mantis_dvb.h | 35 + drivers/media/dvb/mantis/mantis_evm.c | 117 ++ drivers/media/dvb/mantis/mantis_hif.c | 240 +++ drivers/media/dvb/mantis/mantis_hif.h | 29 + drivers/media/dvb/mantis/mantis_i2c.c | 267 +++ drivers/media/dvb/mantis/mantis_i2c.h | 30 + drivers/media/dvb/mantis/mantis_input.c | 148 ++ drivers/media/dvb/mantis/mantis_ioc.c | 130 ++ drivers/media/dvb/mantis/mantis_ioc.h | 51 + drivers/media/dvb/mantis/mantis_link.h | 83 + drivers/media/dvb/mantis/mantis_pci.c | 177 ++ drivers/media/dvb/mantis/mantis_pci.h | 27 + drivers/media/dvb/mantis/mantis_pcmcia.c | 120 ++ drivers/media/dvb/mantis/mantis_reg.h | 197 ++ drivers/media/dvb/mantis/mantis_uart.c | 186 ++ drivers/media/dvb/mantis/mantis_uart.h | 58 + drivers/media/dvb/mantis/mantis_vp1033.c | 212 +++ drivers/media/dvb/mantis/mantis_vp1033.h | 30 + drivers/media/dvb/mantis/mantis_vp1034.c | 119 ++ drivers/media/dvb/mantis/mantis_vp1034.h | 33 + drivers/media/dvb/mantis/mantis_vp1041.c | 358 ++++ drivers/media/dvb/mantis/mantis_vp1041.h | 33 + drivers/media/dvb/mantis/mantis_vp2033.c | 187 ++ drivers/media/dvb/mantis/mantis_vp2033.h | 30 + drivers/media/dvb/mantis/mantis_vp2040.c | 186 ++ drivers/media/dvb/mantis/mantis_vp2040.h | 32 + drivers/media/dvb/mantis/mantis_vp3028.c | 38 + drivers/media/dvb/mantis/mantis_vp3028.h | 33 + drivers/media/dvb/mantis/mantis_vp3030.c | 105 ++ drivers/media/dvb/mantis/mantis_vp3030.h | 30 + drivers/media/dvb/siano/sms-cards.c | 1 + drivers/media/dvb/siano/smscoreapi.c | 7 +- drivers/media/dvb/siano/smscoreapi.h | 77 +- drivers/media/dvb/siano/smsdvb.c | 318 +++- drivers/media/dvb/ttpci/av7110_ir.c | 14 +- drivers/media/dvb/ttpci/budget-ci.c | 2 +- drivers/media/radio/si470x/radio-si470x-usb.c | 4 +- drivers/media/video/bt8xx/bttv-input.c | 4 +- drivers/media/video/cx18/cx18-cards.c | 2 +- drivers/media/video/cx18/cx18-driver.c | 33 +- drivers/media/video/cx18/cx18-driver.h | 40 +- drivers/media/video/cx18/cx18-dvb.c | 18 +- drivers/media/video/cx18/cx18-fileops.c | 199 ++- drivers/media/video/cx18/cx18-ioctl.c | 135 ++- drivers/media/video/cx18/cx18-mailbox.c | 5 +- drivers/media/video/cx18/cx18-queue.c | 3 + drivers/media/video/cx18/cx18-streams.c | 70 +- drivers/media/video/cx18/cx18-streams.h | 10 + drivers/media/video/cx18/cx23418.h | 3 +- drivers/media/video/cx231xx/cx231xx-input.c | 2 +- drivers/media/video/cx23885/cx23885-dvb.c | 17 +- drivers/media/video/cx23885/cx23885-input.c | 2 +- drivers/media/video/cx88/cx88-input.c | 4 +- drivers/media/video/em28xx/em28xx-core.c | 19 +- drivers/media/video/em28xx/em28xx-dvb.c | 1 + drivers/media/video/em28xx/em28xx-input.c | 83 +- drivers/media/video/em28xx/em28xx-reg.h | 4 +- drivers/media/video/em28xx/em28xx-vbi.c | 17 +- drivers/media/video/em28xx/em28xx-video.c | 58 +- drivers/media/video/em28xx/em28xx.h | 3 +- drivers/media/video/gspca/Kconfig | 9 + drivers/media/video/gspca/Makefile | 2 + drivers/media/video/gspca/benq.c | 322 ++++ drivers/media/video/gspca/conex.c | 4 +- drivers/media/video/gspca/etoms.c | 4 +- drivers/media/video/gspca/gl860/gl860.c | 10 +- drivers/media/video/gspca/gspca.c | 43 +- drivers/media/video/gspca/gspca.h | 12 +- drivers/media/video/gspca/m5602/m5602_mt9m111.c | 4 +- drivers/media/video/gspca/m5602/m5602_ov7660.c | 2 +- drivers/media/video/gspca/m5602/m5602_ov7660.h | 2 +- drivers/media/video/gspca/m5602/m5602_ov9650.c | 2 +- drivers/media/video/gspca/m5602/m5602_po1030.c | 2 +- drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 8 +- drivers/media/video/gspca/m5602/m5602_s5k83a.c | 2 +- drivers/media/video/gspca/mars.c | 2 +- drivers/media/video/gspca/mr97310a.c | 2 +- drivers/media/video/gspca/ov534.c | 6 +- drivers/media/video/gspca/pac207.c | 2 +- drivers/media/video/gspca/pac7302.c | 6 +- drivers/media/video/gspca/pac7311.c | 4 +- drivers/media/video/gspca/sn9c20x.c | 4 +- drivers/media/video/gspca/sonixb.c | 2 +- drivers/media/video/gspca/sonixj.c | 280 +++- drivers/media/video/gspca/spca500.c | 4 +- drivers/media/video/gspca/spca501.c | 2 +- drivers/media/video/gspca/spca505.c | 2 +- drivers/media/video/gspca/spca506.c | 4 +- drivers/media/video/gspca/spca508.c | 2 +- drivers/media/video/gspca/spca561.c | 4 +- drivers/media/video/gspca/stk014.c | 2 +- drivers/media/video/gspca/stv0680.c | 2 +- drivers/media/video/gspca/stv06xx/stv06xx.c | 3 +- drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 1 + drivers/media/video/gspca/sunplus.c | 212 +-- drivers/media/video/gspca/t613.c | 2 +- drivers/media/video/gspca/tv8532.c | 2 +- drivers/media/video/gspca/vc032x.c | 698 +++++++- drivers/media/video/gspca/zc3xx.c | 607 +++---- drivers/media/video/ir-kbd-i2c.c | 4 +- drivers/media/video/mx1_camera.c | 2 +- drivers/media/video/rj54n1cb0c.c | 14 +- drivers/media/video/saa7127.c | 47 +- drivers/media/video/saa7134/saa7134-cards.c | 48 +- drivers/media/video/saa7134/saa7134-core.c | 13 - drivers/media/video/saa7134/saa7134-input.c | 7 +- drivers/media/video/saa7134/saa7134-ts.c | 13 + drivers/media/video/saa7134/saa7134.h | 3 +- drivers/media/video/saa7164/saa7164-api.c | 2 +- drivers/media/video/sh_mobile_ceu_camera.c | 2 +- drivers/media/video/tuner-core.c | 1 + drivers/media/video/tveeprom.c | 5 +- drivers/media/video/usbvision/usbvision-video.c | 2 +- drivers/media/video/uvc/uvc_ctrl.c | 2 +- drivers/media/video/uvc/uvc_driver.c | 65 +- drivers/media/video/uvc/uvc_queue.c | 14 +- drivers/media/video/uvc/uvc_video.c | 55 +- drivers/media/video/uvc/uvcvideo.h | 9 +- drivers/media/video/v4l2-compat-ioctl32.c | 2 +- drivers/media/video/vivi.c | 2 +- drivers/media/video/zr364xx.c | 37 +- drivers/staging/cx25821/cx25821-medusa-video.c | 4 +- drivers/staging/tm6000/Kconfig | 32 + drivers/staging/tm6000/Makefile | 15 + drivers/staging/tm6000/README | 11 + drivers/staging/tm6000/hack.c | 252 +++ drivers/staging/tm6000/hack.h | 45 + drivers/staging/tm6000/tm6000-alsa.c | 413 +++++ drivers/staging/tm6000/tm6000-cards.c | 662 +++++++ drivers/staging/tm6000/tm6000-core.c | 511 ++++++ drivers/staging/tm6000/tm6000-dvb.c | 322 ++++ drivers/staging/tm6000/tm6000-i2c.c | 245 +++ drivers/staging/tm6000/tm6000-regs.h | 86 + drivers/staging/tm6000/tm6000-stds.c | 873 +++++++++ drivers/staging/tm6000/tm6000-usb-isoc.h | 53 + drivers/staging/tm6000/tm6000-video.c | 1550 ++++++++++++++++ drivers/staging/tm6000/tm6000.h | 278 +++ include/linux/videodev2.h | 1 + include/media/ir-common.h | 4 +- include/media/ir-core.h | 42 +- include/media/ir-kbd-i2c.h | 2 +- 198 files changed, 16764 insertions(+), 1296 deletions(-) create mode 100644 drivers/media/IR/ir-sysfs.c create mode 100644 drivers/media/dvb/frontends/mb86a16.c create mode 100644 drivers/media/dvb/frontends/mb86a16.h create mode 100644 drivers/media/dvb/frontends/mb86a16_priv.h create mode 100644 drivers/media/dvb/frontends/tda665x.c create mode 100644 drivers/media/dvb/frontends/tda665x.h create mode 100644 drivers/media/dvb/mantis/Kconfig create mode 100644 drivers/media/dvb/mantis/Makefile create mode 100644 drivers/media/dvb/mantis/hopper_cards.c create mode 100644 drivers/media/dvb/mantis/hopper_vp3028.c create mode 100644 drivers/media/dvb/mantis/hopper_vp3028.h create mode 100644 drivers/media/dvb/mantis/mantis_ca.c create mode 100644 drivers/media/dvb/mantis/mantis_ca.h create mode 100644 drivers/media/dvb/mantis/mantis_cards.c create mode 100644 drivers/media/dvb/mantis/mantis_common.h create mode 100644 drivers/media/dvb/mantis/mantis_core.c create mode 100644 drivers/media/dvb/mantis/mantis_core.h create mode 100644 drivers/media/dvb/mantis/mantis_dma.c create mode 100644 drivers/media/dvb/mantis/mantis_dma.h create mode 100644 drivers/media/dvb/mantis/mantis_dvb.c create mode 100644 drivers/media/dvb/mantis/mantis_dvb.h create mode 100644 drivers/media/dvb/mantis/mantis_evm.c create mode 100644 drivers/media/dvb/mantis/mantis_hif.c create mode 100644 drivers/media/dvb/mantis/mantis_hif.h create mode 100644 drivers/media/dvb/mantis/mantis_i2c.c create mode 100644 drivers/media/dvb/mantis/mantis_i2c.h create mode 100644 drivers/media/dvb/mantis/mantis_input.c create mode 100644 drivers/media/dvb/mantis/mantis_ioc.c create mode 100644 drivers/media/dvb/mantis/mantis_ioc.h create mode 100644 drivers/media/dvb/mantis/mantis_link.h create mode 100644 drivers/media/dvb/mantis/mantis_pci.c create mode 100644 drivers/media/dvb/mantis/mantis_pci.h create mode 100644 drivers/media/dvb/mantis/mantis_pcmcia.c create mode 100644 drivers/media/dvb/mantis/mantis_reg.h create mode 100644 drivers/media/dvb/mantis/mantis_uart.c create mode 100644 drivers/media/dvb/mantis/mantis_uart.h create mode 100644 drivers/media/dvb/mantis/mantis_vp1033.c create mode 100644 drivers/media/dvb/mantis/mantis_vp1033.h create mode 100644 drivers/media/dvb/mantis/mantis_vp1034.c create mode 100644 drivers/media/dvb/mantis/mantis_vp1034.h create mode 100644 drivers/media/dvb/mantis/mantis_vp1041.c create mode 100644 drivers/media/dvb/mantis/mantis_vp1041.h create mode 100644 drivers/media/dvb/mantis/mantis_vp2033.c create mode 100644 drivers/media/dvb/mantis/mantis_vp2033.h create mode 100644 drivers/media/dvb/mantis/mantis_vp2040.c create mode 100644 drivers/media/dvb/mantis/mantis_vp2040.h create mode 100644 drivers/media/dvb/mantis/mantis_vp3028.c create mode 100644 drivers/media/dvb/mantis/mantis_vp3028.h create mode 100644 drivers/media/dvb/mantis/mantis_vp3030.c create mode 100644 drivers/media/dvb/mantis/mantis_vp3030.h create mode 100644 drivers/media/video/gspca/benq.c create mode 100644 drivers/staging/tm6000/Kconfig create mode 100644 drivers/staging/tm6000/Makefile create mode 100644 drivers/staging/tm6000/README create mode 100644 drivers/staging/tm6000/hack.c create mode 100644 drivers/staging/tm6000/hack.h create mode 100644 drivers/staging/tm6000/tm6000-alsa.c create mode 100644 drivers/staging/tm6000/tm6000-cards.c create mode 100644 drivers/staging/tm6000/tm6000-core.c create mode 100644 drivers/staging/tm6000/tm6000-dvb.c create mode 100644 drivers/staging/tm6000/tm6000-i2c.c create mode 100644 drivers/staging/tm6000/tm6000-regs.h create mode 100644 drivers/staging/tm6000/tm6000-stds.c create mode 100644 drivers/staging/tm6000/tm6000-usb-isoc.h create mode 100644 drivers/staging/tm6000/tm6000-video.c create mode 100644 drivers/staging/tm6000/tm6000.h Merging kbuild/for-next $ git merge kbuild/for-next Auto-merging Makefile Merge made by recursive. Makefile | 3 + init/Kconfig | 8 + scripts/Makefile.build | 2 +- scripts/decodecode | 48 +- scripts/genksyms/genksyms.c | 4 +- scripts/kconfig/Makefile | 16 +- scripts/kconfig/expr.c | 27 +- scripts/kconfig/lkc.h | 7 +- scripts/kconfig/lkc_proto.h | 3 +- scripts/kconfig/mconf.c | 14 +- scripts/kconfig/menu.c | 16 +- scripts/kconfig/nconf.c | 1568 +++++++++++++++++++++++++++++++++++ scripts/kconfig/nconf.gui.c | 617 ++++++++++++++ scripts/kconfig/nconf.h | 95 +++ scripts/kconfig/util.c | 2 + scripts/kconfig/zconf.tab.c_shipped | 2 +- scripts/kconfig/zconf.y | 2 +- 17 files changed, 2397 insertions(+), 37 deletions(-) create mode 100644 scripts/kconfig/nconf.c create mode 100644 scripts/kconfig/nconf.gui.c create mode 100644 scripts/kconfig/nconf.h Merging kconfig/for-next $ git merge kconfig/for-next Auto-merging Documentation/dontdiff Removing scripts/binoffset.c Merge made by recursive. Documentation/dontdiff | 1 - scripts/.gitignore | 1 - scripts/binoffset.c | 163 ---------------------------------------------- scripts/extract-ikconfig | 127 ++++++++++++----------------------- 4 files changed, 44 insertions(+), 248 deletions(-) delete mode 100644 scripts/binoffset.c Merging ide/master $ git merge ide/master Merge made by recursive. drivers/ide/ide-tape.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) Merging libata/NEXT $ git merge libata/NEXT Merge made by recursive. drivers/ata/ahci.c | 221 ++++++++++++++++++++++++++++++++++++++++---- drivers/ata/pata_hpt366.c | 21 +--- drivers/ata/pata_hpt37x.c | 187 +++++++++++++++++-------------------- drivers/ata/pata_hpt3x2n.c | 118 +++++++++++------------- 4 files changed, 347 insertions(+), 200 deletions(-) Merging infiniband/for-next $ git merge infiniband/for-next Merge made by recursive. drivers/infiniband/hw/cxgb3/cxio_hal.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) Merging acpi/test $ git merge acpi/test Recorded preimage for 'drivers/gpu/drm/i915/intel_lvds.c' Auto-merging Documentation/kernel-parameters.txt Auto-merging drivers/acpi/ec.c Auto-merging drivers/acpi/pci_root.c Auto-merging drivers/gpu/drm/i915/intel_lvds.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lvds.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/gpu/drm/i915/intel_lvds.c'. [master bbfae9a] Merge remote branch 'acpi/test' $ git diff -M --stat --summary HEAD^.. Documentation/acpi/apei/einj.txt | 49 +++ Documentation/kernel-parameters.txt | 5 + arch/x86/kernel/acpi/boot.c | 22 +- drivers/acpi/Kconfig | 2 + drivers/acpi/Makefile | 3 + drivers/acpi/acpi_pad.c | 37 ++- drivers/acpi/apei/Kconfig | 16 + drivers/acpi/apei/Makefile | 4 + drivers/acpi/apei/apei-base.c | 589 +++++++++++++++++++++++++++++++++++ drivers/acpi/apei/apei-internal.h | 97 ++++++ drivers/acpi/apei/einj.c | 471 ++++++++++++++++++++++++++++ drivers/acpi/apei/hest.c | 147 +++++++++ drivers/acpi/atomicio.c | 360 +++++++++++++++++++++ drivers/acpi/battery.c | 86 ++++- drivers/acpi/bus.c | 17 +- drivers/acpi/ec.c | 126 +++++--- drivers/acpi/pci_link.c | 2 +- drivers/acpi/pci_root.c | 2 +- drivers/acpi/power.c | 2 +- drivers/acpi/power_meter.c | 2 +- drivers/acpi/processor_pdc.c | 2 +- drivers/acpi/processor_thermal.c | 3 +- drivers/acpi/sbs.c | 8 + drivers/acpi/sbshc.c | 2 +- drivers/acpi/video.c | 43 +++ drivers/gpu/drm/i915/intel_lvds.c | 2 +- drivers/platform/x86/Kconfig | 1 + drivers/platform/x86/eeepc-laptop.c | 298 ++++++++++-------- drivers/platform/x86/sony-laptop.c | 100 ++++--- drivers/power/power_supply_sysfs.c | 1 + include/acpi/apei.h | 13 + include/acpi/atomicio.h | 10 + include/acpi/platform/aclinux.h | 2 +- include/linux/acpi.h | 6 +- include/linux/power_supply.h | 1 + 35 files changed, 2233 insertions(+), 298 deletions(-) create mode 100644 Documentation/acpi/apei/einj.txt create mode 100644 drivers/acpi/apei/Kconfig create mode 100644 drivers/acpi/apei/Makefile create mode 100644 drivers/acpi/apei/apei-base.c create mode 100644 drivers/acpi/apei/apei-internal.h create mode 100644 drivers/acpi/apei/einj.c create mode 100644 drivers/acpi/apei/hest.c create mode 100644 drivers/acpi/atomicio.c create mode 100644 include/acpi/apei.h create mode 100644 include/acpi/atomicio.h Merging ieee1394/for-next $ git merge ieee1394/for-next Auto-merging drivers/media/dvb/firewire/firedtv-1394.c Merge made by recursive. drivers/firewire/core-device.c | 127 +++++--- drivers/firewire/ohci.c | 2 +- drivers/firewire/sbp2.c | 5 +- drivers/media/dvb/firewire/firedtv-1394.c | 9 +- drivers/media/dvb/firewire/firedtv-avc.c | 514 ++++++++++++++++------------- drivers/media/dvb/firewire/firedtv-dvb.c | 1 - drivers/media/dvb/firewire/firedtv-fw.c | 41 +-- drivers/media/dvb/firewire/firedtv.h | 6 +- include/linux/firewire.h | 11 +- 9 files changed, 390 insertions(+), 326 deletions(-) Merging ubi/linux-next $ git merge ubi/linux-next Merge made by recursive. drivers/mtd/ubi/kapi.c | 15 +++++++-------- drivers/mtd/ubi/vtbl.c | 1 + 2 files changed, 8 insertions(+), 8 deletions(-) Merging kvm/linux-next $ git merge kvm/linux-next Auto-merging MAINTAINERS Auto-merging arch/s390/kvm/kvm-s390.c Merge made by recursive. Documentation/kvm/api.txt | 12 +- MAINTAINERS | 2 +- arch/ia64/kvm/Kconfig | 1 + arch/ia64/kvm/kvm-ia64.c | 47 ++- arch/powerpc/include/asm/kvm_asm.h | 6 + arch/powerpc/include/asm/kvm_book3s.h | 7 +- arch/powerpc/include/asm/kvm_book3s_64_asm.h | 18 + arch/powerpc/include/asm/kvm_host.h | 6 +- arch/powerpc/include/asm/kvm_ppc.h | 77 +++++- arch/powerpc/include/asm/paca.h | 5 + arch/powerpc/include/asm/reg.h | 4 + arch/powerpc/kernel/asm-offsets.c | 32 ++- arch/powerpc/kvm/44x_emulate.c | 25 +- arch/powerpc/kvm/44x_tlb.c | 20 +- arch/powerpc/kvm/Kconfig | 3 +- arch/powerpc/kvm/book3s.c | 90 +++-- arch/powerpc/kvm/book3s_64_emulate.c | 77 +++-- arch/powerpc/kvm/book3s_64_exports.c | 1 + arch/powerpc/kvm/book3s_64_interrupts.S | 336 ++++++++------------ arch/powerpc/kvm/book3s_64_mmu.c | 10 +- arch/powerpc/kvm/book3s_64_rmhandlers.S | 85 ++++-- arch/powerpc/kvm/book3s_64_slb.S | 160 ++++++---- arch/powerpc/kvm/booke.c | 32 +- arch/powerpc/kvm/booke_emulate.c | 107 +++--- arch/powerpc/kvm/e500_emulate.c | 95 +++--- arch/powerpc/kvm/e500_tlb.c | 4 +- arch/powerpc/kvm/emulate.c | 116 ++++--- arch/powerpc/kvm/powerpc.c | 39 ++- arch/s390/kvm/kvm-s390.c | 25 +- arch/s390/kvm/kvm-s390.h | 10 +- arch/x86/include/asm/kvm_emulate.h | 2 +- arch/x86/include/asm/kvm_host.h | 35 +- arch/x86/include/asm/svm.h | 2 +- arch/x86/include/asm/vmx.h | 3 + arch/x86/kernel/vsyscall_64.c | 3 +- arch/x86/kvm/Kconfig | 1 + arch/x86/kvm/emulate.c | 6 +- arch/x86/kvm/i8254.c | 8 +- arch/x86/kvm/i8259.c | 4 +- arch/x86/kvm/kvm_cache_regs.h | 24 ++ arch/x86/kvm/lapic.c | 11 +- arch/x86/kvm/mmu.c | 55 ++-- arch/x86/kvm/mmu.h | 11 +- arch/x86/kvm/svm.c | 126 +++++--- arch/x86/kvm/vmx.c | 283 ++++++++++++----- arch/x86/kvm/x86.c | 457 +++++++++++++++++--------- include/linux/kvm.h | 2 +- include/linux/kvm_host.h | 67 +++-- virt/kvm/Kconfig | 3 + virt/kvm/assigned-dev.c | 8 +- virt/kvm/coalesced_mmio.c | 39 ++- virt/kvm/coalesced_mmio.h | 15 + virt/kvm/eventfd.c | 18 +- virt/kvm/ioapic.c | 23 ++- virt/kvm/ioapic.h | 1 + virt/kvm/iommu.c | 27 +- virt/kvm/kvm_main.c | 357 +++++++++++++------- 57 files changed, 1918 insertions(+), 1125 deletions(-) Merging dlm/next $ git merge dlm/next Already up-to-date. Merging scsi/master $ git merge scsi/master Auto-merging drivers/message/fusion/mptbase.c Auto-merging drivers/scsi/scsi_transport_fc.c Merge made by recursive. drivers/message/fusion/mptbase.c | 5 +- drivers/scsi/eata.c | 2 +- drivers/scsi/esp_scsi.c | 14 ++---- drivers/scsi/ibmmca.c | 2 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- drivers/scsi/libsrp.c | 4 +- drivers/scsi/mac_esp.c | 95 +++++++++++++++++++------------------ drivers/scsi/scsi.c | 40 +++++----------- drivers/scsi/scsi_transport_fc.c | 26 ++++++++-- drivers/scsi/sd.c | 26 ++++++---- drivers/scsi/ses.c | 10 +++- drivers/scsi/u14-34f.c | 2 +- include/scsi/scsi_device.h | 3 +- 13 files changed, 119 insertions(+), 112 deletions(-) Merging async_tx/next $ git merge async_tx/next Already uptodate! Merge made by recursive. Merging net/master $ git merge net/master Resolved 'net/mac80211/iface.c' using previous resolution. Resolved 'net/mac80211/scan.c' using previous resolution. Auto-merging Documentation/feature-removal-schedule.txt Auto-merging MAINTAINERS Auto-merging arch/ia64/kvm/Kconfig Auto-merging arch/powerpc/kvm/Kconfig Auto-merging arch/x86/kvm/Kconfig Auto-merging drivers/net/Kconfig Auto-merging drivers/net/e1000e/e1000.h Auto-merging drivers/net/e1000e/ich8lan.c Auto-merging drivers/net/ixgbe/Makefile Auto-merging drivers/net/ixgbe/ixgbe.h Auto-merging drivers/net/ixgbe/ixgbe_82599.c Auto-merging drivers/net/ixgbe/ixgbe_common.c Auto-merging drivers/net/ixgbe/ixgbe_ethtool.c Auto-merging drivers/net/ixgbe/ixgbe_main.c Auto-merging drivers/net/ixgbe/ixgbe_type.h Auto-merging drivers/net/mlx4/main.c Auto-merging drivers/net/sky2.c Auto-merging drivers/net/tg3.c Auto-merging drivers/net/wireless/ath/ath9k/ath9k.h Auto-merging drivers/net/wireless/iwlwifi/iwl-4965.c Auto-merging drivers/net/wireless/iwlwifi/iwl-core.c Auto-merging drivers/net/wireless/iwlwifi/iwl-dev.h Auto-merging drivers/net/wireless/mwl8k.c Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c Auto-merging drivers/net/wireless/rt2x00/rt2x00.h Auto-merging drivers/net/wireless/rt2x00/rt2x00dev.c Auto-merging drivers/net/wireless/rt2x00/rt2x00queue.c Auto-merging drivers/net/wireless/zd1211rw/zd_mac.c Auto-merging lib/vsprintf.c Auto-merging net/mac80211/cfg.c Auto-merging net/mac80211/iface.c CONFLICT (content): Merge conflict in net/mac80211/iface.c Auto-merging net/mac80211/mlme.c Auto-merging net/mac80211/rx.c Auto-merging net/mac80211/scan.c CONFLICT (content): Merge conflict in net/mac80211/scan.c Auto-merging net/mac80211/tx.c Auto-merging net/mac80211/util.c Auto-merging net/wireless/reg.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 4cbd1b1] Merge remote branch 'net/master' $ git diff -M --stat --summary HEAD^.. Documentation/feature-removal-schedule.txt | 21 - Documentation/isdn/INTERFACE.CAPI | 9 +- Documentation/networking/ip-sysctl.txt | 19 + Documentation/networking/ixgbevf.txt | 90 + Documentation/networking/regulatory.txt | 24 + Documentation/powerpc/dts-bindings/fsl/can.txt | 53 + Documentation/powerpc/dts-bindings/fsl/mpc5200.txt | 9 +- MAINTAINERS | 16 + arch/ia64/kvm/Kconfig | 1 + arch/powerpc/kvm/Kconfig | 1 + arch/s390/kvm/Kconfig | 1 + arch/x86/kvm/Kconfig | 1 + drivers/Makefile | 1 + drivers/atm/fore200e.c | 11 +- drivers/atm/idt77252.c | 5 +- drivers/atm/lanai.c | 14 +- drivers/atm/nicstar.c | 4 +- drivers/firmware/iscsi_ibft.c | 6 +- drivers/infiniband/hw/cxgb3/iwch_cm.c | 11 +- drivers/isdn/capi/capi.c | 99 +- drivers/isdn/capi/capidrv.c | 55 +- drivers/isdn/capi/kcapi.c | 8 +- drivers/isdn/gigaset/capi.c | 75 +- drivers/isdn/hardware/avm/avmcard.h | 6 +- drivers/isdn/hardware/avm/b1.c | 54 +- drivers/isdn/hardware/avm/b1dma.c | 71 +- drivers/isdn/hardware/avm/b1isa.c | 2 +- drivers/isdn/hardware/avm/b1pci.c | 4 +- drivers/isdn/hardware/avm/b1pcmcia.c | 2 +- drivers/isdn/hardware/avm/c4.c | 53 +- drivers/isdn/hardware/avm/t1isa.c | 2 +- drivers/isdn/hardware/avm/t1pci.c | 2 +- drivers/isdn/hardware/eicon/capimain.c | 40 +- drivers/isdn/hardware/eicon/diva_didd.c | 45 +- drivers/isdn/hardware/eicon/divasi.c | 48 +- drivers/isdn/hardware/eicon/divasproc.c | 198 +- drivers/isdn/hysdn/hycapi.c | 56 +- drivers/media/dvb/dvb-core/dvb_net.c | 7 +- drivers/message/i2o/i2o_proc.c | 11 +- drivers/misc/iwmc3200top/fw-download.c | 50 +- drivers/misc/iwmc3200top/iwmc3200top.h | 4 +- drivers/misc/iwmc3200top/log.h | 31 +- drivers/misc/iwmc3200top/main.c | 59 +- drivers/net/3c59x.c | 2 +- drivers/net/8139cp.c | 2 +- drivers/net/8139too.c | 2 +- drivers/net/Kconfig | 29 + drivers/net/Makefile | 2 + drivers/net/acenic.c | 2 +- drivers/net/amd8111e.c | 2 +- drivers/net/arcnet/com20020-pci.c | 2 +- drivers/net/arm/ep93xx_eth.c | 140 +- drivers/net/atl1c/atl1c_main.c | 9 +- drivers/net/atl1e/atl1e_main.c | 7 +- drivers/net/atlx/atl1.c | 2 +- drivers/net/atlx/atl2.c | 2 +- drivers/net/b44.c | 2 +- drivers/net/benet/be_cmds.c | 30 + drivers/net/benet/be_cmds.h | 17 + drivers/net/benet/be_ethtool.c | 45 + drivers/net/bnx2.c | 4 + drivers/net/bnx2x_main.c | 2 +- drivers/net/bonding/bond_main.c | 11 + drivers/net/can/at91_can.c | 4 + drivers/net/can/bfin_can.c | 4 + drivers/net/can/dev.c | 2 + drivers/net/can/mcp251x.c | 17 +- drivers/net/can/mscan/Kconfig | 7 +- drivers/net/can/mscan/mpc5xxx_can.c | 248 ++- drivers/net/can/mscan/mscan.c | 58 +- drivers/net/can/mscan/mscan.h | 86 +- drivers/net/can/sja1000/ems_pci.c | 2 +- drivers/net/can/sja1000/kvaser_pci.c | 2 +- drivers/net/can/sja1000/sja1000.c | 4 + drivers/net/can/ti_hecc.c | 5 +- drivers/net/can/usb/ems_usb.c | 4 + drivers/net/can/vcan.c | 12 +- drivers/net/cassini.c | 2 +- drivers/net/chelsio/common.h | 2 +- drivers/net/chelsio/subr.c | 2 +- drivers/net/cxgb3/cxgb3_main.c | 2 +- drivers/net/cxgb3/cxgb3_offload.c | 2 +- drivers/net/defxx.c | 9 +- drivers/net/dl2k.h | 2 +- drivers/net/e100.c | 2 +- drivers/net/e1000/e1000_main.c | 2 +- drivers/net/e1000e/82571.c | 68 +- drivers/net/e1000e/defines.h | 2 + drivers/net/e1000e/e1000.h | 17 +- drivers/net/e1000e/es2lan.c | 32 +- drivers/net/e1000e/hw.h | 12 +- drivers/net/e1000e/ich8lan.c | 1 + drivers/net/e1000e/lib.c | 230 +- drivers/net/e1000e/netdev.c | 24 +- drivers/net/enic/enic.h | 5 +- drivers/net/enic/enic_main.c | 194 +- drivers/net/enic/enic_res.c | 16 +- drivers/net/enic/vnic_dev.c | 1 - drivers/net/enic/vnic_enet.h | 5 + drivers/net/enic/vnic_intr.c | 8 +- drivers/net/enic/vnic_intr.h | 3 + drivers/net/enic/vnic_nic.h | 12 +- drivers/net/epic100.c | 2 +- drivers/net/ethoc.c | 8 +- drivers/net/fealnx.c | 2 +- drivers/net/forcedeth.c | 2 +- drivers/net/hamachi.c | 2 +- drivers/net/hp100.c | 2 +- drivers/net/igb/igb_main.c | 11 +- drivers/net/igbvf/netdev.c | 15 +- drivers/net/ioc3-eth.c | 2 +- drivers/net/ipg.c | 2 +- drivers/net/irda/donauboe.c | 2 +- drivers/net/irda/via-ircc.c | 2 +- drivers/net/irda/vlsi_ir.c | 2 +- drivers/net/ixgb/ixgb_main.c | 2 +- drivers/net/ixgbe/Makefile | 3 +- drivers/net/ixgbe/ixgbe.h | 31 +- drivers/net/ixgbe/ixgbe_82599.c | 126 +- drivers/net/ixgbe/ixgbe_common.c | 12 +- drivers/net/ixgbe/ixgbe_ethtool.c | 11 + drivers/net/ixgbe/ixgbe_main.c | 282 ++- drivers/net/ixgbe/ixgbe_mbx.c | 479 +++ drivers/net/ixgbe/ixgbe_mbx.h | 96 + drivers/net/ixgbe/ixgbe_sriov.c | 336 ++ drivers/net/ixgbe/ixgbe_sriov.h | 45 + drivers/net/ixgbe/ixgbe_type.h | 53 + drivers/net/ixgbevf/Makefile | 38 + drivers/net/ixgbevf/defines.h | 292 ++ drivers/net/ixgbevf/ethtool.c | 716 ++++ drivers/net/ixgbevf/ixgbevf.h | 318 ++ drivers/net/ixgbevf/ixgbevf_main.c | 3571 ++++++++++++++++++++ drivers/net/ixgbevf/mbx.c | 341 ++ drivers/net/ixgbevf/mbx.h | 100 + drivers/net/ixgbevf/regs.h | 85 + drivers/net/ixgbevf/vf.c | 387 +++ drivers/net/ixgbevf/vf.h | 168 + drivers/net/jme.c | 2 +- drivers/net/lib82596.c | 8 +- drivers/net/mac8390.c | 632 ++-- drivers/net/macvlan.c | 2 +- drivers/net/mlx4/main.c | 2 +- drivers/net/myri10ge/myri10ge.c | 2 +- drivers/net/myri_sbus.c | 6 +- drivers/net/natsemi.c | 2 +- drivers/net/ne2k-pci.c | 2 +- drivers/net/netxen/Makefile | 2 +- drivers/net/netxen/netxen_nic.h | 8 +- drivers/net/netxen/netxen_nic_ctx.c | 2 +- drivers/net/netxen/netxen_nic_ethtool.c | 2 +- drivers/net/netxen/netxen_nic_hdr.h | 5 +- drivers/net/netxen/netxen_nic_hw.c | 19 +- drivers/net/netxen/netxen_nic_hw.h | 2 +- drivers/net/netxen/netxen_nic_init.c | 5 +- drivers/net/netxen/netxen_nic_main.c | 213 +- drivers/net/niu.c | 2 +- drivers/net/ns83820.c | 2 +- drivers/net/octeon/octeon_mgmt.c | 7 +- drivers/net/pasemi_mac.c | 2 +- drivers/net/pci-skeleton.c | 2 +- drivers/net/pcmcia/axnet_cs.c | 3 - drivers/net/pcnet32.c | 2 +- drivers/net/phy/smsc.c | 21 +- drivers/net/qla3xxx.c | 2 +- drivers/net/qlcnic/Makefile | 8 + drivers/net/qlcnic/qlcnic.h | 1106 ++++++ drivers/net/qlcnic/qlcnic_ctx.c | 536 +++ drivers/net/qlcnic/qlcnic_ethtool.c | 870 +++++ drivers/net/qlcnic/qlcnic_hdr.h | 937 +++++ drivers/net/qlcnic/qlcnic_hw.c | 1201 +++++++ drivers/net/qlcnic/qlcnic_init.c | 1466 ++++++++ drivers/net/qlcnic/qlcnic_main.c | 2604 ++++++++++++++ drivers/net/qlge/qlge.h | 434 +++- drivers/net/qlge/qlge_dbg.c | 1171 +++++++ drivers/net/qlge/qlge_main.c | 353 ++- drivers/net/qlge/qlge_mpi.c | 165 + drivers/net/r6040.c | 2 +- drivers/net/r8169.c | 11 +- drivers/net/rrunner.c | 2 +- drivers/net/s2io.c | 2 +- drivers/net/sc92031.c | 2 +- drivers/net/sfc/efx.c | 2 +- drivers/net/sh_eth.c | 10 +- drivers/net/sis190.c | 2 +- drivers/net/sis900.c | 2 +- drivers/net/skfp/skfddi.c | 21 +- drivers/net/skge.c | 2 +- drivers/net/sky2.c | 96 +- drivers/net/smc911x.c | 6 +- drivers/net/smsc9420.c | 2 +- drivers/net/spider_net.c | 2 +- drivers/net/starfire.c | 2 +- drivers/net/stmmac/Kconfig | 8 +- drivers/net/stmmac/Makefile | 5 +- drivers/net/stmmac/common.h | 277 +- drivers/net/stmmac/descs.h | 4 +- drivers/net/stmmac/{mac100.c => dwmac100.c} | 202 +- drivers/net/stmmac/{mac100.h => dwmac100.h} | 0 drivers/net/stmmac/{gmac.h => dwmac1000.h} | 18 +- drivers/net/stmmac/dwmac1000_core.c | 245 ++ drivers/net/stmmac/{gmac.c => dwmac1000_dma.c} | 347 +-- drivers/net/stmmac/dwmac_dma.h | 107 + drivers/net/stmmac/dwmac_lib.c | 263 ++ drivers/net/stmmac/stmmac.h | 28 +- drivers/net/stmmac/stmmac_ethtool.c | 9 +- drivers/net/stmmac/stmmac_main.c | 436 +-- drivers/net/stmmac/stmmac_mdio.c | 11 +- drivers/net/sundance.c | 2 +- drivers/net/sungem.c | 2 +- drivers/net/sunhme.c | 2 +- drivers/net/sunvnet.c | 5 +- drivers/net/tc35815.c | 2 +- drivers/net/tehuti.c | 2 +- drivers/net/tg3.c | 2 +- drivers/net/tlan.c | 30 +- drivers/net/tlan.h | 3 - drivers/net/tokenring/3c359.c | 2 +- drivers/net/tokenring/abyss.c | 2 +- drivers/net/tokenring/lanstreamer.c | 2 +- drivers/net/tokenring/olympic.c | 2 +- drivers/net/tokenring/tmspci.c | 2 +- drivers/net/tulip/de2104x.c | 2 +- drivers/net/tulip/dmfe.c | 2 +- drivers/net/tulip/tulip_core.c | 2 +- drivers/net/tulip/uli526x.c | 2 +- drivers/net/tulip/winbond-840.c | 2 +- drivers/net/tulip/xircom_cb.c | 2 +- drivers/net/tun.c | 101 +- drivers/net/typhoon.c | 2 +- drivers/net/usb/catc.c | 6 +- drivers/net/usb/rtl8150.c | 7 +- drivers/net/via-rhine.c | 2 +- drivers/net/via-velocity.c | 8 +- drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- drivers/net/vxge/vxge-main.c | 8 +- drivers/net/wan/dscc4.c | 2 +- drivers/net/wan/farsync.c | 2 +- drivers/net/wan/lmc/lmc_main.c | 2 +- drivers/net/wan/pc300_drv.c | 2 +- drivers/net/wan/pc300too.c | 2 +- drivers/net/wan/pci200syn.c | 2 +- drivers/net/wan/wanxl.c | 2 +- drivers/net/wimax/i2400m/driver.c | 17 +- drivers/net/wimax/i2400m/fw.c | 11 +- drivers/net/wireless/adm8211.c | 14 +- drivers/net/wireless/airo.c | 2 +- drivers/net/wireless/at76c50x-usb.c | 6 +- drivers/net/wireless/ath/ar9170/ar9170.h | 9 +- drivers/net/wireless/ath/ar9170/hw.h | 1 + drivers/net/wireless/ath/ar9170/mac.c | 2 +- drivers/net/wireless/ath/ar9170/main.c | 110 +- drivers/net/wireless/ath/ar9170/usb.c | 2 + drivers/net/wireless/ath/ath5k/base.c | 20 +- drivers/net/wireless/ath/ath9k/ath9k.h | 1 - drivers/net/wireless/ath/ath9k/debug.c | 38 +- drivers/net/wireless/ath/ath9k/hw.c | 40 +- drivers/net/wireless/ath/ath9k/hw.h | 2 +- drivers/net/wireless/ath/ath9k/main.c | 49 +- drivers/net/wireless/ath/ath9k/pci.c | 2 +- drivers/net/wireless/ath/ath9k/rc.h | 4 + drivers/net/wireless/atmel_pci.c | 2 +- drivers/net/wireless/b43/Kconfig | 17 +- drivers/net/wireless/b43/Makefile | 2 +- drivers/net/wireless/b43/b43.h | 13 - drivers/net/wireless/b43/dma.c | 2 - drivers/net/wireless/b43/main.c | 35 +- drivers/net/wireless/b43/pio.h | 40 - drivers/net/wireless/b43legacy/main.c | 24 +- drivers/net/wireless/hostap/hostap_hw.c | 9 + drivers/net/wireless/hostap/hostap_pci.c | 2 +- drivers/net/wireless/hostap/hostap_plx.c | 2 +- drivers/net/wireless/ipw2x00/ipw2100.c | 2 +- drivers/net/wireless/ipw2x00/ipw2200.c | 2 +- drivers/net/wireless/iwlwifi/iwl-1000.c | 4 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 4 +- drivers/net/wireless/iwlwifi/iwl-3945.h | 5 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 3 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 10 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 8 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 253 ++- drivers/net/wireless/iwlwifi/iwl-calib.c | 7 +- drivers/net/wireless/iwlwifi/iwl-commands.h | 2 +- drivers/net/wireless/iwlwifi/iwl-core.c | 148 +- drivers/net/wireless/iwlwifi/iwl-core.h | 14 +- drivers/net/wireless/iwlwifi/iwl-debug.h | 2 + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 105 +- drivers/net/wireless/iwlwifi/iwl-dev.h | 30 + drivers/net/wireless/iwlwifi/iwl-devtrace.c | 2 + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 44 + drivers/net/wireless/iwlwifi/iwl3945-base.c | 101 +- drivers/net/wireless/iwmc3200wifi/rx.c | 71 +- drivers/net/wireless/libertas/Kconfig | 6 + drivers/net/wireless/libertas/Makefile | 2 +- drivers/net/wireless/libertas/assoc.c | 17 +- drivers/net/wireless/libertas/cmd.c | 22 +- drivers/net/wireless/libertas/cmd.h | 12 - drivers/net/wireless/libertas/cmdresp.c | 16 +- drivers/net/wireless/libertas/defs.h | 7 - drivers/net/wireless/libertas/dev.h | 7 +- drivers/net/wireless/libertas/ethtool.c | 2 + drivers/net/wireless/libertas/main.c | 42 +- drivers/net/wireless/libertas/mesh.c | 29 +- drivers/net/wireless/libertas/mesh.h | 32 + drivers/net/wireless/libertas/scan.c | 2 +- drivers/net/wireless/libertas/tx.c | 2 +- drivers/net/wireless/libertas/wext.c | 26 +- drivers/net/wireless/libertas_tf/main.c | 10 +- drivers/net/wireless/mac80211_hwsim.c | 114 +- drivers/net/wireless/mwl8k.c | 1010 +++--- drivers/net/wireless/orinoco/orinoco_nortel.c | 2 +- drivers/net/wireless/orinoco/orinoco_pci.c | 2 +- drivers/net/wireless/orinoco/orinoco_plx.c | 2 +- drivers/net/wireless/orinoco/orinoco_tmd.c | 2 +- drivers/net/wireless/p54/main.c | 12 +- drivers/net/wireless/p54/p54pci.c | 2 +- drivers/net/wireless/prism54/islpci_hotplug.c | 2 +- drivers/net/wireless/rndis_wlan.c | 42 +- drivers/net/wireless/rt2x00/Kconfig | 4 +- drivers/net/wireless/rt2x00/rt2400pci.c | 7 +- drivers/net/wireless/rt2x00/rt2500pci.c | 41 +- drivers/net/wireless/rt2x00/rt2500usb.c | 38 +- drivers/net/wireless/rt2x00/rt2800lib.c | 94 +- drivers/net/wireless/rt2x00/rt2800pci.c | 33 +- drivers/net/wireless/rt2x00/rt2800usb.c | 49 +- drivers/net/wireless/rt2x00/rt2800usb.h | 90 +- drivers/net/wireless/rt2x00/rt2x00.h | 34 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 10 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 26 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 3 + drivers/net/wireless/rt2x00/rt2x00queue.c | 79 +- drivers/net/wireless/rt2x00/rt2x00queue.h | 5 +- drivers/net/wireless/rt2x00/rt61pci.c | 31 +- drivers/net/wireless/rt2x00/rt73usb.c | 37 +- drivers/net/wireless/rtl818x/rtl8180.h | 1 - drivers/net/wireless/rtl818x/rtl8180_dev.c | 28 +- drivers/net/wireless/rtl818x/rtl8187.h | 2 +- drivers/net/wireless/rtl818x/rtl8187_dev.c | 15 +- drivers/net/wireless/rtl818x/rtl8187_leds.c | 4 +- drivers/net/wireless/wl12xx/wl1251.h | 1 + drivers/net/wireless/wl12xx/wl1251_acx.c | 69 + drivers/net/wireless/wl12xx/wl1251_acx.h | 87 + drivers/net/wireless/wl12xx/wl1251_debugfs.c | 23 + drivers/net/wireless/wl12xx/wl1251_init.c | 5 + drivers/net/wireless/wl12xx/wl1251_init.h | 47 + drivers/net/wireless/wl12xx/wl1251_main.c | 64 +- drivers/net/wireless/wl12xx/wl1251_ps.c | 9 +- drivers/net/wireless/wl12xx/wl1251_rx.c | 2 +- drivers/net/wireless/wl12xx/wl1251_tx.c | 9 +- drivers/net/wireless/wl12xx/wl1251_tx.h | 17 + drivers/net/wireless/wl12xx/wl1271.h | 35 +- drivers/net/wireless/wl12xx/wl1271_acx.c | 134 +- drivers/net/wireless/wl12xx/wl1271_acx.h | 37 +- drivers/net/wireless/wl12xx/wl1271_boot.c | 8 +- drivers/net/wireless/wl12xx/wl1271_cmd.c | 67 +- drivers/net/wireless/wl12xx/wl1271_cmd.h | 33 +- drivers/net/wireless/wl12xx/wl1271_conf.h | 100 +- drivers/net/wireless/wl12xx/wl1271_debugfs.c | 62 + drivers/net/wireless/wl12xx/wl1271_event.c | 20 +- drivers/net/wireless/wl12xx/wl1271_event.h | 2 +- drivers/net/wireless/wl12xx/wl1271_init.c | 12 +- drivers/net/wireless/wl12xx/wl1271_main.c | 492 ++- drivers/net/wireless/wl12xx/wl1271_ps.c | 15 +- drivers/net/wireless/wl12xx/wl1271_tx.c | 43 +- drivers/net/wireless/zd1211rw/zd_mac.c | 10 +- drivers/net/wireless/zd1211rw/zd_usb.c | 14 +- drivers/net/xilinx_emaclite.c | 6 +- drivers/net/yellowfin.c | 2 +- drivers/s390/net/qeth_core.h | 5 +- drivers/s390/net/qeth_core_main.c | 169 +- drivers/s390/net/qeth_core_mpc.h | 44 +- drivers/s390/net/qeth_core_sys.c | 14 +- drivers/s390/net/qeth_l2_main.c | 28 +- drivers/s390/net/qeth_l3.h | 2 + drivers/s390/net/qeth_l3_main.c | 176 +- drivers/s390/net/qeth_l3_sys.c | 56 + drivers/vhost/Kconfig | 11 + drivers/vhost/Makefile | 2 + drivers/vhost/net.c | 661 ++++ drivers/vhost/vhost.c | 1098 ++++++ drivers/vhost/vhost.h | 161 + include/linux/Kbuild | 1 + include/linux/can/dev.h | 16 + include/linux/can/netlink.h | 1 + include/linux/ieee80211.h | 69 +- include/linux/if_tun.h | 14 + include/linux/in.h | 2 + include/linux/inetdevice.h | 1 + include/linux/isdn/capilli.h | 3 +- include/linux/llc.h | 7 + include/linux/miscdevice.h | 1 + include/linux/netpoll.h | 11 +- include/linux/nl80211.h | 36 + include/linux/rtnetlink.h | 2 + include/linux/stmmac.h | 53 + include/linux/sysctl.h | 1 + include/linux/vhost.h | 130 + include/net/cfg80211.h | 81 +- include/net/dst.h | 2 - include/net/inet_sock.h | 4 +- include/net/llc.h | 39 +- include/net/llc_conn.h | 2 + include/net/mac80211.h | 164 +- include/net/phonet/pep.h | 3 + include/net/tcp.h | 19 +- lib/vsprintf.c | 48 +- mm/mmu_context.c | 3 + net/8021q/vlan_core.c | 2 + net/8021q/vlan_dev.c | 7 +- net/bluetooth/cmtp/capi.c | 37 +- net/can/af_can.c | 118 +- net/can/af_can.h | 4 +- net/can/proc.c | 93 +- net/core/dev.c | 29 +- net/core/netpoll.c | 169 +- net/core/sock.c | 2 +- net/ethernet/eth.c | 6 +- net/ipv4/arp.c | 52 +- net/ipv4/devinet.c | 1 + net/ipv4/fib_semantics.c | 76 +- net/ipv4/ip_sockglue.c | 14 +- net/ipv4/route.c | 7 +- net/ipv4/syncookies.c | 3 +- net/ipv4/tcp.c | 30 +- net/ipv4/tcp_ipv4.c | 3 + net/ipv4/tcp_output.c | 22 +- net/ipv6/proc.c | 2 +- net/ipv6/syncookies.c | 3 +- net/ipv6/tcp_ipv6.c | 2 +- net/irda/ircomm/ircomm_tty.c | 6 - net/llc/af_llc.c | 64 +- net/llc/llc_conn.c | 143 +- net/llc/llc_core.c | 53 +- net/llc/llc_output.c | 45 +- net/llc/llc_proc.c | 69 +- net/llc/llc_sap.c | 111 +- net/mac80211/Kconfig | 12 - net/mac80211/Makefile | 4 +- net/mac80211/agg-rx.c | 15 +- net/mac80211/agg-tx.c | 25 +- net/mac80211/cfg.c | 142 +- net/mac80211/debugfs_key.c | 2 +- net/mac80211/debugfs_netdev.c | 168 +- net/mac80211/debugfs_netdev.h | 9 +- net/mac80211/debugfs_sta.c | 64 +- net/mac80211/driver-ops.h | 100 +- net/mac80211/driver-trace.h | 63 +- net/mac80211/ht.c | 53 +- net/mac80211/ibss.c | 81 +- net/mac80211/ieee80211_i.h | 162 +- net/mac80211/iface.c | 93 +- net/mac80211/key.c | 10 +- net/mac80211/key.h | 8 +- net/mac80211/main.c | 61 +- net/mac80211/mesh.c | 6 +- net/mac80211/mesh_hwmp.c | 20 +- net/mac80211/mesh_pathtbl.c | 6 +- net/mac80211/mesh_plink.c | 6 +- net/mac80211/mlme.c | 1113 ++----- net/mac80211/offchannel.c | 168 + net/mac80211/pm.c | 10 +- net/mac80211/rx.c | 302 +- net/mac80211/scan.c | 210 +- net/mac80211/spectmgmt.c | 4 +- net/mac80211/sta_info.c | 39 +- net/mac80211/sta_info.h | 29 +- net/mac80211/status.c | 48 +- net/mac80211/tkip.c | 38 +- net/mac80211/tx.c | 44 +- net/mac80211/util.c | 253 ++- net/mac80211/work.c | 1086 ++++++ net/netlink/genetlink.c | 4 +- net/phonet/datagram.c | 6 +- net/phonet/pep-gprs.c | 4 +- net/phonet/pep.c | 29 +- net/tipc/Kconfig | 8 +- net/tipc/core.c | 10 +- net/wireless/.gitignore | 1 + net/wireless/Kconfig | 13 +- net/wireless/Makefile | 6 + net/wireless/chan.c | 41 +- net/wireless/core.h | 5 + net/wireless/db.txt | 17 + net/wireless/genregdb.awk | 118 + net/wireless/mlme.c | 48 +- net/wireless/nl80211.c | 282 ++- net/wireless/nl80211.h | 15 + net/wireless/reg.c | 209 +- net/wireless/regdb.h | 7 + net/wireless/util.c | 132 +- net/wireless/wext-compat.c | 5 +- 490 files changed, 31897 insertions(+), 7012 deletions(-) create mode 100755 Documentation/networking/ixgbevf.txt create mode 100644 Documentation/powerpc/dts-bindings/fsl/can.txt create mode 100644 drivers/net/ixgbe/ixgbe_mbx.c create mode 100644 drivers/net/ixgbe/ixgbe_mbx.h create mode 100644 drivers/net/ixgbe/ixgbe_sriov.c create mode 100644 drivers/net/ixgbe/ixgbe_sriov.h create mode 100644 drivers/net/ixgbevf/Makefile create mode 100644 drivers/net/ixgbevf/defines.h create mode 100644 drivers/net/ixgbevf/ethtool.c create mode 100644 drivers/net/ixgbevf/ixgbevf.h create mode 100644 drivers/net/ixgbevf/ixgbevf_main.c create mode 100644 drivers/net/ixgbevf/mbx.c create mode 100644 drivers/net/ixgbevf/mbx.h create mode 100644 drivers/net/ixgbevf/regs.h create mode 100644 drivers/net/ixgbevf/vf.c create mode 100644 drivers/net/ixgbevf/vf.h create mode 100644 drivers/net/qlcnic/Makefile create mode 100644 drivers/net/qlcnic/qlcnic.h create mode 100644 drivers/net/qlcnic/qlcnic_ctx.c create mode 100644 drivers/net/qlcnic/qlcnic_ethtool.c create mode 100644 drivers/net/qlcnic/qlcnic_hdr.h create mode 100644 drivers/net/qlcnic/qlcnic_hw.c create mode 100644 drivers/net/qlcnic/qlcnic_init.c create mode 100644 drivers/net/qlcnic/qlcnic_main.c rename drivers/net/stmmac/{mac100.c => dwmac100.c} (69%) rename drivers/net/stmmac/{mac100.h => dwmac100.h} (100%) rename drivers/net/stmmac/{gmac.h => dwmac1000.h} (95%) create mode 100644 drivers/net/stmmac/dwmac1000_core.c rename drivers/net/stmmac/{gmac.c => dwmac1000_dma.c} (54%) create mode 100644 drivers/net/stmmac/dwmac_dma.h create mode 100644 drivers/net/stmmac/dwmac_lib.c create mode 100644 drivers/vhost/Kconfig create mode 100644 drivers/vhost/Makefile create mode 100644 drivers/vhost/net.c create mode 100644 drivers/vhost/vhost.c create mode 100644 drivers/vhost/vhost.h create mode 100644 include/linux/stmmac.h create mode 100644 include/linux/vhost.h create mode 100644 net/mac80211/offchannel.c create mode 100644 net/mac80211/work.c create mode 100644 net/wireless/.gitignore create mode 100644 net/wireless/db.txt create mode 100644 net/wireless/genregdb.awk create mode 100644 net/wireless/regdb.h Merging wireless/master $ git merge wireless/master Resolved 'drivers/net/wireless/iwlwifi/iwl-core.h' using previous resolution. Auto-merging drivers/net/wireless/ath/ath5k/base.c Auto-merging drivers/net/wireless/ath/ath9k/pci.c Auto-merging drivers/net/wireless/b43/main.c Auto-merging drivers/net/wireless/b43legacy/main.c Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c Auto-merging drivers/net/wireless/iwlwifi/iwl-core.h CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.h Auto-merging drivers/net/wireless/rt2x00/rt2800pci.c Auto-merging drivers/staging/rtl8187se/ieee80211/ieee80211.h Auto-merging drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c Auto-merging drivers/staging/rtl8187se/r8180_core.c Auto-merging net/mac80211/cfg.c Auto-merging net/mac80211/iface.c Auto-merging net/mac80211/mlme.c Auto-merging net/mac80211/rx.c Auto-merging net/mac80211/scan.c Auto-merging net/wireless/core.c Auto-merging net/wireless/sme.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master ff0a98f] Merge remote branch 'wireless/master' $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/mac80211.tmpl | 2 +- drivers/net/wireless/ath/ath5k/ath5k.h | 24 +- drivers/net/wireless/ath/ath5k/base.c | 22 + drivers/net/wireless/ath/ath5k/pcu.c | 121 ++- drivers/net/wireless/ath/ath5k/qcu.c | 20 +- drivers/net/wireless/ath/ath5k/reset.c | 9 +- drivers/net/wireless/ath/ath9k/Makefile | 2 + drivers/net/wireless/ath/ath9k/ahb.c | 23 +- drivers/net/wireless/ath/ath9k/ath9k.h | 70 +- drivers/net/wireless/ath/ath9k/beacon.c | 3 +- drivers/net/wireless/ath/ath9k/debug.c | 118 ++ drivers/net/wireless/ath/ath9k/debug.h | 32 + drivers/net/wireless/ath/ath9k/gpio.c | 428 +++++ drivers/net/wireless/ath/ath9k/hw.c | 110 +- drivers/net/wireless/ath/ath9k/hw.h | 7 +- drivers/net/wireless/ath/ath9k/init.c | 861 ++++++++++ drivers/net/wireless/ath/ath9k/mac.h | 34 + drivers/net/wireless/ath/ath9k/main.c | 1326 +-------------- drivers/net/wireless/ath/ath9k/pci.c | 58 +- drivers/net/wireless/ath/ath9k/recv.c | 38 +- drivers/net/wireless/ath/ath9k/virtual.c | 2 +- drivers/net/wireless/ath/ath9k/xmit.c | 18 +- drivers/net/wireless/b43/b43.h | 8 + drivers/net/wireless/b43/main.c | 8 +- drivers/net/wireless/b43/phy_lp.c | 24 +- drivers/net/wireless/b43/phy_n.c | 1795 +++++++++++++++++++- drivers/net/wireless/b43/phy_n.h | 87 +- drivers/net/wireless/b43/tables_nphy.c | 577 ++++++- drivers/net/wireless/b43/tables_nphy.h | 71 +- drivers/net/wireless/b43legacy/main.c | 11 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 8 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 3 + drivers/net/wireless/iwlwifi/iwl-commands.h | 7 +- drivers/net/wireless/iwlwifi/iwl-core.h | 4 +- drivers/net/wireless/iwlwifi/iwl-debugfs.c | 49 +- drivers/net/wireless/iwlwifi/iwl-hcmd.c | 1 - drivers/net/wireless/iwmc3200wifi/iwm.h | 2 +- drivers/net/wireless/mwl8k.c | 1359 +++++++++++---- drivers/net/wireless/rt2x00/rt2800lib.c | 27 +- drivers/net/wireless/rt2x00/rt2800lib.h | 3 +- drivers/net/wireless/rt2x00/rt2800pci.c | 24 +- drivers/net/wireless/rt2x00/rt2800usb.c | 22 +- drivers/net/wireless/wl12xx/wl1251_cmd.c | 83 + drivers/net/wireless/wl12xx/wl1251_cmd.h | 22 +- drivers/net/wireless/wl12xx/wl1251_main.c | 291 +--- drivers/net/wireless/wl12xx/wl1271_reg.h | 99 -- drivers/net/wireless/wl12xx/wl1271_spi.c | 3 +- drivers/staging/rtl8187se/ieee80211/ieee80211.h | 9 - .../rtl8187se/ieee80211/ieee80211_softmac.c | 24 +- drivers/staging/rtl8187se/r8180_core.c | 4 +- include/linux/ieee80211.h | 37 + include/linux/nl80211.h | 58 +- include/net/cfg80211.h | 31 +- include/net/mac80211.h | 151 ++- net/mac80211/agg-tx.c | 5 +- net/mac80211/cfg.c | 65 +- net/mac80211/debugfs.c | 94 + net/mac80211/debugfs_netdev.c | 44 +- net/mac80211/driver-ops.h | 15 + net/mac80211/driver-trace.h | 23 + net/mac80211/ieee80211_i.h | 31 +- net/mac80211/iface.c | 13 +- net/mac80211/main.c | 7 +- net/mac80211/mlme.c | 100 +- net/mac80211/offchannel.c | 8 +- net/mac80211/rate.c | 88 +- net/mac80211/rate.h | 5 +- net/mac80211/rx.c | 12 + net/mac80211/scan.c | 20 +- net/mac80211/sta_info.c | 21 + net/mac80211/sta_info.h | 3 + net/mac80211/tx.c | 273 +++- net/mac80211/util.c | 48 +- net/mac80211/wme.c | 2 +- net/mac80211/work.c | 28 +- net/wireless/core.c | 1 + net/wireless/core.h | 3 +- net/wireless/nl80211.c | 130 ++ net/wireless/reg.c | 317 ++++- net/wireless/reg.h | 11 + net/wireless/scan.c | 120 +- net/wireless/sme.c | 1 + net/wireless/wext-compat.c | 34 +- 83 files changed, 7051 insertions(+), 2701 deletions(-) create mode 100644 drivers/net/wireless/ath/ath9k/gpio.c create mode 100644 drivers/net/wireless/ath/ath9k/init.c Merging mtd/master $ git merge mtd/master Auto-merging drivers/mtd/nand/Kconfig Auto-merging drivers/mtd/nand/Makefile Auto-merging drivers/mtd/nand/au1550nd.c Removing drivers/mtd/nand/ts7250.c Merge made by recursive. arch/arm/mach-ep93xx/include/mach/ts72xx.h | 19 -- arch/arm/mach-ep93xx/ts72xx.c | 188 ++++++++++++------ drivers/mtd/maps/physmap_of.c | 2 +- drivers/mtd/nand/Kconfig | 12 +- drivers/mtd/nand/Makefile | 3 +- drivers/mtd/nand/au1550nd.c | 12 +- drivers/mtd/nand/davinci_nand.c | 4 +- drivers/mtd/nand/fsl_elbc_nand.c | 2 +- drivers/mtd/nand/fsl_upm.c | 2 +- drivers/mtd/nand/gpio.c | 12 +- drivers/mtd/nand/nomadik_nand.c | 6 +- drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} | 144 +++++++------- drivers/mtd/nand/orion_nand.c | 10 +- drivers/mtd/nand/s3c2410.c | 2 +- drivers/mtd/nand/sh_flctl.c | 2 +- drivers/mtd/nand/tmio_nand.c | 14 +- drivers/mtd/nand/ts7250.c | 207 -------------------- 17 files changed, 242 insertions(+), 399 deletions(-) rename drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} (63%) delete mode 100644 drivers/mtd/nand/ts7250.c Merging crypto/master $ git merge crypto/master Auto-merging arch/s390/crypto/aes_s390.c Auto-merging init/Kconfig Merge made by recursive. arch/arm/mach-nomadik/cpu-8815.c | 8 + arch/s390/crypto/aes_s390.c | 6 +- crypto/Kconfig | 10 + crypto/Makefile | 1 + crypto/gcm.c | 287 ++++++++++++++ crypto/md5.c | 40 ++- crypto/pcrypt.c | 445 ++++++++++++++++++++++ crypto/testmgr.c | 84 ++++ drivers/char/hw_random/Kconfig | 12 + drivers/char/hw_random/Makefile | 1 + drivers/char/hw_random/nomadik-rng.c | 103 +++++ drivers/crypto/amcc/crypto4xx_core.c | 2 +- drivers/crypto/geode-aes.c | 6 +- drivers/crypto/talitos.c | 2 +- include/crypto/md5.h | 17 + include/crypto/pcrypt.h | 51 +++ include/linux/padata.h | 88 +++++ include/linux/pfkeyv2.h | 1 + init/Kconfig | 4 + kernel/Makefile | 1 + kernel/padata.c | 690 ++++++++++++++++++++++++++++++++++ net/xfrm/xfrm_algo.c | 16 + 22 files changed, 1851 insertions(+), 24 deletions(-) create mode 100644 crypto/pcrypt.c create mode 100644 drivers/char/hw_random/nomadik-rng.c create mode 100644 include/crypto/md5.h create mode 100644 include/crypto/pcrypt.h create mode 100644 include/linux/padata.h create mode 100644 kernel/padata.c Merging sound/for-next $ git merge sound/for-next Removing sound/isa/dt019x.c Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 22 + include/sound/cs46xx_dsp_spos.h | 6 +- include/sound/pcm.h | 48 +- include/sound/pcm_oss.h | 2 +- include/sound/sb.h | 1 + include/sound/soc.h | 3 + include/sound/tpa6130a2-plat.h | 6 + include/sound/version.h | 2 +- include/sound/wm8904.h | 57 + include/sound/wm8955.h | 26 + sound/core/oss/pcm_oss.c | 32 +- sound/core/pcm.c | 4 + sound/core/pcm_lib.c | 438 +++-- sound/core/pcm_memory.c | 55 + sound/core/pcm_native.c | 8 +- sound/core/sound.c | 4 +- sound/drivers/vx/vx_pcm.c | 59 +- sound/isa/Kconfig | 37 +- sound/isa/Makefile | 2 - sound/isa/als100.c | 121 +- sound/isa/dt019x.c | 321 --- sound/isa/opti9xx/opti92x-ad1848.c | 93 + sound/isa/sb/Makefile | 2 + sound/isa/sb/jazz16.c | 404 ++++ sound/isa/sb/sb8_main.c | 118 +- sound/isa/sb/sb_common.c | 3 + sound/isa/sb/sb_mixer.c | 333 ++-- sound/isa/wss/wss_lib.c | 80 +- sound/mips/sgio2audio.c | 31 +- sound/oss/soundcard.c | 35 +- sound/pci/ac97/ac97_patch.c | 17 +- sound/pci/cs46xx/cs46xx_lib.c | 2 +- sound/pci/cs46xx/dsp_spos.c | 42 +- sound/pci/cs46xx/dsp_spos.h | 4 + sound/pci/cs46xx/dsp_spos_scb_lib.c | 33 +- sound/pci/hda/hda_codec.c | 75 +- sound/pci/hda/hda_codec.h | 2 + sound/pci/hda/hda_generic.c | 3 +- sound/pci/hda/hda_hwdep.c | 7 +- sound/pci/hda/hda_intel.c | 30 +- sound/pci/hda/hda_local.h | 14 +- sound/pci/hda/hda_proc.c | 31 +- sound/pci/hda/patch_analog.c | 104 +- sound/pci/hda/patch_cirrus.c | 14 +- sound/pci/hda/patch_cmedia.c | 11 +- sound/pci/hda/patch_conexant.c | 383 +++- sound/pci/hda/patch_realtek.c | 288 +++- sound/pci/hda/patch_si3054.c | 1 + sound/pci/hda/patch_sigmatel.c | 181 ++- sound/pci/hda/patch_via.c | 274 ++- sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 51 +- sound/soc/codecs/Kconfig | 12 + sound/soc/codecs/Makefile | 10 +- sound/soc/codecs/ad1938.c | 64 +- sound/soc/codecs/cs4270.c | 43 +- sound/soc/codecs/da7210.c | 589 ++++++ sound/soc/codecs/da7210.h | 24 + sound/soc/codecs/tlv320aic3x.c | 75 +- sound/soc/codecs/tlv320dac33.c | 288 +++- sound/soc/codecs/tpa6130a2.c | 115 +- sound/soc/codecs/wm8727.c | 66 +- sound/soc/codecs/wm8731.c | 3 + sound/soc/codecs/wm8753.c | 8 - sound/soc/codecs/wm8776.c | 2 + sound/soc/codecs/wm8904.c | 2556 +++++++++++++++++++++++ sound/soc/codecs/wm8904.h | 1681 +++++++++++++++ sound/soc/codecs/wm8955.c | 1151 ++++++++++ sound/soc/codecs/wm8955.h | 489 +++++ sound/soc/codecs/wm8961.c | 3 + sound/soc/codecs/wm8990.c | 8 - sound/soc/codecs/wm8993.c | 67 + sound/soc/davinci/davinci-mcasp.c | 18 +- sound/soc/davinci/davinci-mcasp.h | 1 + sound/soc/davinci/davinci-pcm.c | 2 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 120 +- sound/soc/sh/Kconfig | 8 + sound/soc/sh/Makefile | 2 + sound/soc/sh/fsi-da7210.c | 83 + sound/soc/sh/fsi.c | 164 +- sound/soc/soc-cache.c | 2 +- sound/soc/soc-core.c | 11 +- sound/soc/soc-dapm.c | 37 +- sound/sound_core.c | 2 +- sound/usb/Kconfig | 12 + sound/usb/Makefile | 2 + sound/usb/ua101.c | 1419 +++++++++++++ sound/usb/usbaudio.c | 254 ++-- sound/usb/usbaudio.h | 16 +- sound/usb/usbmixer.c | 75 +- sound/usb/usbquirks.h | 145 +- 90 files changed, 11640 insertions(+), 1907 deletions(-) create mode 100644 include/sound/wm8904.h create mode 100644 include/sound/wm8955.h delete mode 100644 sound/isa/dt019x.c create mode 100644 sound/isa/sb/jazz16.c create mode 100644 sound/soc/codecs/da7210.c create mode 100644 sound/soc/codecs/da7210.h create mode 100644 sound/soc/codecs/wm8904.c create mode 100644 sound/soc/codecs/wm8904.h create mode 100644 sound/soc/codecs/wm8955.c create mode 100644 sound/soc/codecs/wm8955.h create mode 100644 sound/soc/sh/fsi-da7210.c create mode 100644 sound/usb/ua101.c Merging cpufreq/next $ git merge cpufreq/next Auto-merging drivers/acpi/processor_core.c Merge made by recursive. Documentation/cpu-freq/pcc-cpufreq.txt | 207 ++++++++++ arch/x86/kernel/cpu/cpufreq/Kconfig | 14 + arch/x86/kernel/cpu/cpufreq/Makefile | 1 + arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c | 620 +++++++++++++++++++++++++++++ drivers/acpi/processor_core.c | 2 + 5 files changed, 844 insertions(+), 0 deletions(-) create mode 100644 Documentation/cpu-freq/pcc-cpufreq.txt create mode 100644 arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c Merging quilt/rr $ git merge quilt/rr Recorded preimage for 'include/linux/kernel.h' Resolved 'include/linux/kmemcheck.h' using previous resolution. Auto-merging drivers/virtio/virtio_balloon.c Auto-merging include/linux/kernel.h CONFLICT (content): Merge conflict in include/linux/kernel.h Auto-merging include/linux/kmemcheck.h CONFLICT (content): Merge conflict in include/linux/kmemcheck.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'include/linux/kernel.h'. [master ad2fe13] Merge branch 'quilt/rr' $ git diff -M --stat --summary HEAD^.. Documentation/lguest/lguest.c | 1 - drivers/virtio/virtio_balloon.c | 108 ++++++++++++++++++++++++++++++++++++--- include/linux/gfp.h | 2 +- include/linux/kernel.h | 88 +++++++++++++++++++------------- include/linux/kmemcheck.h | 2 +- include/linux/virtio_balloon.h | 15 +++++ include/linux/virtio_config.h | 5 ++- 7 files changed, 174 insertions(+), 47 deletions(-) Merging mmc/next $ git merge mmc/next Already up-to-date. Merging tmio-mmc/linux-next $ git merge tmio-mmc/linux-next Auto-merging drivers/mfd/Makefile Auto-merging drivers/mfd/asic3.c Auto-merging drivers/mmc/core/core.c Auto-merging drivers/mmc/core/core.h Auto-merging drivers/mmc/host/tmio_mmc.c Merge made by recursive. drivers/mfd/Makefile | 6 +- drivers/mfd/asic3.c | 43 +++++++++++++++---- drivers/mfd/t7l66xb.c | 31 +++++++++++-- drivers/mfd/tc6387xb.c | 97 ++++++++++++++++++++++++++++++++++-------- drivers/mfd/tc6393xb.c | 56 +++++++++++++++++++++---- drivers/mfd/tmio_core.c | 62 +++++++++++++++++++++++++++ drivers/mmc/core/core.c | 4 +- drivers/mmc/core/core.h | 10 ++++ drivers/mmc/host/tmio_mmc.c | 78 +++++++++++++++-------------------- drivers/mmc/host/tmio_mmc.h | 46 +++------------------ include/linux/mfd/tmio.h | 40 ++++++++++++++++++ 11 files changed, 342 insertions(+), 131 deletions(-) create mode 100644 drivers/mfd/tmio_core.c Merging input/next $ git merge input/next Auto-merging drivers/input/input.c Auto-merging drivers/input/joystick/xpad.c Auto-merging drivers/input/keyboard/atkbd.c Auto-merging drivers/input/mouse/hgpk.c Auto-merging drivers/input/serio/serio.c Auto-merging include/linux/serio.h Merge made by recursive. Documentation/input/sentelic.txt | 124 ++++++++- arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h | 14 +- drivers/input/gameport/emu10k1-gp.c | 2 +- drivers/input/gameport/fm801-gp.c | 2 +- drivers/input/gameport/gameport.c | 98 +++----- drivers/input/gameport/ns558.c | 2 +- drivers/input/input.c | 36 +++- drivers/input/joystick/xpad.c | 200 +++++++++------ drivers/input/keyboard/atkbd.c | 283 +++++++++++---------- drivers/input/keyboard/ep93xx_keypad.c | 40 +-- drivers/input/keyboard/qt2160.c | 2 +- drivers/input/misc/apanel.c | 2 +- drivers/input/mouse/hgpk.c | 4 - drivers/input/serio/pcips2.c | 2 +- drivers/input/serio/serio.c | 131 ++++------ drivers/input/serio/xilinx_ps2.c | 2 +- drivers/input/tablet/gtco.c | 2 +- drivers/input/touchscreen/elo.c | 225 +++++++++-------- drivers/input/touchscreen/tsc2007.c | 2 +- drivers/input/touchscreen/usbtouchscreen.c | 2 +- drivers/input/xen-kbdfront.c | 2 +- include/linux/gameport.h | 1 - include/linux/serio.h | 1 - 23 files changed, 658 insertions(+), 521 deletions(-) Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Merge made by recursive. block/blk-ioc.c | 5 --- block/blk-settings.c | 61 ++++++++++++++++++++++++----------- block/cfq-iosched.c | 6 +++ block/genhd.c | 2 +- drivers/block/DAC960.c | 2 +- drivers/block/drbd/Kconfig | 2 +- drivers/block/drbd/drbd_main.c | 1 + drivers/block/drbd/drbd_nl.c | 2 +- drivers/block/drbd/drbd_receiver.c | 11 +++--- drivers/block/sx8.c | 2 +- drivers/block/ub.c | 2 +- drivers/block/virtio_blk.c | 2 +- drivers/block/xen-blkfront.c | 2 +- drivers/block/xsysace.c | 2 +- drivers/md/dm-table.c | 20 +++--------- fs/partitions/check.c | 7 ++-- include/linux/blkdev.h | 24 ++++++-------- include/linux/genhd.h | 6 ++-- include/linux/iocontext.h | 27 ---------------- 19 files changed, 87 insertions(+), 99 deletions(-) Merging quilt/device-mapper $ git merge quilt/device-mapper Auto-merging drivers/md/dm-table.c Merge made by recursive. drivers/md/dm-log-userspace-transfer.c | 10 +++++++--- drivers/md/dm-mpath.c | 12 +++++++----- drivers/md/dm-region-hash.c | 5 ++--- drivers/md/dm-table.c | 2 -- drivers/md/dm-uevent.c | 7 ++----- drivers/md/dm.c | 14 ++------------ 6 files changed, 20 insertions(+), 30 deletions(-) Merging embedded/master $ git merge embedded/master Already up-to-date. Merging firmware/master $ git merge firmware/master Already up-to-date. Merging pcmcia/master $ git merge pcmcia/master Auto-merging drivers/pcmcia/Kconfig Auto-merging drivers/pcmcia/Makefile Auto-merging drivers/pcmcia/rsrc_mgr.c Auto-merging drivers/pcmcia/rsrc_nonstatic.c Merge made by recursive. drivers/char/pcmcia/cm4000_cs.c | 2 +- drivers/net/pcmcia/smc91c92_cs.c | 6 +- drivers/pcmcia/Kconfig | 9 +- drivers/pcmcia/Makefile | 4 +- drivers/pcmcia/bfin_cf_pcmcia.c | 2 +- drivers/pcmcia/cardbus.c | 175 +------------ drivers/pcmcia/cistpl.c | 524 +++++++++++++++++++------------------ drivers/pcmcia/cs.c | 92 ++++---- drivers/pcmcia/cs_internal.h | 68 ++---- drivers/pcmcia/ds.c | 34 +++- drivers/pcmcia/electra_cf.c | 2 +- drivers/pcmcia/m32r_cfc.c | 2 +- drivers/pcmcia/m8xx_pcmcia.c | 4 +- drivers/pcmcia/o2micro.h | 45 ++-- drivers/pcmcia/pcmcia_resource.c | 33 +++ drivers/pcmcia/rsrc_mgr.c | 44 ---- drivers/pcmcia/rsrc_nonstatic.c | 188 +++++++++----- drivers/pcmcia/socket_sysfs.c | 150 +----------- drivers/pcmcia/yenta_socket.c | 5 + include/pcmcia/ss.h | 19 +- 20 files changed, 591 insertions(+), 817 deletions(-) Merging battery/master $ git merge battery/master Already up-to-date. Merging leds/for-mm $ git merge leds/for-mm Already up-to-date. Merging backlight/for-mm $ git merge backlight/for-mm Already up-to-date. Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS Auto-merging arch/sh/kernel/kgdb.c Auto-merging drivers/gpu/drm/i915/intel_display.c Auto-merging drivers/input/input.c Auto-merging drivers/serial/8250.c Auto-merging drivers/serial/sh-sci.c Auto-merging include/linux/input.h Auto-merging include/linux/sched.h Auto-merging kernel/Makefile Removing kernel/kgdb.c Auto-merging kernel/panic.c Auto-merging kernel/printk.c Merge made by recursive. Documentation/DocBook/kgdb.tmpl | 714 +++++++-- Documentation/kernel-parameters.txt | 18 +- MAINTAINERS | 6 +- arch/arm/include/asm/kmap_types.h | 1 + arch/arm/kernel/kgdb.c | 5 + arch/blackfin/kernel/kgdb.c | 5 + arch/mips/include/asm/kgdb.h | 2 + arch/mips/kernel/kgdb.c | 27 +- arch/mips/kernel/traps.c | 13 + arch/powerpc/include/asm/kmap_types.h | 1 + arch/powerpc/kernel/kgdb.c | 12 +- arch/powerpc/kernel/traps.c | 7 + arch/sh/kernel/kgdb.c | 14 +- arch/sparc/kernel/kgdb_32.c | 6 + arch/sparc/kernel/kgdb_64.c | 6 + arch/x86/include/asm/kgdb.h | 3 + arch/x86/kernel/hw_breakpoint.c | 5 +- arch/x86/kernel/kgdb.c | 247 ++- arch/x86/kernel/traps.c | 6 + drivers/char/Makefile | 1 + drivers/char/kdb_keyboard.c | 204 +++ drivers/char/kdb_keyboard.h | 143 ++ drivers/char/keyboard.c | 30 +- drivers/gpu/drm/drm_fb_helper.c | 93 +- drivers/gpu/drm/i915/intel_display.c | 114 ++- drivers/input/input.c | 15 + drivers/misc/kgdbts.c | 6 + drivers/serial/8250.c | 4 +- drivers/serial/amba-pl011.c | 6 +- drivers/serial/kgdboc.c | 117 ++- drivers/serial/sh-sci.c | 6 +- drivers/serial/sunzilog.c | 50 + drivers/video/console/fbcon.c | 7 + fs/proc/internal.h | 4 +- fs/proc/meminfo.c | 15 +- fs/proc/mmu.c | 8 +- include/asm-generic/kmap_types.h | 3 +- include/drm/drm_crtc_helper.h | 2 + include/drm/drm_fb_helper.h | 4 + include/linux/input.h | 10 + include/linux/kdb.h | 121 ++ include/linux/kgdb.h | 77 +- include/linux/sched.h | 4 + include/linux/serial_core.h | 1 + include/linux/swap.h | 2 + init/main.c | 6 + kernel/Makefile | 2 +- kernel/debug/Makefile | 8 + kernel/debug/debug_core.c | 985 ++++++++++++ kernel/debug/debug_core.h | 82 + kernel/debug/gdbstub.c | 1022 ++++++++++++ kernel/debug/kdb/.gitignore | 1 + kernel/debug/kdb/Makefile | 24 + kernel/debug/kdb/kdb_bp.c | 567 +++++++ kernel/debug/kdb/kdb_bt.c | 217 +++ kernel/debug/kdb/kdb_cmds | 32 + kernel/debug/kdb/kdb_debugger.c | 167 ++ kernel/debug/kdb/kdb_io.c | 825 ++++++++++ kernel/debug/kdb/kdb_main.c | 2857 +++++++++++++++++++++++++++++++++ kernel/debug/kdb/kdb_private.h | 398 +++++ kernel/debug/kdb/kdb_support.c | 1007 ++++++++++++ kernel/debug/kms_hooks.c | 62 + kernel/kallsyms.c | 21 + kernel/kgdb.c | 1760 -------------------- kernel/module.c | 4 + kernel/panic.c | 7 +- kernel/printk.c | 25 + kernel/sched.c | 7 +- kernel/signal.c | 42 + kernel/softlockup.c | 16 + lib/Kconfig.kgdb | 24 +- mm/swapfile.c | 10 +- 72 files changed, 10232 insertions(+), 2091 deletions(-) create mode 100644 drivers/char/kdb_keyboard.c create mode 100644 drivers/char/kdb_keyboard.h create mode 100644 include/linux/kdb.h create mode 100644 kernel/debug/Makefile create mode 100644 kernel/debug/debug_core.c create mode 100644 kernel/debug/debug_core.h create mode 100644 kernel/debug/gdbstub.c create mode 100644 kernel/debug/kdb/.gitignore create mode 100644 kernel/debug/kdb/Makefile create mode 100644 kernel/debug/kdb/kdb_bp.c create mode 100644 kernel/debug/kdb/kdb_bt.c create mode 100644 kernel/debug/kdb/kdb_cmds create mode 100644 kernel/debug/kdb/kdb_debugger.c create mode 100644 kernel/debug/kdb/kdb_io.c create mode 100644 kernel/debug/kdb/kdb_main.c create mode 100644 kernel/debug/kdb/kdb_private.h create mode 100644 kernel/debug/kdb/kdb_support.c create mode 100644 kernel/debug/kms_hooks.c delete mode 100644 kernel/kgdb.c Merging slab/for-next $ git merge slab/for-next Auto-merging mm/slab.c Merge made by recursive. include/linux/slub_def.h | 27 ++--- mm/slab.c | 6 +- mm/slub.c | 303 +++++++++++---------------------------------- 3 files changed, 88 insertions(+), 248 deletions(-) Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Already up-to-date. Merging mfd/for-next $ git merge mfd/for-next Resolved 'drivers/mfd/asic3.c' using previous resolution. Resolved 'drivers/mfd/t7l66xb.c' using previous resolution. Resolved 'drivers/mfd/tc6387xb.c' using previous resolution. Resolved 'drivers/mfd/tc6393xb.c' using previous resolution. Resolved 'drivers/mfd/tmio_core.c' using previous resolution. Resolved 'drivers/mmc/host/tmio_mmc.c' using previous resolution. Resolved 'drivers/mmc/host/tmio_mmc.h' using previous resolution. Resolved 'include/linux/mfd/tmio.h' using previous resolution. Auto-merging drivers/gpio/Kconfig Auto-merging drivers/gpio/Makefile Removing drivers/mfd/88pm8607.c Auto-merging drivers/mfd/Makefile Auto-merging drivers/mfd/asic3.c CONFLICT (content): Merge conflict in drivers/mfd/asic3.c Auto-merging drivers/mfd/t7l66xb.c CONFLICT (content): Merge conflict in drivers/mfd/t7l66xb.c Auto-merging drivers/mfd/tc6387xb.c CONFLICT (content): Merge conflict in drivers/mfd/tc6387xb.c Auto-merging drivers/mfd/tc6393xb.c CONFLICT (content): Merge conflict in drivers/mfd/tc6393xb.c Auto-merging drivers/mfd/tmio_core.c CONFLICT (add/add): Merge conflict in drivers/mfd/tmio_core.c Auto-merging drivers/mmc/host/tmio_mmc.c CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc.c Auto-merging drivers/mmc/host/tmio_mmc.h CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc.h Removing include/linux/mfd/88pm8607.h Auto-merging include/linux/mfd/tmio.h CONFLICT (content): Merge conflict in include/linux/mfd/tmio.h Auto-merging sound/soc/codecs/wm8350.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f3ead4e] Merge remote branch 'mfd/for-next' $ git diff -M --stat --summary HEAD^.. drivers/gpio/Kconfig | 7 + drivers/gpio/Makefile | 1 + drivers/gpio/wm8350-gpiolib.c | 181 ++++++++++ drivers/input/touchscreen/88pm860x-ts.c | 241 +++++++++++++ drivers/input/touchscreen/Kconfig | 12 + drivers/input/touchscreen/Makefile | 1 + drivers/leds/Kconfig | 7 + drivers/leds/Makefile | 1 + drivers/leds/leds-88pm860x.c | 325 ++++++++++++++++++ drivers/mfd/88pm8607.c | 302 ----------------- drivers/mfd/88pm860x-core.c | 560 +++++++++++++++++++++++++++++++ drivers/mfd/88pm860x-i2c.c | 268 +++++++++++++++ drivers/mfd/Kconfig | 36 ++- drivers/mfd/Makefile | 7 +- drivers/mfd/ab3100-core.c | 43 +-- drivers/mfd/asic3.c | 9 +- drivers/mfd/max8925-core.c | 404 ++++++++++++++++++++++ drivers/mfd/max8925-i2c.c | 210 ++++++++++++ drivers/mfd/mc13783-core.c | 4 +- drivers/mfd/sm501.c | 7 +- drivers/mfd/t7l66xb.c | 40 +-- drivers/mfd/tc6387xb.c | 36 +- drivers/mfd/tc6393xb.c | 14 +- drivers/mfd/tmio_core.c | 20 +- drivers/mfd/wm8350-core.c | 3 +- drivers/mfd/wm8350-irq.c | 155 +++++---- drivers/mmc/host/tmio_mmc.c | 6 +- drivers/mmc/host/tmio_mmc.h | 2 +- drivers/power/wm8350_power.c | 26 +- drivers/regulator/88pm8607.c | 318 +++++------------- drivers/regulator/Kconfig | 8 +- drivers/regulator/Makefile | 1 + drivers/regulator/max8925-regulator.c | 306 +++++++++++++++++ drivers/regulator/wm8350-regulator.c | 2 +- drivers/rtc/rtc-wm8350.c | 11 +- drivers/video/backlight/88pm860x_bl.c | 304 +++++++++++++++++ drivers/video/backlight/Kconfig | 13 + drivers/video/backlight/Makefile | 2 + drivers/video/backlight/max8925_bl.c | 200 +++++++++++ include/linux/mfd/88pm8607.h | 217 ------------ include/linux/mfd/88pm860x.h | 381 +++++++++++++++++++++ include/linux/mfd/ab3100.h | 3 - include/linux/mfd/max8925.h | 215 ++++++++++++ include/linux/mfd/tmio.h | 15 +- include/linux/mfd/wm8350/core.h | 47 ++- include/linux/mfd/wm8350/gpio.h | 1 + include/linux/mfd/wm8350/pmic.h | 28 +- include/linux/mfd/wm8350/rtc.h | 1 + sound/soc/codecs/wm8350.c | 8 +- 49 files changed, 4012 insertions(+), 997 deletions(-) create mode 100644 drivers/gpio/wm8350-gpiolib.c create mode 100644 drivers/input/touchscreen/88pm860x-ts.c create mode 100644 drivers/leds/leds-88pm860x.c delete mode 100644 drivers/mfd/88pm8607.c create mode 100644 drivers/mfd/88pm860x-core.c create mode 100644 drivers/mfd/88pm860x-i2c.c create mode 100644 drivers/mfd/max8925-core.c create mode 100644 drivers/mfd/max8925-i2c.c create mode 100644 drivers/regulator/max8925-regulator.c create mode 100644 drivers/video/backlight/88pm860x_bl.c create mode 100644 drivers/video/backlight/max8925_bl.c delete mode 100644 include/linux/mfd/88pm8607.h create mode 100644 include/linux/mfd/88pm860x.h create mode 100644 include/linux/mfd/max8925.h Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Auto-merging drivers/gpu/drm/radeon/radeon_encoders.c Auto-merging drivers/gpu/drm/radeon/radeon_legacy_encoders.c Merge made by recursive. Merging voltage/for-next $ git merge voltage/for-next Auto-merging drivers/regulator/wm8350-regulator.c Merge made by recursive. drivers/regulator/core.c | 48 ++++- drivers/regulator/fixed.c | 5 + drivers/regulator/lp3971.c | 10 +- drivers/regulator/mc13783-regulator.c | 345 ++++++++++++++++++++++++++++++--- drivers/regulator/wm8350-regulator.c | 46 +++++ include/linux/regulator/consumer.h | 4 +- include/linux/regulator/driver.h | 6 + include/linux/regulator/fixed.h | 2 + 8 files changed, 422 insertions(+), 44 deletions(-) Merging security-testing/next $ git merge security-testing/next Auto-merging include/linux/security.h Auto-merging security/selinux/ss/services.c Auto-merging security/tomoyo/file.c Auto-merging security/tomoyo/tomoyo.c Merge made by recursive. include/linux/security.h | 1 + kernel/capability.c | 4 +- security/security.c | 34 +++--- security/selinux/avc.c | 5 +- security/selinux/include/security.h | 10 +- security/selinux/selinuxfs.c | 7 +- security/selinux/ss/mls.c | 4 +- security/selinux/ss/services.c | 190 +++++++++++++----------------- security/tomoyo/common.c | 204 +++++++++++++------------------- security/tomoyo/common.h | 47 +++++--- security/tomoyo/domain.c | 137 ++++++++++------------ security/tomoyo/file.c | 217 +++++++++++++++++++++++------------ security/tomoyo/realpath.c | 136 ++++++---------------- security/tomoyo/realpath.h | 7 +- security/tomoyo/tomoyo.c | 81 +++++++++++++- security/tomoyo/tomoyo.h | 12 ++- 16 files changed, 561 insertions(+), 535 deletions(-) Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging agp/agp-next $ git merge agp/agp-next Merge made by recursive. Merging uwb/for-upstream $ git merge uwb/for-upstream Merge made by recursive. drivers/uwb/hwa-rc.c | 2 +- drivers/uwb/i1480/dfu/usb.c | 6 ++- drivers/uwb/wlp/messages.c | 106 +++++++++++++++++++++++++------------------ 3 files changed, 67 insertions(+), 47 deletions(-) Merging watchdog/master $ git merge watchdog/master Merge made by recursive. drivers/watchdog/iTCO_wdt.c | 45 +++++++++++++++++++++++++++++++++++++++- drivers/watchdog/ixp2000_wdt.c | 1 + 2 files changed, 45 insertions(+), 1 deletions(-) Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Merge made by recursive. drivers/pci/dmar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging cputime/cputime $ git merge cputime/cputime Already up-to-date. Merging osd/linux-next $ git merge osd/linux-next Merge made by recursive. drivers/scsi/osd/osd_initiator.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) Merging jc_docs/docs-next $ git merge jc_docs/docs-next Merge made by recursive. Documentation/video4linux/videobuf | 341 ++++++++++++++++++++++++++++++++++++ 1 files changed, 341 insertions(+), 0 deletions(-) create mode 100644 Documentation/video4linux/videobuf Merging nommu/master $ git merge nommu/master Already up-to-date. Merging trivial/for-next $ git merge trivial/for-next Auto-merging arch/arm/mach-omap2/board-zoom-peripherals.c Auto-merging drivers/net/davinci_emac.c Auto-merging drivers/net/typhoon.c Auto-merging drivers/net/wimax/i2400m/fw.c Auto-merging drivers/net/wireless/zd1211rw/zd_mac.c Auto-merging fs/locks.c Auto-merging fs/namei.c Auto-merging mm/slub.c Auto-merging security/selinux/avc.c Merge made by recursive. Documentation/driver-model/platform.txt | 2 +- Documentation/eisa.txt | 2 +- Documentation/laptops/00-INDEX | 4 ++++ .../networking/timestamping/timestamping.c | 2 +- Documentation/power/runtime_pm.txt | 2 +- arch/arm/mach-davinci/include/mach/i2c.h | 2 +- arch/arm/mach-s3c2410/include/mach/spi-gpio.h | 2 +- arch/arm/mach-s5pc100/setup-sdhci.c | 4 ++-- arch/arm/plat-s3c/include/plat/nand.h | 2 +- arch/blackfin/include/asm/nand.h | 4 ++-- arch/powerpc/kernel/legacy_serial.c | 2 +- arch/powerpc/mm/tlb_low_64e.S | 2 +- arch/x86/kernel/apic/apic_flat_64.c | 2 +- arch/x86/kernel/pci-dma.c | 2 +- arch/x86/kernel/ptrace.c | 2 +- arch/x86/kernel/vmiclock_32.c | 2 +- arch/x86/xen/smp.c | 2 +- drivers/acpi/proc.c | 2 +- drivers/ata/libata-core.c | 2 +- drivers/block/ataflop.c | 2 -- drivers/char/random.c | 2 +- drivers/gpu/drm/radeon/atombios.h | 2 +- drivers/gpu/drm/radeon/radeon_state.c | 2 +- drivers/ieee1394/pcilynx.c | 2 +- drivers/input/serio/i8042.c | 2 +- drivers/input/tablet/aiptek.c | 2 +- drivers/isdn/hardware/mISDN/mISDNisar.c | 4 ++-- drivers/isdn/mISDN/dsp_core.c | 4 ++-- drivers/isdn/mISDN/l1oip_core.c | 2 +- drivers/mfd/ab3100-otp.c | 2 +- drivers/mmc/card/sdio_uart.c | 2 +- drivers/mtd/maps/plat-ram.c | 2 +- drivers/net/cs89x0.c | 2 +- drivers/net/cxgb3/sge.c | 4 ++-- drivers/net/davinci_emac.c | 2 +- drivers/net/sfc/mcdi_pcol.h | 2 +- drivers/net/typhoon.c | 6 +++--- drivers/net/wan/cosa.c | 10 +++++----- drivers/net/wan/hdlc_cisco.c | 8 ++++---- drivers/net/wan/hdlc_x25.c | 4 ++-- drivers/net/wimax/i2400m/fw.c | 2 +- drivers/net/wireless/rt2x00/rt2x00link.c | 2 +- drivers/net/wireless/rt2x00/rt2x00usb.c | 2 +- drivers/net/wireless/zd1211rw/zd_mac.c | 2 +- drivers/scsi/lpfc/lpfc_scsi.c | 4 ++-- drivers/uwb/i1480/i1480-est.c | 4 ++-- drivers/video/mbx/mbxfb.c | 2 +- drivers/video/sstfb.c | 2 +- drivers/w1/w1.c | 4 ++-- fs/bio.c | 7 +++---- fs/buffer.c | 2 +- fs/dlm/member.c | 2 +- fs/ext3/super.c | 2 +- fs/ext4/super.c | 2 +- fs/locks.c | 2 +- fs/mpage.c | 2 +- fs/namei.c | 2 +- fs/qnx4/inode.c | 3 ++- include/linux/dm9000.h | 2 +- include/linux/mmzone.h | 2 +- include/math-emu/op-common.h | 2 +- kernel/audit.c | 2 +- kernel/ksysfs.c | 2 +- kernel/sched_cpupri.c | 2 +- kernel/trace/ring_buffer.c | 4 ++-- mm/slub.c | 2 +- security/selinux/avc.c | 6 +++--- 67 files changed, 93 insertions(+), 91 deletions(-) mode change 100755 => 100644 arch/arm/mach-omap2/board-3630sdp.c mode change 100755 => 100644 arch/arm/mach-omap2/board-zoom-peripherals.c mode change 100755 => 100644 drivers/mtd/chips/cfi_util.c mode change 100755 => 100644 drivers/mtd/inftlcore.c $ git revert 8dcafdf0475eb4633401d1f0bf0e0d35e4ebb9d5 Finished one revert. [master 77d5df3] Revert "CONFIG_DEBUG_FS wrongly written as CONFIG_DEBUGFS" 1 files changed, 1 insertions(+), 1 deletions(-) Merging audit/for-next $ git merge audit/for-next Already up-to-date. Merging quilt/aoe $ git merge quilt/aoe Auto-merging drivers/block/aoe/aoecmd.c Merge made by recursive. drivers/block/aoe/aoecmd.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) Merging suspend/linux-next $ git merge suspend/linux-next Auto-merging drivers/base/power/main.c Auto-merging kernel/power/Kconfig Merge made by recursive. drivers/base/power/main.c | 136 ++++++++++++++++++++++++++++++++++++++---- drivers/base/power/power.h | 6 +- drivers/base/power/sysfs.c | 47 ++++++++++++++ include/linux/device.h | 17 +++++ include/linux/pm.h | 3 + include/linux/resume-trace.h | 7 ++ kernel/power/Kconfig | 14 ++++ kernel/power/main.c | 31 +++++++++- 8 files changed, 246 insertions(+), 15 deletions(-) Merging bluetooth/master $ git merge bluetooth/master Merge made by recursive. drivers/bluetooth/Kconfig | 13 +++- drivers/bluetooth/Makefile | 1 + drivers/bluetooth/ath3k.c | 187 +++++++++++++++++++++++++++++++++++++++ drivers/bluetooth/bcm203x.c | 2 +- drivers/bluetooth/btmrvl_sdio.c | 4 +- 5 files changed, 203 insertions(+), 4 deletions(-) create mode 100644 drivers/bluetooth/ath3k.c Merging fsnotify/for-next $ git merge fsnotify/for-next Recorded preimage for 'fs/notify/inotify/inotify_fsnotify.c' Recorded preimage for 'fs/notify/inotify/inotify_user.c' Recorded preimage for 'include/linux/fs.h' Recorded preimage for 'include/linux/fsnotify.h' Auto-merging Documentation/feature-removal-schedule.txt Auto-merging fs/namespace.c Auto-merging fs/nfsd/vfs.c Removing fs/notify/inotify/inotify.c Auto-merging fs/notify/inotify/inotify_fsnotify.c CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_fsnotify.c Auto-merging fs/notify/inotify/inotify_user.c CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_user.c Auto-merging fs/open.c Auto-merging include/linux/Kbuild Auto-merging include/linux/fs.h CONFLICT (content): Merge conflict in include/linux/fs.h Auto-merging include/linux/fsnotify.h CONFLICT (content): Merge conflict in include/linux/fsnotify.h Auto-merging include/linux/security.h Auto-merging include/linux/syscalls.h Auto-merging init/Kconfig Auto-merging kernel/Makefile Auto-merging kernel/audit.c Auto-merging kernel/auditsc.c Auto-merging security/security.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'fs/notify/inotify/inotify_fsnotify.c'. Recorded resolution for 'fs/notify/inotify/inotify_user.c'. Recorded resolution for 'include/linux/fs.h'. Recorded resolution for 'include/linux/fsnotify.h'. [master 199ad11] Merge remote branch 'fsnotify/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/feature-removal-schedule.txt | 8 - arch/x86/ia32/ia32entry.S | 2 + arch/x86/ia32/sys_ia32.c | 9 + arch/x86/include/asm/sys_ia32.h | 3 + arch/x86/include/asm/unistd_32.h | 4 +- arch/x86/include/asm/unistd_64.h | 4 + arch/x86/kernel/syscall_table_32.S | 2 + fs/compat.c | 5 +- fs/exec.c | 4 +- fs/inode.c | 8 +- fs/namespace.c | 5 + fs/nfsd/vfs.c | 4 +- fs/notify/Kconfig | 1 + fs/notify/Makefile | 4 +- fs/notify/dnotify/dnotify.c | 198 +++---- fs/notify/fanotify/Kconfig | 26 + fs/notify/fanotify/Makefile | 1 + fs/notify/fanotify/fanotify.c | 255 ++++++++ fs/notify/fanotify/fanotify_user.c | 776 +++++++++++++++++++++++ fs/notify/fsnotify.c | 140 ++++- fs/notify/fsnotify.h | 33 +- fs/notify/group.c | 178 +++--- fs/notify/inode_mark.c | 309 +++------- fs/notify/inotify/Kconfig | 15 - fs/notify/inotify/Makefile | 1 - fs/notify/inotify/inotify.c | 933 ---------------------------- fs/notify/inotify/inotify.h | 7 +- fs/notify/inotify/inotify_fsnotify.c | 114 +++- fs/notify/inotify/inotify_user.c | 305 ++++++---- fs/notify/mark.c | 325 ++++++++++ fs/notify/notification.c | 176 +++--- fs/notify/vfsmount_mark.c | 176 ++++++ fs/open.c | 3 +- fs/read_write.c | 8 +- include/asm-generic/fcntl.h | 8 + include/linux/Kbuild | 1 + include/linux/fanotify.h | 105 ++++ include/linux/fs.h | 13 +- include/linux/fsnotify.h | 153 +++--- include/linux/fsnotify_backend.h | 162 ++++-- include/linux/inotify.h | 174 ------ include/linux/mount.h | 6 +- include/linux/security.h | 1 + include/linux/syscalls.h | 5 + init/Kconfig | 10 +- kernel/Makefile | 5 +- kernel/audit.c | 1 - kernel/audit.h | 26 +- kernel/audit_tree.c | 232 ++++--- kernel/audit_watch.c | 295 +++++---- kernel/auditfilter.c | 39 +- kernel/auditsc.c | 10 +- kernel/sys_ni.c | 4 + security/security.c | 16 +- 54 files changed, 3075 insertions(+), 2233 deletions(-) create mode 100644 fs/notify/fanotify/Kconfig create mode 100644 fs/notify/fanotify/Makefile create mode 100644 fs/notify/fanotify/fanotify.c create mode 100644 fs/notify/fanotify/fanotify_user.c delete mode 100644 fs/notify/inotify/inotify.c create mode 100644 fs/notify/mark.c create mode 100644 fs/notify/vfsmount_mark.c create mode 100644 include/linux/fanotify.h Merging irda/for-next $ git merge irda/for-next Resolved 'drivers/net/irda/irda-usb.c' using previous resolution. Auto-merging drivers/net/irda/irda-usb.c CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master ea2bba7] Merge remote branch 'irda/for-next' $ git diff -M --stat --summary HEAD^.. drivers/net/irda/irda-usb.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) Merging hwlat/for-linus $ git merge hwlat/for-linus Resolved 'MAINTAINERS' using previous resolution. Resolved 'drivers/misc/Makefile' using previous resolution. Auto-merging MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merging drivers/misc/Kconfig Auto-merging drivers/misc/Makefile CONFLICT (content): Merge conflict in drivers/misc/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master c7a021a] Merge remote branch 'hwlat/for-linus' $ git diff -M --stat --summary HEAD^.. Documentation/hwlat_detector.txt | 64 ++ MAINTAINERS | 9 + drivers/misc/Kconfig | 29 + drivers/misc/Makefile | 1 + drivers/misc/hwlat_detector.c | 1208 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 1311 insertions(+), 0 deletions(-) create mode 100644 Documentation/hwlat_detector.txt create mode 100644 drivers/misc/hwlat_detector.c Merging drbd/for-jens $ git merge drbd/for-jens Auto-merging drivers/block/drbd/drbd_receiver.c Merge made by recursive. drivers/block/drbd/drbd_int.h | 7 +++---- drivers/block/drbd/drbd_nl.c | 17 +++++++++++------ drivers/block/drbd/drbd_receiver.c | 35 ++++++++++++++++++++++++----------- include/linux/drbd.h | 2 +- include/linux/drbd_nl.h | 1 + 5 files changed, 40 insertions(+), 22 deletions(-) Merging catalin/for-next $ git merge catalin/for-next Already up-to-date. Merging alacrity/linux-next $ git merge alacrity/linux-next Resolved 'include/linux/Kbuild' using previous resolution. Resolved 'lib/Kconfig' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/x86/Kconfig Auto-merging drivers/Makefile Auto-merging drivers/net/Kconfig Auto-merging drivers/net/Makefile Auto-merging include/linux/Kbuild CONFLICT (content): Merge conflict in include/linux/Kbuild Auto-merging lib/Kconfig CONFLICT (content): Merge conflict in lib/Kconfig Auto-merging lib/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 4111562] Merge remote branch 'alacrity/linux-next' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 25 + arch/x86/Kconfig | 2 + drivers/Makefile | 1 + drivers/net/Kconfig | 14 + drivers/net/Makefile | 1 + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ drivers/vbus/Kconfig | 25 + drivers/vbus/Makefile | 6 + drivers/vbus/bus-proxy.c | 247 +++++++ drivers/vbus/pci-bridge.c | 1015 ++++++++++++++++++++++++++++ include/linux/Kbuild | 4 + include/linux/ioq.h | 414 ++++++++++++ include/linux/shm_signal.h | 189 ++++++ include/linux/vbus_driver.h | 83 +++ include/linux/vbus_pci.h | 145 ++++ include/linux/venet.h | 133 ++++ lib/Kconfig | 21 + lib/Makefile | 2 + lib/ioq.c | 304 +++++++++ lib/shm_signal.c | 196 ++++++ 20 files changed, 4387 insertions(+), 0 deletions(-) create mode 100644 drivers/net/vbus-enet.c create mode 100644 drivers/vbus/Kconfig create mode 100644 drivers/vbus/Makefile create mode 100644 drivers/vbus/bus-proxy.c create mode 100644 drivers/vbus/pci-bridge.c create mode 100644 include/linux/ioq.h create mode 100644 include/linux/shm_signal.h create mode 100644 include/linux/vbus_driver.h create mode 100644 include/linux/vbus_pci.h create mode 100644 include/linux/venet.h create mode 100644 lib/ioq.c create mode 100644 lib/shm_signal.c Merging i7core_edac/linux_next $ git merge i7core_edac/linux_next Auto-merging Documentation/edac.txt Auto-merging arch/x86/include/asm/pci_x86.h Auto-merging arch/x86/kernel/cpu/mcheck/mce.c Auto-merging drivers/edac/edac_core.h Auto-merging include/linux/pci.h Auto-merging include/linux/pci_ids.h Merge made by recursive. Documentation/edac.txt | 153 +++ arch/x86/include/asm/pci_x86.h | 2 + arch/x86/kernel/cpu/mcheck/mce.c | 10 + arch/x86/pci/legacy.c | 42 +- drivers/edac/Kconfig | 13 + drivers/edac/Makefile | 2 + drivers/edac/edac_core.h | 23 +- drivers/edac/edac_mc_sysfs.c | 175 +++- drivers/edac/edac_mce.c | 61 ++ drivers/edac/i7core_edac.c | 1977 ++++++++++++++++++++++++++++++++++++++ include/linux/edac_mce.h | 31 + include/linux/pci.h | 1 + include/linux/pci_ids.h | 19 + 13 files changed, 2465 insertions(+), 44 deletions(-) create mode 100644 drivers/edac/edac_mce.c create mode 100644 drivers/edac/i7core_edac.c create mode 100644 include/linux/edac_mce.h Merging devicetree/next-devicetree $ git merge devicetree/next-devicetree Already up-to-date. Merging spi/next-spi $ git merge spi/next-spi Auto-merging arch/arm/include/asm/io.h Merge made by recursive. arch/arm/include/asm/io.h | 4 ++++ drivers/spi/xilinx_spi.c | 28 ++++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) Merging limits/writable_limits $ git merge limits/writable_limits Resolved 'arch/x86/ia32/ia32entry.S' using previous resolution. Resolved 'arch/x86/include/asm/unistd_32.h' using previous resolution. Resolved 'arch/x86/include/asm/unistd_64.h' using previous resolution. Resolved 'arch/x86/kernel/syscall_table_32.S' using previous resolution. Auto-merging arch/x86/ia32/ia32entry.S CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S Auto-merging arch/x86/include/asm/unistd_32.h CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h Auto-merging arch/x86/include/asm/unistd_64.h CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h Auto-merging arch/x86/kernel/syscall_table_32.S CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S Auto-merging fs/proc/base.c Auto-merging include/linux/security.h Auto-merging include/linux/syscalls.h Auto-merging security/security.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 7e7f21a] Merge remote branch 'limits/writable_limits' $ git diff -M --stat --summary HEAD^.. arch/x86/ia32/ia32entry.S | 2 + arch/x86/include/asm/unistd_32.h | 4 +- arch/x86/include/asm/unistd_64.h | 4 + arch/x86/kernel/syscall_table_32.S | 2 + fs/proc/base.c | 101 ++++++++++++++++++++++-- include/asm-generic/unistd.h | 6 +- include/linux/posix-timers.h | 2 +- include/linux/resource.h | 2 + include/linux/security.h | 9 ++- include/linux/syscalls.h | 4 + kernel/compat.c | 98 +++++++++++++++++------- kernel/posix-cpu-timers.c | 10 +- kernel/sys.c | 151 ++++++++++++++++++++++++++++++------ security/capability.c | 3 +- security/security.c | 5 +- security/selinux/hooks.c | 10 ++- 16 files changed, 335 insertions(+), 78 deletions(-) Merging omap_dss2/for-next $ git merge omap_dss2/for-next Merge made by recursive. arch/arm/configs/am3517_evm_defconfig | 52 ++- arch/arm/configs/omap3_evm_defconfig | 51 ++- arch/arm/mach-omap2/board-am3517evm.c | 145 ++++++ arch/arm/mach-omap2/board-cm-t35.c | 239 ++++++++++- arch/arm/mach-omap2/board-omap3evm.c | 246 ++++++++++- arch/arm/mach-omap2/board-omap3pandora.c | 109 +++++ drivers/video/omap2/displays/Kconfig | 18 + drivers/video/omap2/displays/Makefile | 3 + .../video/omap2/displays/panel-sharp-lq043t1dg01.c | 120 +++++ .../video/omap2/displays/panel-toppoly-tdo35s.c | 112 +++++ .../video/omap2/displays/panel-tpo-td043mtea1.c | 489 ++++++++++++++++++++ 11 files changed, 1570 insertions(+), 14 deletions(-) create mode 100644 drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c create mode 100644 drivers/video/omap2/displays/panel-toppoly-tdo35s.c create mode 100644 drivers/video/omap2/displays/panel-tpo-td043mtea1.c Merging tip/auto-latest $ git merge tip/auto-latest Recorded preimage for 'scripts/recordmcount.pl' Removing arch/x86/include/asm/atomic_32.h Removing arch/x86/include/asm/atomic_64.h Auto-merging arch/x86/include/asm/uv/uv_hub.h Auto-merging arch/x86/kernel/apic/x2apic_uv_x.c Auto-merging arch/x86/kernel/ptrace.c Auto-merging include/linux/kernel.h Auto-merging include/linux/syscalls.h Auto-merging init/Kconfig Auto-merging kernel/sched.c Auto-merging kernel/trace/trace_events_filter.c Auto-merging scripts/recordmcount.pl CONFLICT (content): Merge conflict in scripts/recordmcount.pl Removing tools/perf/util/data_map.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'scripts/recordmcount.pl'. [master 3a8137c] Merge remote branch 'tip/auto-latest' $ git diff -M --stat --summary HEAD^.. Documentation/trace/kprobetrace.txt | 48 ++-- arch/x86/include/asm/alternative.h | 7 +- arch/x86/include/asm/atomic.h | 299 +++++++++++++++++++- arch/x86/include/asm/atomic64_32.h | 160 ++++++++++ arch/x86/include/asm/atomic64_64.h | 224 ++++++++++++++ arch/x86/include/asm/atomic_32.h | 415 -------------------------- arch/x86/include/asm/atomic_64.h | 485 ------------------------------- arch/x86/include/asm/fixmap.h | 16 +- arch/x86/include/asm/irq_vectors.h | 47 ++- arch/x86/include/asm/nmi.h | 1 - arch/x86/include/asm/ptrace.h | 4 - arch/x86/include/asm/rwsem.h | 30 +- arch/x86/include/asm/stacktrace.h | 2 - arch/x86/include/asm/uaccess_64.h | 21 ++- arch/x86/include/asm/uv/bios.h | 7 +- arch/x86/include/asm/uv/uv_hub.h | 3 +- arch/x86/kernel/alternative.c | 4 +- arch/x86/kernel/apic/io_apic.c | 5 +- arch/x86/kernel/apic/x2apic_uv_x.c | 15 +- arch/x86/kernel/bios_uv.c | 20 +- arch/x86/kernel/cpu/intel_cacheinfo.c | 84 +++--- arch/x86/kernel/cpu/perf_event.c | 8 - arch/x86/kernel/cpu/perfctr-watchdog.c | 11 - arch/x86/kernel/dumpstack_32.c | 5 - arch/x86/kernel/dumpstack_64.c | 5 - arch/x86/kernel/ptrace.c | 24 -- arch/x86/kernel/x8664_ksyms_64.c | 3 +- arch/x86/lib/copy_user_64.S | 6 - arch/x86/lib/memcpy_64.S | 23 +- arch/x86/lib/memset_64.S | 18 +- arch/x86/mm/ioremap.c | 4 + drivers/char/nvram.c | 3 - include/linux/ftrace_event.h | 5 +- include/linux/irq.h | 2 +- include/linux/kernel.h | 5 +- include/linux/perf_event.h | 14 +- include/linux/plist.h | 4 +- include/linux/syscalls.h | 10 +- include/trace/ftrace.h | 173 +++--------- include/trace/syscall.h | 8 +- init/Kconfig | 13 - kernel/futex_compat.c | 6 +- kernel/perf_event.c | 31 +- kernel/sched.c | 14 +- kernel/trace/Makefile | 4 +- kernel/trace/trace.c | 144 +++++++--- kernel/trace/trace_events.c | 77 +++--- kernel/trace/trace_events_filter.c | 4 +- kernel/trace/trace_export.c | 87 +----- kernel/trace/trace_kprobe.c | 136 ++++------ kernel/trace/trace_syscalls.c | 111 ++++---- lib/hweight.c | 7 + scripts/recordmcount.pl | 45 ++-- tools/perf/Documentation/perf-probe.txt | 20 ++ tools/perf/Makefile | 3 +- tools/perf/builtin-annotate.c | 8 +- tools/perf/builtin-buildid-list.c | 25 +-- tools/perf/builtin-diff.c | 70 ++--- tools/perf/builtin-help.c | 5 +- tools/perf/builtin-kmem.c | 39 +-- tools/perf/builtin-probe.c | 78 ++++- tools/perf/builtin-record.c | 7 + tools/perf/builtin-report.c | 51 ++-- tools/perf/builtin-sched.c | 25 +-- tools/perf/builtin-stat.c | 106 ++++--- tools/perf/builtin-timechart.c | 25 +- tools/perf/builtin-trace.c | 20 +- tools/perf/perf.c | 2 +- tools/perf/util/data_map.c | 252 ---------------- tools/perf/util/debug.c | 1 + tools/perf/util/debugfs.c | 17 +- tools/perf/util/debugfs.h | 2 +- tools/perf/util/event.c | 76 ++++- tools/perf/util/event.h | 77 +----- tools/perf/util/header.c | 164 ++++++++--- tools/perf/util/header.h | 2 +- tools/perf/util/map.h | 73 +++++ tools/perf/util/parse-events.c | 48 ++-- tools/perf/util/probe-event.c | 105 +++++++- tools/perf/util/probe-event.h | 2 + tools/perf/util/probe-finder.c | 203 ++++++++++++- tools/perf/util/probe-finder.h | 33 ++ tools/perf/util/session.c | 303 +++++++++++++++++++ tools/perf/util/session.h | 35 ++- tools/perf/util/string.c | 65 ++++- tools/perf/util/symbol.c | 135 ++++++---- tools/perf/util/symbol.h | 20 +- tools/perf/util/trace-event-info.c | 62 ++--- tools/perf/util/util.c | 69 +++++ tools/perf/util/util.h | 3 + tools/perf/util/values.c | 1 + 91 files changed, 2752 insertions(+), 2387 deletions(-) create mode 100644 arch/x86/include/asm/atomic64_32.h create mode 100644 arch/x86/include/asm/atomic64_64.h delete mode 100644 arch/x86/include/asm/atomic_32.h delete mode 100644 arch/x86/include/asm/atomic_64.h delete mode 100644 tools/perf/util/data_map.c create mode 100644 tools/perf/util/map.h create mode 100644 tools/perf/util/util.c Merging edac-amd/for-next $ git merge edac-amd/for-next Already up-to-date. Merging oprofile/for-next $ git merge oprofile/for-next Already up-to-date. Merging percpu/for-next $ git merge percpu/for-next Auto-merging arch/sparc/kernel/nmi.c Auto-merging include/linux/mm.h Auto-merging include/linux/mmzone.h Auto-merging kernel/module.c Auto-merging kernel/trace/ring_buffer.c Auto-merging kernel/trace/trace.c Auto-merging mm/page_alloc.c Auto-merging mm/percpu.c Merge made by recursive. arch/alpha/include/asm/local.h | 17 --- arch/blackfin/mach-common/entry.S | 4 +- arch/cris/arch-v10/kernel/entry.S | 2 +- arch/cris/arch-v32/mm/mmu.S | 2 +- arch/ia64/include/asm/percpu.h | 4 +- arch/ia64/kernel/ia64_ksyms.c | 4 +- arch/ia64/mm/discontig.c | 2 +- arch/m32r/include/asm/local.h | 25 ---- arch/microblaze/include/asm/entry.h | 2 +- arch/mips/include/asm/local.h | 25 ---- arch/parisc/lib/fixup.S | 8 +- arch/powerpc/include/asm/local.h | 25 ---- arch/sparc/kernel/nmi.c | 7 +- arch/sparc/kernel/rtrap_64.S | 8 +- arch/x86/include/asm/local.h | 37 ------ arch/x86/include/asm/percpu.h | 119 +++++++++++++++------ arch/x86/include/asm/system.h | 8 +- arch/x86/kernel/apic/nmi.c | 6 +- arch/x86/kernel/head_32.S | 6 +- arch/x86/kernel/vmlinux.lds.S | 4 +- arch/x86/xen/xen-asm_32.S | 4 +- include/asm-generic/local.h | 19 --- include/asm-generic/percpu.h | 18 ++- include/linux/compiler.h | 4 +- include/linux/mm.h | 4 - include/linux/mmzone.h | 12 +-- include/linux/module.h | 37 +++---- include/linux/percpu-defs.h | 40 ++++--- include/linux/percpu.h | 44 +++++--- include/linux/vmstat.h | 8 +- kernel/module.c | 29 +++--- kernel/rcutorture.c | 8 +- kernel/trace/ring_buffer.c | 1 + kernel/trace/ring_buffer_benchmark.c | 1 + kernel/trace/trace.c | 6 +- kernel/trace/trace_functions_graph.c | 4 +- mm/page_alloc.c | 202 ++++++++++++---------------------- mm/percpu.c | 18 ++-- mm/vmstat.c | 15 ++- 39 files changed, 322 insertions(+), 467 deletions(-) $ git am -3 ../patches/0001-slab-update-for-percpu-API-change.patch Applying: slab: update for percpu API change $ git reset HEAD^ Unstaged changes after reset: M mm/slub.c $ git add . $ git commit -v -a --amend [master b30cb8b] Merge remote branch 'percpu/for-next' Merging workqueues/for-next $ git merge workqueues/for-next Already up-to-date. Merging sfi/sfi-test $ git merge sfi/sfi-test Already up-to-date. Merging asm-generic/next $ git merge asm-generic/next Already up-to-date. Merging hwpoison/hwpoison $ git merge hwpoison/hwpoison Already up-to-date. Merging sysctl/master $ git merge sysctl/master Already up-to-date. Merging quilt/driver-core $ git merge quilt/driver-core Recorded preimage for 'drivers/base/memory.c' Auto-merging arch/s390/kernel/smp.c Auto-merging drivers/base/memory.c CONFLICT (content): Merge conflict in drivers/base/memory.c Auto-merging fs/gfs2/sys.c Auto-merging include/linux/device.h Auto-merging kernel/perf_event.c Auto-merging kernel/sched.c Auto-merging mm/slub.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/base/memory.c'. [master f005ba1] Merge branch 'quilt/driver-core' $ git diff -M --stat --summary HEAD^.. Documentation/HOWTO | 113 +++++++++++---------------------- arch/mips/txx9/generic/7segled.c | 5 +- arch/s390/kernel/smp.c | 8 ++- arch/s390/kernel/time.c | 49 +++++++++++---- drivers/base/Kconfig | 55 +++++++++++----- drivers/base/bus.c | 2 +- drivers/base/class.c | 14 ++++- drivers/base/core.c | 13 +--- drivers/base/cpu.c | 101 +++++++++++++---------------- drivers/base/devtmpfs.c | 13 ++++ drivers/base/firmware_class.c | 9 ++- drivers/base/memory.c | 28 ++++----- drivers/base/node.c | 81 +++++++++--------------- drivers/base/platform.c | 58 +++++++++++++++++ drivers/base/sys.c | 13 +++- drivers/block/osdblk.c | 12 +++- drivers/block/pktcdvd.c | 12 +++- drivers/cpuidle/sysfs.c | 4 + drivers/gpio/gpiolib.c | 8 ++- drivers/gpu/drm/drm_sysfs.c | 18 +++--- drivers/infiniband/core/ucm.c | 13 ++--- drivers/infiniband/core/user_mad.c | 9 +-- drivers/infiniband/core/uverbs_main.c | 9 +-- drivers/misc/phantom.c | 13 +--- drivers/mtd/ubi/build.c | 3 +- drivers/net/bonding/bond_sysfs.c | 5 +- drivers/platform/x86/msi-laptop.c | 72 ++++++++++++++++++++- drivers/staging/asus_oled/asus_oled.c | 13 +--- drivers/uwb/driver.c | 5 +- fs/gfs2/sys.c | 2 +- fs/sysfs/dir.c | 82 +++++++++++++++++------- fs/sysfs/file.c | 20 ++++++ include/linux/device.h | 23 ++++++- include/linux/kobject.h | 10 ++-- include/linux/platform_device.h | 7 ++- include/linux/sysdev.h | 21 ++++++- include/linux/sysfs.h | 14 ++++ kernel/params.c | 2 +- kernel/perf_event.c | 13 +++- kernel/sched.c | 4 + lib/kobject.c | 4 +- lib/kobject_uevent.c | 2 +- mm/slub.c | 2 +- net/bluetooth/l2cap.c | 4 +- net/bluetooth/rfcomm/core.c | 4 +- net/bluetooth/rfcomm/sock.c | 4 +- net/bluetooth/sco.c | 4 +- samples/kobject/kobject-example.c | 4 +- samples/kobject/kset-example.c | 4 +- 49 files changed, 626 insertions(+), 362 deletions(-) Merging quilt/tty $ git merge quilt/tty Auto-merging drivers/serial/8250.c Auto-merging drivers/serial/Kconfig Auto-merging include/linux/pci_ids.h Merge made by recursive. drivers/char/cyclades.c | 16 +- drivers/char/hvc_console.c | 2 +- drivers/char/ip2/ip2main.c | 13 +- drivers/char/isicom.c | 54 ++-- drivers/char/moxa.c | 20 +- drivers/char/mxser.c | 3 +- drivers/char/synclink.c | 4 +- drivers/char/synclink_gt.c | 186 ++++++----- drivers/parport/parport_pc.c | 6 + drivers/serial/68328serial.c | 8 +- drivers/serial/8250.c | 28 +- drivers/serial/8250_pci.c | 31 ++- drivers/serial/Kconfig | 52 ++-- drivers/serial/atmel_serial.c | 22 ++ drivers/serial/bfin_sport_uart.c | 701 +++++++++++++++++++++++++------------- drivers/serial/bfin_sport_uart.h | 38 +-- drivers/serial/icom.c | 4 +- drivers/serial/imx.c | 6 +- drivers/serial/msm_serial.c | 6 +- drivers/serial/timbuart.c | 7 +- drivers/usb/serial/keyspan_pda.c | 7 + include/linux/pci_ids.h | 3 + 22 files changed, 773 insertions(+), 444 deletions(-) Merging quilt/usb $ git merge quilt/usb Merge made by recursive. Documentation/ABI/testing/sysfs-bus-usb | 11 + Documentation/networking/00-INDEX | 2 + Documentation/networking/cxacru-cf.py | 48 + Documentation/networking/cxacru.txt | 16 + Documentation/usb/error-codes.txt | 6 +- Documentation/usb/power-management.txt | 235 ++-- arch/arm/configs/rx51_defconfig | 11 +- arch/arm/mach-mx2/devices.c | 80 +- arch/arm/mach-mx2/devices.h | 1 + arch/arm/plat-mxc/include/mach/mx21-usbhost.h | 38 + drivers/hid/usbhid/hiddev.c | 7 +- drivers/media/video/dabusb.c | 8 +- drivers/staging/usbip/vhci_sysfs.c | 2 +- drivers/usb/Kconfig | 1 + drivers/usb/Makefile | 1 + drivers/usb/atm/cxacru.c | 192 ++- drivers/usb/atm/usbatm.c | 3 +- drivers/usb/atm/usbatm.h | 15 + drivers/usb/c67x00/c67x00-drv.c | 8 +- drivers/usb/class/cdc-acm.c | 70 +- drivers/usb/class/cdc-acm.h | 2 +- drivers/usb/class/cdc-wdm.c | 2 +- drivers/usb/class/usblp.c | 22 +- drivers/usb/class/usbtmc.c | 2 +- drivers/usb/core/Kconfig | 4 +- drivers/usb/core/devices.c | 32 +- drivers/usb/core/devio.c | 76 +- drivers/usb/core/driver.c | 914 ++++++------- drivers/usb/core/file.c | 2 - drivers/usb/core/hcd.c | 25 +- drivers/usb/core/hcd.h | 13 +- drivers/usb/core/hub.c | 120 +- drivers/usb/core/message.c | 1 - drivers/usb/core/quirks.c | 18 +- drivers/usb/core/sysfs.c | 85 +- drivers/usb/core/urb.c | 13 +- drivers/usb/core/usb.c | 38 +- drivers/usb/core/usb.h | 43 +- drivers/usb/gadget/Kconfig | 10 + drivers/usb/gadget/Makefile | 2 + drivers/usb/gadget/at91_udc.c | 10 +- drivers/usb/gadget/atmel_usba_udc.c | 4 +- drivers/usb/gadget/epautoconf.c | 19 + drivers/usb/gadget/ether.c | 2 +- drivers/usb/gadget/fsl_qe_udc.c | 2 +- drivers/usb/gadget/goku_udc.c | 2 +- drivers/usb/gadget/nokia.c | 259 ++++ drivers/usb/gadget/pxa27x_udc.c | 21 +- drivers/usb/host/Kconfig | 11 + drivers/usb/host/Makefile | 2 + drivers/usb/host/ehci-atmel.c | 2 +- drivers/usb/host/ehci-au1xxx.c | 6 +- drivers/usb/host/ehci-fsl.c | 97 ++- drivers/usb/host/ehci-mxc.c | 18 +- drivers/usb/host/ehci-omap.c | 37 + drivers/usb/host/ehci-orion.c | 8 +- drivers/usb/host/ehci-ppc-of.c | 2 +- drivers/usb/host/ehci-sched.c | 12 +- drivers/usb/host/ehci-xilinx-of.c | 2 +- drivers/usb/host/fhci-hcd.c | 4 +- drivers/usb/host/imx21-dbg.c | 527 ++++++++ drivers/usb/host/imx21-hcd.c | 1789 +++++++++++++++++++++++++ drivers/usb/host/imx21-hcd.h | 436 ++++++ drivers/usb/host/isp1362-hcd.c | 2 +- drivers/usb/host/isp1760-if.c | 2 +- drivers/usb/host/ohci-ppc-of.c | 2 +- drivers/usb/host/sl811-hcd.c | 5 +- drivers/usb/host/uhci-hcd.c | 1 + drivers/usb/host/xhci-dbg.c | 19 + drivers/usb/host/xhci-hcd.c | 150 ++- drivers/usb/host/xhci-hub.c | 65 +- drivers/usb/host/xhci-mem.c | 47 +- drivers/usb/host/xhci-pci.c | 1 + drivers/usb/host/xhci-ring.c | 41 +- drivers/usb/host/xhci.h | 11 +- drivers/usb/image/mdc800.c | 2 +- drivers/usb/image/microtek.c | 4 +- drivers/usb/misc/adutux.c | 2 +- drivers/usb/misc/appledisplay.c | 2 +- drivers/usb/misc/berry_charge.c | 2 +- drivers/usb/misc/cypress_cy7c63.c | 2 +- drivers/usb/misc/cytherm.c | 2 +- drivers/usb/misc/emi26.c | 2 +- drivers/usb/misc/emi62.c | 2 +- drivers/usb/misc/ftdi-elan.c | 11 +- drivers/usb/misc/idmouse.c | 2 +- drivers/usb/misc/iowarrior.c | 6 +- drivers/usb/misc/isight_firmware.c | 4 +- drivers/usb/misc/ldusb.c | 2 +- drivers/usb/misc/legousbtower.c | 2 +- drivers/usb/misc/rio500.c | 11 +- drivers/usb/misc/sisusbvga/sisusb.c | 16 +- drivers/usb/misc/trancevibrator.c | 2 +- drivers/usb/misc/usblcd.c | 7 +- drivers/usb/misc/usbled.c | 2 +- drivers/usb/misc/usbsevseg.c | 2 +- drivers/usb/misc/usbtest.c | 6 +- drivers/usb/misc/uss720.c | 2 +- drivers/usb/misc/vstusb.c | 2 +- drivers/usb/mon/mon_bin.c | 7 +- drivers/usb/mon/mon_text.c | 4 +- drivers/usb/musb/blackfin.c | 28 +- drivers/usb/musb/cppi_dma.c | 33 +- drivers/usb/musb/musb_core.c | 364 +++--- drivers/usb/musb/musb_core.h | 17 +- drivers/usb/musb/musb_host.c | 24 + drivers/usb/musb/musb_regs.h | 5 + drivers/usb/musb/musbhsdma.c | 25 +- drivers/usb/musb/musbhsdma.h | 17 + drivers/usb/musb/tusb6010_omap.c | 2 +- drivers/usb/otg/twl4030-usb.c | 45 +- drivers/usb/serial/aircable.c | 2 +- drivers/usb/serial/ark3116.c | 2 +- drivers/usb/serial/belkin_sa.c | 2 +- drivers/usb/serial/ch341.c | 27 +- drivers/usb/serial/cp210x.c | 2 +- drivers/usb/serial/cyberjack.c | 2 +- drivers/usb/serial/cypress_m8.c | 65 +- drivers/usb/serial/digi_acceleport.c | 6 +- drivers/usb/serial/empeg.c | 2 +- drivers/usb/serial/ftdi_sio.c | 151 +-- drivers/usb/serial/funsoft.c | 2 +- drivers/usb/serial/garmin_gps.c | 2 +- drivers/usb/serial/generic.c | 7 +- drivers/usb/serial/hp4x.c | 2 +- drivers/usb/serial/io_edgeport.c | 35 +- drivers/usb/serial/io_tables.h | 10 +- drivers/usb/serial/io_ti.c | 72 +- drivers/usb/serial/ipw.c | 2 +- drivers/usb/serial/ir-usb.c | 2 +- drivers/usb/serial/iuu_phoenix.c | 2 +- drivers/usb/serial/keyspan.h | 10 +- drivers/usb/serial/keyspan_pda.c | 53 +- drivers/usb/serial/kl5kusb105.c | 65 +- drivers/usb/serial/kobil_sct.c | 24 +- drivers/usb/serial/mct_u232.c | 59 +- drivers/usb/serial/mct_u232.h | 2 + drivers/usb/serial/mos7720.c | 36 +- drivers/usb/serial/mos7840.c | 26 +- drivers/usb/serial/moto_modem.c | 2 +- drivers/usb/serial/navman.c | 2 +- drivers/usb/serial/omninet.c | 2 +- drivers/usb/serial/opticon.c | 2 +- drivers/usb/serial/option.c | 55 +- drivers/usb/serial/oti6858.c | 15 +- drivers/usb/serial/pl2303.c | 2 +- drivers/usb/serial/qcserial.c | 2 +- drivers/usb/serial/siemens_mpi.c | 2 +- drivers/usb/serial/sierra.c | 2 +- drivers/usb/serial/spcp8x5.c | 2 +- drivers/usb/serial/symbolserial.c | 2 +- drivers/usb/serial/usb-serial.c | 2 +- drivers/usb/serial/usb_debug.c | 2 +- drivers/usb/serial/visor.c | 26 +- drivers/usb/serial/whiteheat.c | 6 +- drivers/usb/storage/transport.c | 6 + drivers/usb/storage/unusual_devs.h | 88 ++- drivers/usb/usb-skeleton.c | 2 +- drivers/usb/wusbcore/cbaf.c | 2 +- drivers/usb/wusbcore/devconnect.c | 2 +- drivers/usb/wusbcore/mmc.c | 2 +- include/linux/usb.h | 39 +- include/linux/usb/ch9.h | 2 +- include/linux/usb/musb.h | 3 + include/linux/usb/otg.h | 25 + include/linux/usb/quirks.h | 3 + 166 files changed, 5669 insertions(+), 1768 deletions(-) create mode 100644 Documentation/networking/cxacru-cf.py create mode 100644 arch/arm/plat-mxc/include/mach/mx21-usbhost.h create mode 100644 drivers/usb/gadget/nokia.c create mode 100644 drivers/usb/host/imx21-dbg.c create mode 100644 drivers/usb/host/imx21-hcd.c create mode 100644 drivers/usb/host/imx21-hcd.h Merging quilt/staging $ git merge quilt/staging Removing drivers/staging/altpciechdma/Kconfig Removing drivers/staging/altpciechdma/Makefile Removing drivers/staging/altpciechdma/TODO Removing drivers/staging/altpciechdma/altpciechdma.c Removing drivers/staging/b3dfg/Kconfig Removing drivers/staging/b3dfg/Makefile Removing drivers/staging/b3dfg/TODO Removing drivers/staging/b3dfg/b3dfg.c Removing drivers/staging/batman-adv/compat.h Removing drivers/staging/batman-adv/log.c Removing drivers/staging/p9auth/Kconfig Removing drivers/staging/p9auth/Makefile Removing drivers/staging/p9auth/p9auth.c Auto-merging drivers/staging/rtl8187se/ieee80211/ieee80211.h Auto-merging drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/sm7xx/smtc2d.c left in tree. CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.h deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/sm7xx/smtc2d.h left in tree. Auto-merging drivers/staging/sm7xx/smtcfb.c Automatic merge failed; fix conflicts and then commit the result. $ git rm -f drivers/staging/sm7xx/smtc2d.c drivers/staging/sm7xx/smtc2d.h drivers/staging/sm7xx/smtc2d.c: needs merge drivers/staging/sm7xx/smtc2d.h: needs merge rm 'drivers/staging/sm7xx/smtc2d.c' rm 'drivers/staging/sm7xx/smtc2d.h' $ git commit -v -a [master de6f326] Merge branch 'quilt/staging' $ git diff -M --stat --summary HEAD^.. drivers/staging/Kconfig | 10 +- drivers/staging/Makefile | 5 +- drivers/staging/altpciechdma/Kconfig | 10 - drivers/staging/altpciechdma/Makefile | 2 - drivers/staging/altpciechdma/TODO | 15 - drivers/staging/altpciechdma/altpciechdma.c | 1182 ---------- drivers/staging/asus_oled/asus_oled.c | 21 +- drivers/staging/b3dfg/Kconfig | 10 - drivers/staging/b3dfg/Makefile | 1 - drivers/staging/b3dfg/TODO | 4 - drivers/staging/b3dfg/b3dfg.c | 1100 --------- drivers/staging/batman-adv/Kconfig | 4 +- drivers/staging/batman-adv/Makefile | 2 +- drivers/staging/batman-adv/README | 84 +- drivers/staging/batman-adv/TODO | 24 - drivers/staging/batman-adv/aggregation.c | 13 +- drivers/staging/batman-adv/bitarray.c | 15 +- drivers/staging/batman-adv/compat.h | 75 - drivers/staging/batman-adv/device.c | 40 +- drivers/staging/batman-adv/hard-interface.c | 200 ++- drivers/staging/batman-adv/hard-interface.h | 4 + drivers/staging/batman-adv/hash.c | 23 +- drivers/staging/batman-adv/hash.h | 5 + drivers/staging/batman-adv/log.c | 179 -- drivers/staging/batman-adv/main.c | 53 +- drivers/staging/batman-adv/main.h | 45 +- drivers/staging/batman-adv/originator.c | 252 ++ drivers/staging/batman-adv/{log.h => originator.h} | 19 +- drivers/staging/batman-adv/packet.h | 2 +- drivers/staging/batman-adv/proc.c | 484 +---- drivers/staging/batman-adv/proc.h | 13 +- drivers/staging/batman-adv/routing.c | 1319 ++++++------ drivers/staging/batman-adv/routing.h | 20 +- drivers/staging/batman-adv/send.c | 169 +- drivers/staging/batman-adv/send.h | 5 +- drivers/staging/batman-adv/soft-interface.c | 96 +- drivers/staging/batman-adv/soft-interface.h | 3 +- drivers/staging/batman-adv/translation-table.c | 94 +- drivers/staging/batman-adv/translation-table.h | 1 + drivers/staging/batman-adv/types.h | 14 +- drivers/staging/batman-adv/vis.c | 167 +- drivers/staging/batman-adv/vis.h | 11 +- .../comedi/drivers/addi-data/APCI1710_Chrono.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 2 +- .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Pwm.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Ssi.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Tor.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Ttl.c | 2 +- .../comedi/drivers/addi-data/addi_amcc_S5920.c | 2 +- .../staging/comedi/drivers/addi-data/addi_common.c | 2 +- .../staging/comedi/drivers/addi-data/addi_eeprom.c | 2 +- .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci035.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1032.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1564.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci2016.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci2032.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci2200.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3120.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 6 +- drivers/staging/comedi/drivers/adl_pci9118.c | 6 +- drivers/staging/comedi/drivers/adq12b.c | 48 +- drivers/staging/comedi/drivers/adv_pci1710.c | 6 +- drivers/staging/comedi/drivers/c6xdigio.c | 57 +- drivers/staging/comedi/drivers/comedi_bond.c | 2 +- drivers/staging/comedi/drivers/dt9812.c | 2 +- drivers/staging/comedi/drivers/jr3_pci.c | 2 + drivers/staging/comedi/drivers/mpc624.c | 2 +- drivers/staging/comedi/drivers/ni_labpc.c | 2 +- drivers/staging/comedi/drivers/pcmad.c | 21 +- drivers/staging/comedi/drivers/pcmmio.c | 2 +- drivers/staging/comedi/drivers/rti800.c | 41 +- drivers/staging/comedi/drivers/s626.c | 2 +- drivers/staging/comedi/drivers/usbdux.c | 4 +- drivers/staging/comedi/drivers/usbduxfast.c | 4 +- drivers/staging/comedi/drivers/vmk80xx.c | 2 +- drivers/staging/crystalhd/Kconfig | 6 + drivers/staging/crystalhd/Makefile | 6 + drivers/staging/crystalhd/TODO | 16 + drivers/staging/crystalhd/bc_dts_defs.h | 498 ++++ drivers/staging/crystalhd/bc_dts_glob_lnx.h | 299 +++ drivers/staging/crystalhd/bc_dts_types.h | 121 + drivers/staging/crystalhd/bcm_70012_regs.h | 757 +++++++ drivers/staging/crystalhd/crystalhd_cmds.c | 1058 +++++++++ drivers/staging/crystalhd/crystalhd_cmds.h | 88 + drivers/staging/crystalhd/crystalhd_fw_if.h | 369 +++ drivers/staging/crystalhd/crystalhd_hw.c | 2395 ++++++++++++++++++++ drivers/staging/crystalhd/crystalhd_hw.h | 398 ++++ drivers/staging/crystalhd/crystalhd_lnx.c | 780 +++++++ drivers/staging/crystalhd/crystalhd_lnx.h | 95 + drivers/staging/crystalhd/crystalhd_misc.c | 1029 +++++++++ drivers/staging/crystalhd/crystalhd_misc.h | 229 ++ drivers/staging/cx25821/cx25821-audups11.c | 3 +- drivers/staging/cx25821/cx25821-video.c | 5 +- drivers/staging/dream/camera/Kconfig | 2 +- drivers/staging/dream/camera/Makefile | 1 + drivers/staging/dream/camera/msm_camera.c | 4 +- drivers/staging/dream/camera/msm_vfe7x.c | 3 +- drivers/staging/dream/camera/s5k3e2fx.c | 10 +- drivers/staging/dream/include/linux/android_pmem.h | 80 + drivers/staging/dream/include/linux/gpio_event.h | 154 ++ drivers/staging/dream/include/linux/msm_adsp.h | 84 + drivers/staging/dream/include/linux/msm_audio.h | 115 + .../staging/dream/include/linux/msm_rpcrouter.h | 47 + drivers/staging/dream/include/linux/wakelock.h | 91 + drivers/staging/dream/include/mach/camera.h | 279 +++ drivers/staging/dream/include/mach/msm_adsp.h | 112 + drivers/staging/dream/include/mach/msm_rpcrouter.h | 179 ++ drivers/staging/dream/include/mach/msm_smd.h | 107 + .../dream/include/mach/qdsp5/qdsp5audplaycmdi.h | 94 + .../dream/include/mach/qdsp5/qdsp5audplaymsg.h | 70 + .../dream/include/mach/qdsp5/qdsp5audppcmdi.h | 914 ++++++++ .../dream/include/mach/qdsp5/qdsp5audppmsg.h | 318 +++ .../dream/include/mach/qdsp5/qdsp5audpreproccmdi.h | 256 +++ .../dream/include/mach/qdsp5/qdsp5audpreprocmsg.h | 85 + .../dream/include/mach/qdsp5/qdsp5audreccmdi.h | 176 ++ .../dream/include/mach/qdsp5/qdsp5audrecmsg.h | 127 ++ .../dream/include/mach/qdsp5/qdsp5jpegcmdi.h | 376 +++ .../dream/include/mach/qdsp5/qdsp5jpegmsg.h | 177 ++ .../dream/include/mach/qdsp5/qdsp5lpmcmdi.h | 82 + .../staging/dream/include/mach/qdsp5/qdsp5lpmmsg.h | 80 + .../dream/include/mach/qdsp5/qdsp5vdeccmdi.h | 235 ++ .../dream/include/mach/qdsp5/qdsp5vdecmsg.h | 107 + .../dream/include/mach/qdsp5/qdsp5venccmdi.h | 212 ++ .../dream/include/mach/qdsp5/qdsp5vfecmdi.h | 910 ++++++++ .../staging/dream/include/mach/qdsp5/qdsp5vfemsg.h | 290 +++ drivers/staging/dream/include/media/msm_camera.h | 388 ++++ drivers/staging/dream/qdsp5/Makefile | 1 + drivers/staging/dream/smd/Makefile | 1 + drivers/staging/dream/smd/smd_rpcrouter.c | 2 - drivers/staging/dt3155/Kconfig | 4 + drivers/staging/dt3155/Makefile | 6 + drivers/staging/dt3155/TODO | 10 + drivers/staging/dt3155/allocator.README | 98 + drivers/staging/dt3155/allocator.c | 295 +++ drivers/staging/dt3155/allocator.h | 28 + drivers/staging/dt3155/dt3155.h | 171 ++ drivers/staging/dt3155/dt3155.sysvinit | 60 + drivers/staging/dt3155/dt3155_drv.c | 1095 +++++++++ drivers/staging/dt3155/dt3155_drv.h | 45 + drivers/staging/dt3155/dt3155_io.c | 236 ++ drivers/staging/dt3155/dt3155_io.h | 397 ++++ drivers/staging/dt3155/dt3155_isr.c | 516 +++++ drivers/staging/dt3155/dt3155_isr.h | 77 + drivers/staging/et131x/et131x_netdev.c | 8 +- drivers/staging/frontier/alphatrack.c | 2 +- drivers/staging/frontier/tranzport.c | 2 +- drivers/staging/go7007/go7007-driver.c | 2 + drivers/staging/go7007/go7007-usb.c | 4 +- drivers/staging/go7007/s2250-board.c | 2 +- drivers/staging/go7007/s2250-loader.c | 2 +- drivers/staging/go7007/saa7134-go7007.c | 1 + drivers/staging/go7007/wis-ov7640.c | 2 +- drivers/staging/go7007/wis-saa7113.c | 2 +- drivers/staging/go7007/wis-saa7115.c | 2 +- drivers/staging/go7007/wis-sony-tuner.c | 2 +- drivers/staging/go7007/wis-tw2804.c | 2 +- drivers/staging/go7007/wis-tw9903.c | 2 +- drivers/staging/go7007/wis-uda1342.c | 2 +- drivers/staging/hv/NetVscApi.h | 4 +- drivers/staging/hv/RndisFilter.c | 10 +- drivers/staging/hv/StorVsc.c | 3 +- drivers/staging/hv/StorVscApi.h | 5 +- drivers/staging/hv/netvsc_drv.c | 14 +- drivers/staging/hv/storvsc_drv.c | 215 +-- drivers/staging/iio/industrialio-core.c | 21 +- drivers/staging/iio/ring_sw.c | 1 - drivers/staging/line6/driver.c | 2 +- drivers/staging/mimio/mimio.c | 124 +- drivers/staging/otus/80211core/cagg.c | 18 +- drivers/staging/otus/80211core/ccmd.c | 2 +- drivers/staging/otus/80211core/cfunc.c | 2 - drivers/staging/otus/80211core/cmm.c | 4 - drivers/staging/otus/80211core/cmmsta.c | 7 +- drivers/staging/otus/80211core/cpsmgr.c | 2 - drivers/staging/otus/80211core/cscanmgr.c | 2 - drivers/staging/otus/80211core/ctkip.c | 5 +- drivers/staging/otus/80211core/ctxrx.c | 8 +- drivers/staging/otus/80211core/ledmgr.c | 1 - drivers/staging/otus/80211core/pub_zfi.h | 1 - drivers/staging/otus/Kconfig | 2 + drivers/staging/otus/apdbg.c | 53 +- drivers/staging/otus/hal/hpmain.c | 4 - drivers/staging/otus/hal/hpreg.c | 133 -- drivers/staging/otus/hal/hprw.c | 1 - drivers/staging/otus/ioctl.c | 10 +- drivers/staging/otus/usbdrv.c | 4 +- drivers/staging/otus/wrap_pkt.c | 10 +- drivers/staging/otus/zdusb.c | 2 +- drivers/staging/p9auth/Kconfig | 9 - drivers/staging/p9auth/Makefile | 1 - drivers/staging/p9auth/p9auth.c | 408 ---- drivers/staging/phison/phison.c | 2 +- drivers/staging/pohmelfs/inode.c | 5 +- drivers/staging/quatech_usb2/quatech_usb2.c | 2 +- drivers/staging/ramzswap/Kconfig | 2 +- drivers/staging/ramzswap/ramzswap.txt | 6 +- drivers/staging/ramzswap/ramzswap_drv.c | 26 +- drivers/staging/ramzswap/ramzswap_drv.h | 6 +- drivers/staging/ramzswap/ramzswap_ioctl.h | 4 +- drivers/staging/ramzswap/xvmalloc.c | 2 +- drivers/staging/ramzswap/xvmalloc_int.h | 2 +- drivers/staging/rar/rar_driver.c | 134 +- drivers/staging/rar/rar_driver.h | 68 +- drivers/staging/rt2860/common/rtmp_mcu.c | 2 +- drivers/staging/rt2860/rt_linux.c | 10 +- drivers/staging/rt2860/rt_linux.h | 4 +- drivers/staging/rt2860/sta/connect.c | 4 +- drivers/staging/rt2860/usb_main_dev.c | 6 +- drivers/staging/rtl8187se/ieee80211/ieee80211.h | 4 - .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 21 +- .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 20 +- drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 48 +- .../rtl8187se/ieee80211/ieee80211_softmac.c | 2 +- drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 6 +- drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 6 +- drivers/staging/rtl8192e/Makefile | 9 +- drivers/staging/rtl8192e/dot11d.h | 138 +- drivers/staging/rtl8192e/ieee80211.h | 3 - drivers/staging/rtl8192e/ieee80211/ieee80211.h | 159 ++- .../staging/rtl8192e/ieee80211/ieee80211_crypt.c | 2 +- .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 37 +- .../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 29 +- drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 148 +- .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 246 ++- .../rtl8192e/ieee80211/ieee80211_softmac_wx.c | 26 +- drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 80 +- drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 6 +- .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c | 6 +- drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h | 4 +- .../staging/rtl8192e/ieee80211/rtl819x_HTProc.c | 65 +- .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 6 +- drivers/staging/rtl8192e/r8180_93cx6.h | 33 +- drivers/staging/rtl8192e/r8190_rtl8256.c | 360 ++-- drivers/staging/rtl8192e/r8190_rtl8256.h | 49 +- drivers/staging/rtl8192e/r8192E.h | 23 +- drivers/staging/rtl8192e/r8192E_core.c | 773 ++++++- drivers/staging/rtl8192e/r8192E_dm.c | 40 +- drivers/staging/rtl8192e/r8192E_hw.h | 8 + drivers/staging/rtl8192e/r8192E_wx.c | 212 ++- drivers/staging/rtl8192e/r8192E_wx.h | 1 - drivers/staging/rtl8192e/r819xE_cmdpkt.c | 2 +- drivers/staging/rtl8192e/r819xE_firmware.c | 85 +- drivers/staging/rtl8192e/r819xE_phy.c | 2 +- drivers/staging/rtl8192e/r819xE_phy.h | 194 +- drivers/staging/rtl8192e/r819xE_phyreg.h | 1117 +++++----- drivers/staging/rtl8192su/Kconfig | 3 +- drivers/staging/rtl8192su/ieee80211/ieee80211.h | 4 - .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 21 +- .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 20 +- .../staging/rtl8192su/ieee80211/ieee80211_module.c | 2 +- drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 48 +- .../rtl8192su/ieee80211/ieee80211_softmac.c | 2 +- drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 4 +- drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 6 +- .../staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 21 +- .../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 2 +- .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 6 +- drivers/staging/rtl8192su/r8192S_firmware.c | 1 + drivers/staging/rtl8192su/r8192U_core.c | 147 +- drivers/staging/rtl8192su/r8192U_dm.c | 2 +- drivers/staging/rtl8192u/Kconfig | 3 +- drivers/staging/rtl8192u/Makefile | 2 +- drivers/staging/rtl8192u/ieee80211.h | 3 - drivers/staging/rtl8192u/ieee80211/ieee80211.h | 3 - .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 21 +- .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 20 +- .../staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 48 +- .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +- drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 4 +- drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 6 +- .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 6 +- .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 4 +- .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 6 +- drivers/staging/rtl8192u/r8192U_core.c | 8 +- drivers/staging/sep/sep_driver.c | 20 +- drivers/staging/serqt_usb2/serqt_usb2.c | 2 +- drivers/staging/slicoss/slic.h | 9 - drivers/staging/slicoss/slicoss.c | 110 +- drivers/staging/sm7xx/Kconfig | 7 - drivers/staging/sm7xx/TODO | 1 + drivers/staging/sm7xx/smtc2d.c | 979 -------- drivers/staging/sm7xx/smtc2d.h | 530 ----- drivers/staging/sm7xx/smtcfb.c | 131 +- drivers/staging/udlfb/udlfb.c | 652 ++++-- drivers/staging/udlfb/udlfb.h | 156 +-- drivers/staging/vme/bridges/Kconfig | 1 + drivers/staging/vme/bridges/vme_ca91cx42.c | 48 +- drivers/staging/vme/bridges/vme_tsi148.c | 47 +- drivers/staging/vme/devices/vme_user.c | 4 +- drivers/staging/vme/vme.c | 222 +- drivers/staging/vme/vme.h | 23 +- drivers/staging/vme/vme_bridge.h | 40 +- drivers/staging/vt6655/device_main.c | 5 +- drivers/staging/vt6655/iwctl.c | 2 +- drivers/staging/winbond/core.h | 2 +- drivers/staging/winbond/localpara.h | 34 +- drivers/staging/winbond/mds_f.h | 3 - drivers/staging/winbond/mds_s.h | 28 - drivers/staging/winbond/mlme_s.h | 8 - drivers/staging/winbond/mto.h | 5 - drivers/staging/winbond/reg.c | 10 +- drivers/staging/winbond/scan_s.h | 1 - drivers/staging/winbond/sme_api.h | 4 +- drivers/staging/winbond/wb35reg_f.h | 2 +- drivers/staging/winbond/wbusb.c | 10 +- drivers/staging/wlags49_h2/wl_main.c | 2 +- drivers/staging/wlags49_h2/wl_netdev.c | 2 +- drivers/staging/wlags49_h2/wl_pci.c | 1 - drivers/staging/wlags49_h2/wl_profile.c | 76 +- drivers/staging/wlags49_h2/wl_util.c | 49 - drivers/staging/wlags49_h2/wl_util.h | 2 - drivers/staging/wlan-ng/Kconfig | 4 +- drivers/staging/wlan-ng/hfa384x_usb.c | 2 +- drivers/staging/wlan-ng/p80211wext.c | 15 + drivers/staging/wlan-ng/prism2fw.c | 1 + 324 files changed, 23070 insertions(+), 9398 deletions(-) delete mode 100644 drivers/staging/altpciechdma/Kconfig delete mode 100644 drivers/staging/altpciechdma/Makefile delete mode 100644 drivers/staging/altpciechdma/TODO delete mode 100644 drivers/staging/altpciechdma/altpciechdma.c delete mode 100644 drivers/staging/b3dfg/Kconfig delete mode 100644 drivers/staging/b3dfg/Makefile delete mode 100644 drivers/staging/b3dfg/TODO delete mode 100644 drivers/staging/b3dfg/b3dfg.c delete mode 100644 drivers/staging/batman-adv/compat.h delete mode 100644 drivers/staging/batman-adv/log.c create mode 100644 drivers/staging/batman-adv/originator.c rename drivers/staging/batman-adv/{log.h => originator.h} (61%) create mode 100644 drivers/staging/crystalhd/Kconfig create mode 100644 drivers/staging/crystalhd/Makefile create mode 100644 drivers/staging/crystalhd/TODO create mode 100644 drivers/staging/crystalhd/bc_dts_defs.h create mode 100644 drivers/staging/crystalhd/bc_dts_glob_lnx.h create mode 100644 drivers/staging/crystalhd/bc_dts_types.h create mode 100644 drivers/staging/crystalhd/bcm_70012_regs.h create mode 100644 drivers/staging/crystalhd/crystalhd_cmds.c create mode 100644 drivers/staging/crystalhd/crystalhd_cmds.h create mode 100644 drivers/staging/crystalhd/crystalhd_fw_if.h create mode 100644 drivers/staging/crystalhd/crystalhd_hw.c create mode 100644 drivers/staging/crystalhd/crystalhd_hw.h create mode 100644 drivers/staging/crystalhd/crystalhd_lnx.c create mode 100644 drivers/staging/crystalhd/crystalhd_lnx.h create mode 100644 drivers/staging/crystalhd/crystalhd_misc.c create mode 100644 drivers/staging/crystalhd/crystalhd_misc.h create mode 100644 drivers/staging/dream/include/linux/android_pmem.h create mode 100644 drivers/staging/dream/include/linux/gpio_event.h create mode 100644 drivers/staging/dream/include/linux/msm_adsp.h create mode 100644 drivers/staging/dream/include/linux/msm_audio.h create mode 100644 drivers/staging/dream/include/linux/msm_rpcrouter.h create mode 100644 drivers/staging/dream/include/linux/wakelock.h create mode 100644 drivers/staging/dream/include/mach/camera.h create mode 100644 drivers/staging/dream/include/mach/msm_adsp.h create mode 100644 drivers/staging/dream/include/mach/msm_rpcrouter.h create mode 100644 drivers/staging/dream/include/mach/msm_smd.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audplaycmdi.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audplaymsg.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audppcmdi.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audppmsg.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audpreproccmdi.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audpreprocmsg.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audreccmdi.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audrecmsg.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5jpegcmdi.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5jpegmsg.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5lpmcmdi.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5lpmmsg.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vdeccmdi.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vdecmsg.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5venccmdi.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vfecmdi.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vfemsg.h create mode 100644 drivers/staging/dream/include/media/msm_camera.h create mode 100644 drivers/staging/dt3155/Kconfig create mode 100644 drivers/staging/dt3155/Makefile create mode 100644 drivers/staging/dt3155/TODO create mode 100644 drivers/staging/dt3155/allocator.README create mode 100644 drivers/staging/dt3155/allocator.c create mode 100644 drivers/staging/dt3155/allocator.h create mode 100644 drivers/staging/dt3155/dt3155.h create mode 100644 drivers/staging/dt3155/dt3155.sysvinit create mode 100644 drivers/staging/dt3155/dt3155_drv.c create mode 100644 drivers/staging/dt3155/dt3155_drv.h create mode 100644 drivers/staging/dt3155/dt3155_io.c create mode 100644 drivers/staging/dt3155/dt3155_io.h create mode 100644 drivers/staging/dt3155/dt3155_isr.c create mode 100644 drivers/staging/dt3155/dt3155_isr.h delete mode 100644 drivers/staging/p9auth/Kconfig delete mode 100644 drivers/staging/p9auth/Makefile delete mode 100644 drivers/staging/p9auth/p9auth.c delete mode 100644 drivers/staging/sm7xx/smtc2d.c delete mode 100644 drivers/staging/sm7xx/smtc2d.h Merging scsi-post-merge/master $ git merge scsi-post-merge/master Already up-to-date. $ git am -3 ../patches/0001-pci-PCIE_PME-seems-to-depend-on-ACPI.patch Applying: pci: PCIE_PME seems to depend on ACPI