From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 3f80fbf..39ab05c master -> origin/master * [new tag] v2.6.39 -## # errorChecking out files: 6% (62/905) Checking out files: 7% (64/905) Checking out files: 8% (73/905) Checking out files: 8% (75/905) Checking out files: 9## # git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git master scsi-rc-fixes ## Auto-merging MAINTAINERS Auto-merging drivers/scsi/mpt2sas/mpt2sas_ctl.c Auto-merging drivers/scsi/scsi_transport_fc.c Merge made by recursive. Documentation/DocBook/media-entities.tmpl | 1 + Documentation/DocBook/v4l/media-ioc-setup-link.xml | 2 +- Documentation/DocBook/v4l/pixfmt-y12.xml | 79 ++++++ Documentation/DocBook/v4l/pixfmt.xml | 1 + Documentation/DocBook/v4l/subdev-formats.xml | 59 +++++ Documentation/cgroups/memory.txt | 15 +- Documentation/hwmon/adm1021 | 36 ++-- Documentation/hwmon/lm90 | 29 ++- Documentation/hwmon/max16064 | 62 +++++ Documentation/hwmon/max34440 | 79 ++++++ Documentation/hwmon/max8688 | 69 +++++ Documentation/hwmon/pmbus | 34 +-- Documentation/hwmon/smm665 | 8 +- Documentation/hwmon/submitting-patches | 109 ++++++++ Documentation/input/event-codes.txt | 262 ++++++++++++++++++++ Documentation/md.txt | 10 + Documentation/sound/alsa/SB-Live-mixer.txt | 6 +- Documentation/video4linux/sh_mobile_ceu_camera.txt | 6 +- Documentation/workqueue.txt | 40 +++ MAINTAINERS | 32 ++-- Makefile | 2 +- arch/alpha/kernel/Makefile | 2 +- arch/alpha/kernel/core_mcpcia.c | 12 +- arch/alpha/kernel/err_titan.c | 4 +- arch/alpha/kernel/irq_alpha.c | 2 +- arch/alpha/kernel/setup.c | 6 +- arch/alpha/kernel/smc37c93x.c | 3 +- arch/alpha/kernel/sys_wildfire.c | 5 +- arch/alpha/kernel/time.c | 1 + arch/arm/Kconfig | 3 +- arch/arm/Kconfig.debug | 11 - arch/arm/common/Makefile | 1 - arch/arm/include/asm/cputype.h | 1 + arch/arm/include/asm/thread_notify.h | 1 + arch/arm/include/asm/unistd.h | 4 + arch/arm/kernel/Makefile | 2 +- arch/arm/kernel/calls.S | 4 + arch/arm/kernel/elf.c | 17 +- arch/arm/kernel/hw_breakpoint.c | 7 + arch/arm/kernel/perf_event.c | 2 +- arch/arm/kernel/process.c | 2 + arch/arm/kernel/traps.c | 3 +- arch/arm/mach-davinci/dm355.c | 2 +- arch/arm/mach-davinci/dm644x.c | 2 +- arch/arm/mach-mmp/include/mach/gpio.h | 2 +- arch/arm/mach-mmp/include/mach/mfp-pxa168.h | 9 + arch/arm/mach-msm/board-qsd8x50.c | 5 +- arch/arm/mach-msm/timer.c | 2 +- arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/board-rx51.c | 9 +- arch/arm/mach-omap2/clock44xx_data.c | 9 +- arch/arm/mach-omap2/cm2xxx_3xxx.c | 17 ++ arch/arm/mach-omap2/control.c | 8 +- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 6 +- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 7 +- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 8 +- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +- arch/arm/mach-omap2/omap_l3_smx.c | 4 +- arch/arm/mach-omap2/pm.c | 1 + arch/arm/mach-omap2/voltage.c | 1 - arch/arm/mach-pxa/include/mach/gpio.h | 17 ++- arch/arm/mach-pxa/include/mach/irqs.h | 3 - arch/arm/mach-pxa/pxa25x.c | 2 +- arch/arm/mach-pxa/pxa27x.c | 2 +- arch/arm/mach-s3c2440/mach-gta02.c | 5 + arch/arm/mach-tegra/gpio.c | 6 +- arch/arm/mach-tegra/tegra2_clocks.c | 9 +- arch/arm/mach-ux500/board-mop500.c | 19 +- arch/arm/mm/mmap.c | 4 +- arch/arm/mm/proc-arm920.S | 2 +- arch/arm/mm/proc-arm926.S | 2 +- arch/arm/mm/proc-sa1100.S From . * branch block-for-linus -> FETCH_HEAD From . * branch block-for-next -> FETCH_HEAD Died at /pub/linux/kernel/people/jejb/build.pl line 103. | 2 +- arch/arm/mm/proc-xscale.S | 2 +- arch/arm/plat-s5p/pm.c | 11 - arch/arm/plat-samsung/pm-check.c | 6 - arch/arm/plat-samsung/pm.c | 5 +- arch/arm/vfp/vfpmodule.c | 34 ++- arch/m68k/mm/motorola.c | 2 + arch/microblaze/Kconfig | 1 - arch/parisc/mm/init.c | 4 +- arch/powerpc/Kconfig | 2 +- arch/powerpc/include/asm/cputable.h | 16 +- arch/powerpc/include/asm/pte-common.h | 2 +- arch/powerpc/include/asm/uninorth.h | 2 +- arch/powerpc/kernel/cputable.c | 2 +- arch/powerpc/kernel/crash.c | 12 +- arch/powerpc/kernel/legacy_serial.c | 8 +- arch/powerpc/kernel/perf_event.c | 37 +++- arch/powerpc/kernel/time.c | 3 + arch/powerpc/platforms/powermac/smp.c | 8 +- arch/powerpc/platforms/pseries/setup.c | 12 +- arch/powerpc/sysdev/fsl_pci.c | 5 + arch/s390/crypto/prng.c | 2 +- arch/s390/kvm/sie64a.S | 4 +- arch/s390/mm/fault.c | 4 +- arch/s390/mm/pageattr.c | 5 +- arch/um/Kconfig.um | 2 +- arch/um/include/asm/thread_info.h | 5 +- arch/um/sys-i386/Makefile | 2 +- arch/um/sys-i386/atomic64_cx8_32.S | 225 +++++++++++++++++ arch/x86/boot/memory.c | 2 +- arch/x86/include/asm/gart.h | 24 +- arch/x86/include/asm/io_apic.h | 2 +- arch/x86/include/asm/msr-index.h | 4 + arch/x86/include/asm/numa.h | 2 +- arch/x86/kernel/aperture_64.c | 2 +- arch/x86/kernel/apic/io_apic.c | 10 +- arch/x86/kernel/apm_32.c | 5 + arch/x86/kernel/cpu/amd.c | 19 ++ arch/x86/kernel/cpu/perf_event.c | 22 ++- arch/x86/kernel/cpu/perf_event_amd.c | 22 ++- arch/x86/kernel/cpu/perf_event_intel.c | 38 +++- arch/x86/kernel/cpu/perf_event_p4.c | 19 +- arch/x86/kernel/devicetree.c | 2 +- arch/x86/kernel/pci-gart_64.c | 9 +- arch/x86/mm/numa.c | 31 +-- arch/x86/mm/numa_emulation.c | 20 +- arch/x86/platform/ce4100/falconfalls.dts | 8 +- arch/x86/platform/mrst/mrst.c | 10 +- arch/x86/xen/mmu.c | 13 +- arch/x86/xen/setup.c | 2 +- arch/xtensa/kernel/irq.c | 18 +- block/blk-core.c | 110 ++++++--- block/blk-exec.c | 2 +- block/blk-flush.c | 4 +- block/blk-settings.c | 16 -- block/blk-sysfs.c | 8 +- block/cfq-iosched.c | 26 +-- block/elevator.c | 7 +- block/genhd.c | 8 +- drivers/acpi/scan.c | 4 + drivers/ata/ahci.c | 8 +- drivers/ata/ahci.h | 4 + drivers/ata/ata_piix.c | 8 + drivers/ata/libahci.c | 60 +++++- drivers/ata/libata-core.c | 3 +- drivers/ata/libata-eh.c | 6 +- drivers/ata/pata_at91.c | 22 ++- drivers/base/power/main.c | 1 + drivers/base/power/wakeup.c | 2 +- drivers/base/syscore.c | 2 + drivers/char/agp/generic.c | 19 ++- drivers/char/virtio_console.c | 11 - drivers/connector/connector.c | 1 + drivers/edac/amd64_edac.c | 88 ++++++- drivers/edac/amd64_edac.h | 3 + drivers/edac/edac_mc_sysfs.c | 11 +- drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/drm_fb_helper.c | 27 ++- drivers/gpu/drm/i915/i915_dma.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 73 +++--- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_fb.c | 10 + drivers/gpu/drm/i915/intel_tv.c | 9 +- drivers/gpu/drm/nouveau/nouveau_dma.c | 2 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 3 + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 +- drivers/gpu/drm/nouveau/nouveau_mem.c | 2 +- drivers/gpu/drm/nouveau/nouveau_notifier.c | 11 +- drivers/gpu/drm/nouveau/nouveau_object.c | 10 +- drivers/gpu/drm/nouveau/nouveau_sgdma.c | 5 +- drivers/gpu/drm/nouveau/nouveau_state.c | 1 + drivers/gpu/drm/nouveau/nv50_instmem.c | 10 +- drivers/gpu/drm/nouveau/nv50_vm.c | 5 +- drivers/gpu/drm/nouveau/nvc0_vm.c | 5 +- drivers/gpu/drm/radeon/atom.c | 6 +- drivers/gpu/drm/radeon/atombios_crtc.c | 6 +- drivers/gpu/drm/radeon/evergreen.c | 91 ++++---- drivers/gpu/drm/radeon/r600.c | 2 +- drivers/gpu/drm/radeon/radeon_connectors.c | 29 +-- drivers/gpu/drm/radeon/radeon_i2c.c | 6 + drivers/gpu/drm/radeon/radeon_kms.c | 13 + drivers/gpu/drm/radeon/reg_srcs/r600 | 1 + drivers/hwmon/Kconfig | 11 +- drivers/hwmon/lm85.c | 6 +- drivers/hwmon/lm90.c | 22 ++- drivers/hwmon/pmbus_core.c | 1 - drivers/i2c/algos/i2c-algo-bit.c | 22 ++- drivers/i2c/i2c-core.c | 6 +- drivers/ide/ide-cd.c | 1 - drivers/ide/ide-cd_ioctl.c | 6 + drivers/ide/ide-gd.c | 7 +- drivers/infiniband/hw/qib/qib_iba6120.c | 2 +- drivers/infiniband/hw/qib/qib_iba7220.c | 2 +- drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- drivers/input/evdev.c | 33 ++- drivers/input/input.c | 40 +++ drivers/input/keyboard/twl4030_keypad.c | 6 +- drivers/input/misc/xen-kbdfront.c | 13 +- drivers/input/touchscreen/h3600_ts_input.c | 17 +- drivers/md/dm-raid.c | 8 - drivers/md/md.c | 88 ++++--- drivers/md/md.h | 26 +-- drivers/md/raid1.c | 29 +-- drivers/md/raid10.c | 27 +- drivers/md/raid5.c | 66 +++--- drivers/md/raid5.h | 2 - drivers/media/common/tuners/tda18271-common.c | 11 +- drivers/media/common/tuners/tda18271-fe.c | 21 +- drivers/media/common/tuners/tda18271-maps.c | 12 +- drivers/media/dvb/b2c2/flexcop-pci.c | 2 +- drivers/media/dvb/dvb-usb/Kconfig | 4 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 6 +- drivers/media/media-entity.c | 8 +- drivers/media/radio/radio-sf16fmr2.c | 2 +- drivers/media/video/Kconfig | 2 +- drivers/media/video/cx18/cx18-streams.c | 10 +- drivers/media/video/cx23885/Kconfig | 1 + drivers/media/video/imx074.c | 2 +- drivers/media/video/omap3isp/isp.c | 34 ++- drivers/media/video/omap3isp/isp.h | 12 +- drivers/media/video/omap3isp/ispccdc.c | 37 +++- drivers/media/video/omap3isp/isppreview.c | 2 +- drivers/media/video/omap3isp/ispqueue.c | 6 +- drivers/media/video/omap3isp/ispresizer.c | 75 +++++-- drivers/media/video/omap3isp/ispstat.h | 6 +- drivers/media/video/omap3isp/ispvideo.c | 108 +++++++- drivers/media/video/omap3isp/ispvideo.h | 3 + drivers/media/video/s5p-fimc/fimc-capture.c | 8 +- drivers/media/video/s5p-fimc/fimc-core.c | 74 ++++-- drivers/media/video/sh_mobile_ceu_camera.c | 10 +- drivers/media/video/sh_mobile_csi2.c | 11 +- drivers/media/video/soc_camera.c | 7 +- drivers/media/video/v4l2-dev.c | 15 +- drivers/media/video/videobuf-dma-contig.c | 2 +- drivers/media/video/videobuf2-core.c | 17 +- drivers/media/video/videobuf2-dma-contig.c | 2 +- drivers/mtd/nand/diskonchip.c | 2 +- drivers/net/bna/bfa_ioc.c | 31 ++- drivers/net/bna/bfa_ioc.h | 1 + drivers/net/bna/bfa_ioc_ct.c | 28 ++ drivers/net/bna/bfi.h | 6 +- drivers/net/bna/bnad.c | 1 - drivers/net/bnx2x/bnx2x_ethtool.c | 9 +- drivers/net/bonding/bond_alb.c | 6 +- drivers/net/bonding/bond_alb.h | 4 +- drivers/net/can/mscan/mpc5xxx_can.c | 2 +- drivers/net/loopback.c | 3 +- drivers/net/natsemi.c | 3 + drivers/net/netxen/netxen_nic.h | 4 +- drivers/net/netxen/netxen_nic_main.c | 17 ++ drivers/net/qlcnic/qlcnic.h | 1 + drivers/net/qlcnic/qlcnic_main.c | 14 + drivers/net/sfc/efx.c | 6 +- drivers/net/sfc/io.h | 2 + drivers/net/sfc/net_driver.h | 2 - drivers/net/sfc/nic.c | 22 ++- drivers/net/sfc/nic.h | 1 + drivers/net/sfc/selftest.c | 25 +-- drivers/net/sfc/tx.c | 3 +- drivers/net/sis900.c | 23 ++- drivers/net/stmmac/dwmac_lib.c | 28 +- drivers/net/stmmac/stmmac_main.c | 49 ++-- drivers/net/tokenring/3c359.c | 4 +- drivers/net/tokenring/lanstreamer.c | 2 +- drivers/net/tokenring/olympic.c | 2 +- drivers/net/wireless/ath/ath9k/hif_usb.c | 4 +- drivers/net/wireless/ath/ath9k/hw.c | 9 - drivers/net/wireless/ath/ath9k/mac.c | 25 ++- drivers/net/wireless/ath/ath9k/mac.h | 2 +- drivers/net/wireless/ath/ath9k/main.c | 12 +- drivers/net/wireless/ath/ath9k/recv.c | 6 +- drivers/net/wireless/ath/regd_common.h | 1 + drivers/net/wireless/iwlegacy/Kconfig | 9 +- drivers/net/wireless/iwlegacy/iwl-3945-hw.h | 2 - drivers/net/wireless/iwlegacy/iwl-4965-hw.h | 3 - drivers/net/wireless/iwlegacy/iwl-core.c | 17 +- drivers/net/wireless/iwlegacy/iwl-eeprom.c | 7 - drivers/net/wireless/iwlegacy/iwl3945-base.c | 4 - drivers/net/wireless/iwlegacy/iwl4965-base.c | 6 - drivers/net/wireless/iwlwifi/iwl-5000.c | 3 + drivers/net/wireless/mwl8k.c | 9 +- drivers/net/wireless/p54/txrx.c | 2 +- drivers/parport/parport_pc.c | 8 +- drivers/pci/Kconfig | 4 +- drivers/pci/Makefile | 4 +- drivers/pci/intel-iommu.c | 55 ++++- drivers/pcmcia/pcmcia_resource.c | 2 +- drivers/pcmcia/pxa2xx_balloon3.c | 5 + drivers/pcmcia/pxa2xx_trizeps4.c | 15 +- drivers/rtc/class.c | 2 +- drivers/rtc/interface.c | 26 ++ drivers/rtc/rtc-bfin.c | 2 + drivers/rtc/rtc-coh901331.c | 4 +- drivers/rtc/rtc-max8925.c | 3 +- drivers/rtc/rtc-omap.c | 2 +- drivers/rtc/rtc-s3c.c | 2 - drivers/s390/block/dasd.c | 40 ++-- drivers/s390/block/dasd_devmap.c | 30 +++ drivers/s390/block/dasd_eckd.c | 5 +- drivers/s390/block/dasd_genhd.c | 2 +- drivers/s390/block/dasd_int.h | 3 + drivers/s390/block/dasd_ioctl.c | 128 +++++++--- drivers/s390/cio/qdio_main.c | 17 +- drivers/scsi/device_handler/scsi_dh.c | 9 +- drivers/scsi/mpt2sas/mpt2sas_ctl.c | 23 ++- drivers/scsi/pmcraid.c | 3 + drivers/scsi/scsi_lib.c | 24 +-- drivers/scsi/scsi_sysfs.c | 16 +- drivers/scsi/scsi_transport_fc.c | 19 +-- drivers/staging/rt2860/common/cmm_data_pci.c | 2 +- drivers/staging/rt2860/common/cmm_data_usb.c | 2 +- drivers/staging/spectra/ffsport.c | 2 +- drivers/staging/tidspbridge/dynload/cload.c | 2 +- drivers/staging/tty/specialix.c | 2 +- drivers/tty/n_gsm.c | 8 +- drivers/tty/serial/imx.c | 3 +- drivers/usb/Kconfig | 1 + drivers/usb/core/devices.c | 10 +- drivers/usb/core/hcd.c | 2 +- drivers/usb/core/hub.c | 12 +- drivers/usb/gadget/f_audio.c | 1 + drivers/usb/gadget/f_eem.c | 8 +- drivers/usb/gadget/fsl_qe_udc.c | 20 ++- drivers/usb/gadget/inode.c | 4 +- drivers/usb/gadget/pch_udc.c | 8 +- drivers/usb/gadget/r8a66597-udc.c | 2 + drivers/usb/host/ehci-q.c | 15 +- drivers/usb/host/isp1760-hcd.c | 2 +- drivers/usb/host/ohci-au1xxx.c | 2 +- drivers/usb/host/pci-quirks.c | 117 ++++++---- drivers/usb/host/xhci-mem.c | 106 ++++++--- drivers/usb/host/xhci-pci.c | 4 + drivers/usb/host/xhci-ring.c | 219 ++++++++++------- drivers/usb/host/xhci.c | 23 ++- drivers/usb/host/xhci.h | 11 +- drivers/usb/musb/Kconfig | 6 +- drivers/usb/musb/blackfin.c | 24 ++ drivers/usb/musb/cppi_dma.c | 27 ++- drivers/usb/musb/musb_core.c | 2 + drivers/usb/musb/musb_core.h | 5 + drivers/usb/musb/musb_gadget.c | 4 +- drivers/usb/musb/musbhsdma.c | 8 + drivers/usb/musb/omap2430.c | 3 +- drivers/usb/musb/ux500.c | 2 + drivers/usb/serial/ftdi_sio.c | 5 + drivers/usb/serial/ftdi_sio_ids.h | 12 + drivers/usb/serial/option.c | 5 + drivers/usb/serial/qcserial.c | 31 ++- drivers/video/pxafb.c | 4 +- drivers/virtio/virtio_pci.c | 15 +- drivers/virtio/virtio_ring.c | 1 + drivers/watchdog/iTCO_wdt.c | 97 +++++++ drivers/xen/manage.c | 9 +- fs/9p/fid.c | 15 +- fs/9p/v9fs.h | 1 - fs/9p/vfs_dentry.c | 4 +- fs/9p/vfs_inode_dotl.c | 2 +- fs/9p/vfs_super.c | 80 +++++-- fs/btrfs/acl.c | 9 +- fs/btrfs/ctree.h | 11 +- fs/btrfs/disk-io.c | 3 +- fs/btrfs/extent-tree.c | 129 ++++++++-- fs/btrfs/extent_io.c | 84 +++++-- fs/btrfs/extent_io.h | 2 +- fs/btrfs/file.c | 21 +- fs/btrfs/free-space-cache.c | 132 +++++----- fs/btrfs/inode.c | 185 ++++++++++----- fs/btrfs/ioctl.c | 2 +- fs/btrfs/super.c | 42 +++- fs/btrfs/transaction.c | 48 ++-- fs/btrfs/transaction.h | 4 +- fs/btrfs/tree-log.c | 7 +- fs/btrfs/volumes.c | 10 + fs/btrfs/xattr.c | 33 +-- fs/cifs/connect.c | 5 +- fs/dcache.c | 87 +++---- fs/ecryptfs/crypto.c | 21 ++ fs/ecryptfs/ecryptfs_kernel.h | 7 +- fs/ecryptfs/file.c | 25 +- fs/ecryptfs/inode.c | 60 +++-- fs/ecryptfs/kthread.c | 6 +- fs/ecryptfs/main.c | 72 ++++-- fs/ecryptfs/super.c | 16 +- fs/file.c | 18 +- fs/filesystems.c | 3 +- fs/gfs2/aops.c | 2 +- fs/gfs2/dir.c | 2 +- fs/gfs2/file.c | 58 ++++- fs/gfs2/glock.c | 6 +- fs/gfs2/glops.c | 4 + fs/gfs2/inode.c | 56 +++-- fs/gfs2/inode.h | 3 +- fs/gfs2/ops_fstype.c | 2 +- fs/gfs2/rgrp.c | 4 +- fs/gfs2/super.c | 14 +- fs/namei.c | 1 + fs/nfs/namespace.c | 4 +- fs/nfs/nfs4_fs.h | 1 + fs/nfs/nfs4proc.c | 118 +++++----- fs/nfs/nfs4state.c | 51 +++-- fs/nfs/nfs4xdr.c | 53 ++-- fs/nfs/pnfs.c | 8 +- fs/nfs/super.c | 13 +- fs/nfs/write.c | 4 +- fs/nfsd/nfs4state.c | 3 +- fs/nfsd/vfs.c | 9 +- fs/ocfs2/ocfs2_fs.h | 2 +- fs/proc/base.c | 9 +- fs/ubifs/recovery.c | 26 ++ fs/ubifs/super.c | 29 ++- fs/xattr.c | 2 +- fs/xfs/linux-2.6/xfs_message.c | 4 +- include/drm/drm_fb_helper.h | 1 + include/drm/radeon_drm.h | 1 + include/linux/bit_spinlock.h | 8 +- include/linux/blkdev.h | 51 +++-- include/linux/dcache.h | 4 +- include/linux/device-mapper.h | 1 - include/linux/huge_mm.h | 2 +- include/linux/input.h | 10 +- include/linux/input/mt.h | 6 + include/linux/libata.h | 3 +- include/linux/list_bl.h | 11 + include/linux/mm.h | 3 +- include/linux/nfs_fs_sb.h | 1 + include/linux/nfs_xdr.h | 2 + include/linux/pid.h | 2 +- include/linux/posix-clock.h | 5 +- include/linux/rtc.h | 2 + include/linux/security.h | 2 +- include/linux/sunrpc/sched.h | 5 +- include/linux/usb/usbnet.h | 4 +- include/linux/v4l2-mediabus.h | 7 +- include/linux/videodev2.h | 1 + include/media/v4l2-device.h | 2 +- include/net/9p/9p.h | 2 - include/net/9p/client.h | 5 +- include/trace/events/block.h | 13 +- init/Kconfig | 17 +- kernel/futex.c | 2 +- kernel/hrtimer.c | 10 +- kernel/kexec.c | 7 + kernel/perf_event.c | 12 + kernel/pid.c | 5 +- kernel/power/hibernate.c | 10 +- kernel/power/suspend.c | 5 +- kernel/sched.c | 2 +- kernel/sched_fair.c | 14 +- kernel/time/posix-clock.c | 24 +-- kernel/trace/Kconfig | 2 +- kernel/trace/blktrace.c | 18 +- kernel/watchdog.c | 5 +- kernel/workqueue.c | 8 +- mm/huge_memory.c | 43 ++-- mm/memory.c | 2 +- mm/oom_kill.c | 9 +- net/9p/client.c | 29 +-- net/9p/protocol.c | 7 +- net/9p/trans_common.c | 2 +- net/9p/trans_virtio.c | 15 +- net/bridge/br_netfilter.c | 6 +- net/caif/cfdgml.c | 6 +- net/caif/cfmuxl.c | 4 +- net/core/dev.c | 10 +- net/ieee802154/Makefile | 2 - net/ipv4/inet_connection_sock.c | 5 +- net/ipv4/inetpeer.c | 13 +- net/ipv4/ip_options.c | 6 +- net/ipv4/sysctl_net_ipv4.c | 3 - net/ipv6/inet6_connection_sock.c | 2 +- net/irda/af_irda.c | 3 +- net/l2tp/l2tp_ip.c | 2 +- net/llc/llc_input.c | 3 +- net/netfilter/ipset/ip_set_bitmap_ipmac.c | 4 + net/netfilter/ipset/ip_set_core.c | 18 +- net/netfilter/xt_set.c | 18 ++- net/sctp/associola.c | 4 + net/sctp/ulpevent.c | 2 +- net/sunrpc/Kconfig | 9 +- net/sunrpc/auth_gss/auth_gss.c | 8 +- net/sunrpc/clnt.c | 5 +- net/sunrpc/xprt.c | 1 + scripts/kconfig/conf.c | 2 +- security/capability.c | 2 +- security/security.c | 6 +- security/selinux/avc.c | 36 +++- security/selinux/hooks.c | 24 +- security/selinux/include/avc.h | 18 +- security/smack/smack_lsm.c | 6 +- sound/aoa/codecs/tas.c | 2 +- sound/pci/hda/hda_codec.c | 4 + sound/pci/hda/patch_realtek.c | 25 ++- sound/soc/codecs/jz4740.c | 2 - sound/soc/codecs/sn95031.c | 2 +- sound/soc/codecs/wm8903.c | 38 ++-- sound/soc/codecs/wm8994.c | 16 ++ sound/soc/codecs/wm_hubs.c | 8 +- sound/soc/mid-x86/sst_platform.c | 10 +- sound/soc/samsung/pcm.c | 4 +- sound/soc/sh/fsi.c | 22 ++- sound/soc/soc-core.c | 5 +- sound/soc/tegra/harmony.c | 1 + tools/perf/builtin-record.c | 7 +- tools/perf/builtin-stat.c | 7 +- tools/perf/builtin-test.c | 10 +- tools/perf/builtin-top.c | 3 +- tools/perf/util/cgroup.c | 2 +- tools/perf/util/evlist.c | 14 +- tools/perf/util/evsel.c | 27 +-- tools/perf/util/evsel.h | 6 +- tools/perf/util/python.c | 9 +- tools/perf/util/ui/browsers/annotate.c | 6 +- tools/perf/util/ui/browsers/hists.c | 2 +- 507 files changed, 5458 insertions(+), 2397 deletions(-) create mode 100644 Documentation/DocBook/v4l/pixfmt-y12.xml create mode 100644 Documentation/hwmon/max16064 create mode 100644 Documentation/hwmon/max34440 create mode 100644 Documentation/hwmon/max8688 create mode 100644 Documentation/hwmon/submitting-patches create mode 100644 Documentation/input/event-codes.txt create mode 100644 arch/um/sys-i386/atomic64_cx8_32.S ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-linus block-for-linus ## Auto-merging MAINTAINERS Merge made by recursive. Documentation/flexible-arrays.txt | 4 +- MAINTAINERS | 82 +- Makefile | 2 +- arch/alpha/include/asm/unistd.h | 6 +- arch/alpha/kernel/systbls.S | 12 +- arch/alpha/kernel/time.c | 3 +- arch/arm/boot/compressed/Makefile | 2 +- arch/arm/boot/compressed/head.S | 35 +- arch/arm/boot/compressed/vmlinux.lds.in | 1 + arch/arm/configs/at91x40_defconfig | 48 ++ arch/arm/include/asm/kprobes.h | 3 + arch/arm/include/asm/system.h | 2 +- arch/arm/kernel/kprobes-decode.c | 777 ++++++++++++-------- arch/arm/kernel/kprobes.c | 3 +- arch/arm/kernel/perf_event.c | 3 +- arch/arm/kernel/ptrace.c | 8 + arch/arm/kernel/signal.c | 90 ++- arch/arm/kernel/smp.c | 2 +- arch/arm/kernel/sys_oabi-compat.c | 2 +- arch/arm/mach-at91/Kconfig | 1 + arch/arm/mach-at91/board-eb01.c | 7 +- arch/arm/mach-at91/include/mach/cpu.h | 28 + arch/arm/mach-davinci/Kconfig | 6 + arch/arm/mach-davinci/board-mityomapl138.c | 4 +- arch/arm/mach-davinci/devices-da8xx.c | 12 +- arch/arm/mach-davinci/include/mach/debug-macro.S | 13 +- arch/arm/mach-davinci/include/mach/serial.h | 2 +- arch/arm/mach-mx3/mach-vpr200.c | 11 +- arch/arm/mach-mx5/board-mx53_loco.c | 2 +- arch/arm/mach-mxs/clock-mx28.c | 7 +- arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 1 + arch/arm/mach-pxa/hx4700.c | 2 +- arch/arm/mach-pxa/magician.c | 2 +- arch/arm/mach-realview/include/mach/barriers.h | 2 +- arch/arm/mach-tegra/include/mach/barriers.h | 2 +- arch/arm/mm/init.c | 16 +- arch/arm/mm/proc-xscale.S | 2 +- arch/arm/plat-mxc/gpio.c | 7 + arch/arm/plat-mxc/ssi-fiq.S | 2 + arch/arm/plat-omap/iommu.c | 2 + arch/mips/Kconfig | 5 - arch/mips/alchemy/devboards/db1x00/board_setup.c | 61 +- arch/mips/alchemy/xxs1500/init.c | 5 +- arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 2 +- arch/mips/cavium-octeon/Kconfig | 15 +- arch/mips/include/asm/cache.h | 2 +- arch/mips/include/asm/cevt-r4k.h | 3 + arch/mips/include/asm/hugetlb.h | 1 + arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h | 2 +- arch/mips/jazz/jazzdma.c | 5 +- arch/mips/jz4740/dma.c | 4 +- arch/mips/jz4740/time.c | 2 +- arch/mips/jz4740/timer.c | 2 + arch/mips/kernel/ftrace.c | 5 +- arch/mips/kernel/ptrace.c | 4 +- arch/mips/kernel/scall32-o32.S | 2 +- arch/mips/kernel/scall64-64.S | 2 +- arch/mips/kernel/scall64-n32.S | 2 +- arch/mips/kernel/scall64-o32.S | 2 +- arch/mips/kernel/vmlinux.lds.S | 1 + arch/mips/loongson/common/env.c | 5 +- arch/mips/mm/c-r4k.c | 2 - arch/mips/mm/tlbex.c | 4 +- arch/mips/mti-malta/malta-init.c | 14 +- arch/mips/mti-malta/malta-int.c | 3 +- arch/mips/pmc-sierra/msp71xx/msp_irq_per.c | 2 +- arch/mips/power/hibernate.S | 2 +- arch/mips/sgi-ip22/ip22-platform.c | 4 +- arch/mips/sgi-ip22/ip22-time.c | 4 +- arch/mips/sgi-ip27/ip27-hubio.c | 3 +- arch/mips/sgi-ip27/ip27-klnuma.c | 3 - arch/mips/sni/time.c | 4 +- arch/powerpc/include/asm/8xx_immap.h | 4 +- arch/powerpc/kernel/ptrace.c | 12 +- arch/s390/crypto/prng.c | 2 +- arch/s390/include/asm/diag.h | 17 +- arch/s390/include/asm/mmu_context.h | 2 +- arch/s390/kernel/diag.c | 21 - arch/s390/kernel/dis.c | 1 + arch/s390/kernel/entry.S | 2 +- arch/s390/kernel/entry64.S | 2 +- arch/s390/mm/cmm.c | 2 +- arch/s390/mm/fault.c | 2 +- arch/s390/oprofile/hwsampler.c | 14 +- arch/s390/oprofile/hwsampler.h | 4 +- arch/s390/oprofile/init.c | 8 +- arch/sh/kernel/ptrace_32.c | 4 + arch/sparc/kernel/apc.c | 2 +- arch/sparc/kernel/pmc.c | 2 +- arch/sparc/kernel/smp_32.c | 10 +- arch/sparc/kernel/time_32.c | 2 +- arch/sparc/lib/checksum_32.S | 12 +- arch/um/os-Linux/util.c | 23 +- arch/x86/include/asm/apicdef.h | 1 + arch/x86/include/asm/pgtable_types.h | 1 + arch/x86/include/asm/uv/uv_bau.h | 17 +- arch/x86/include/asm/uv/uv_hub.h | 2 + arch/x86/include/asm/uv/uv_mmrs.h | 16 +- arch/x86/include/asm/x86_init.h | 12 + arch/x86/kernel/apic/x2apic_uv_x.c | 48 ++- arch/x86/kernel/cpu/amd.c | 2 +- arch/x86/kernel/cpu/mcheck/mce_amd.c | 1 + arch/x86/kernel/cpu/mcheck/therm_throt.c | 12 +- arch/x86/kernel/cpu/perf_event_intel.c | 87 ++- arch/x86/kernel/kprobes.c | 5 +- arch/x86/kernel/ptrace.c | 36 +- arch/x86/kernel/reboot_32.S | 12 +- arch/x86/kernel/x86_init.c | 4 + arch/x86/mm/init.c | 24 +- arch/x86/mm/numa_64.c | 2 +- arch/x86/platform/uv/tlb_uv.c | 92 ++- arch/x86/xen/mmu.c | 17 +- block/blk-cgroup.c | 7 + block/blk-cgroup.h | 3 + block/blk-core.c | 4 +- block/blk-throttle.c | 9 +- block/blk.h | 3 +- block/cfq-iosched.c | 11 +- drivers/ata/libahci.c | 21 - drivers/ata/libata-eh.c | 2 +- drivers/block/DAC960.c | 1 - drivers/block/amiflop.c | 1 - drivers/block/ataflop.c | 1 - drivers/block/floppy.c | 1 - drivers/block/paride/pcd.c | 1 - drivers/block/paride/pd.c | 1 - drivers/block/paride/pf.c | 1 - drivers/block/rbd.c | 181 ++++- drivers/block/swim.c | 1 - drivers/block/swim3.c | 1 - drivers/block/ub.c | 1 - drivers/block/xsysace.c | 1 - drivers/cdrom/cdrom.c | 6 +- drivers/cdrom/gdrom.c | 1 - drivers/cdrom/viocd.c | 1 - drivers/clk/clkdev.c | 19 +- drivers/firewire/ohci.c | 39 +- drivers/gpu/drm/drm_fb_helper.c | 26 +- drivers/gpu/drm/drm_irq.c | 23 + drivers/gpu/drm/drm_mm.c | 6 +- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 8 +- drivers/gpu/drm/i915/intel_dp.c | 17 +- drivers/gpu/drm/i915/intel_lvds.c | 3 + drivers/gpu/drm/nouveau/nouveau_mem.c | 2 - drivers/gpu/drm/nouveau/nouveau_sgdma.c | 3 +- drivers/gpu/drm/nouveau/nouveau_state.c | 5 + drivers/gpu/drm/radeon/evergreen.c | 22 +- drivers/gpu/drm/radeon/evergreend.h | 6 + drivers/gpu/drm/radeon/ni.c | 18 +- drivers/gpu/drm/radeon/radeon_atombios.c | 23 +- drivers/gpu/drm/radeon/radeon_atpx_handler.c | 29 +- drivers/gpu/drm/radeon/radeon_cursor.c | 6 +- drivers/gpu/drm/radeon/radeon_gart.c | 6 +- drivers/gpu/drm/radeon/radeon_kms.c | 3 + drivers/gpu/drm/radeon/reg_srcs/cayman | 1 + drivers/gpu/drm/radeon/reg_srcs/evergreen | 1 + drivers/gpu/vga/vga_switcheroo.c | 6 +- drivers/hwmon/twl4030-madc-hwmon.c | 3 +- drivers/i2c/busses/i2c-i801.c | 5 + drivers/i2c/busses/i2c-parport.c | 27 +- drivers/i2c/busses/i2c-pnx.c | 2 +- drivers/input/touchscreen/ads7846.c | 13 +- drivers/input/touchscreen/wm831x-ts.c | 75 ++- drivers/leds/leds-lm3530.c | 1 + drivers/media/dvb/dvb-usb/Kconfig | 2 + drivers/media/dvb/ngene/ngene-core.c | 1 + drivers/media/radio/saa7706h.c | 2 +- drivers/media/radio/tef6862.c | 2 +- drivers/media/rc/imon.c | 31 +- drivers/media/rc/ite-cir.c | 1 + drivers/media/rc/mceusb.c | 2 + drivers/media/rc/rc-main.c | 4 +- drivers/media/video/cx88/cx88-input.c | 2 +- drivers/media/video/m52790.c | 2 +- drivers/media/video/soc_camera.c | 48 ++- drivers/media/video/tda9840.c | 2 +- drivers/media/video/tea6415c.c | 2 +- drivers/media/video/tea6420.c | 2 +- drivers/media/video/upd64031a.c | 2 +- drivers/media/video/upd64083.c | 2 +- drivers/media/video/v4l2-device.c | 5 +- drivers/media/video/v4l2-subdev.c | 14 +- drivers/message/i2o/i2o_block.c | 1 - drivers/mfd/asic3.c | 2 +- drivers/mfd/omap-usb-host.c | 17 +- drivers/mfd/twl4030-power.c | 3 +- drivers/mmc/core/bus.c | 1 + drivers/mmc/host/omap.c | 2 +- drivers/mmc/host/sdhci-pci.c | 1 + drivers/mmc/host/sdhci.c | 9 +- drivers/mmc/host/tmio_mmc_pio.c | 10 +- drivers/net/Kconfig | 8 +- drivers/net/Makefile | 6 +- drivers/net/amd8111e.c | 2 +- drivers/net/arm/etherh.c | 4 +- drivers/net/atl1c/atl1c.h | 6 +- drivers/net/atl1c/atl1c_main.c | 14 +- drivers/net/benet/be.h | 2 +- drivers/net/benet/be_cmds.c | 2 +- drivers/net/benet/be_main.c | 19 +- drivers/net/bnx2.c | 2 + drivers/net/bnx2x/bnx2x_cmn.c | 34 +- drivers/net/bonding/bond_3ad.c | 7 +- drivers/net/bonding/bond_3ad.h | 10 +- drivers/net/can/sja1000/sja1000.c | 2 +- drivers/net/can/slcan.c | 4 +- drivers/net/ehea/ehea_ethtool.c | 21 +- drivers/net/ehea/ehea_main.c | 15 +- drivers/net/fs_enet/mac-fec.c | 8 +- drivers/net/ftmac100.c | 8 +- drivers/net/hydra.c | 14 +- drivers/net/mii.c | 4 + drivers/net/ne-h8300.c | 16 +- drivers/net/netconsole.c | 8 + drivers/net/pch_gbe/pch_gbe_main.c | 23 +- drivers/net/r8169.c | 99 ++- drivers/net/sfc/mcdi.c | 49 +- drivers/net/sfc/nic.c | 7 + drivers/net/sfc/nic.h | 2 + drivers/net/sfc/siena.c | 25 +- drivers/net/slip.c | 4 +- drivers/net/tg3.c | 8 +- drivers/net/usb/cdc_ether.c | 16 +- drivers/net/usb/cdc_ncm.c | 4 +- drivers/net/usb/ipheth.c | 14 +- drivers/net/usb/smsc95xx.c | 2 +- drivers/net/usb/usbnet.c | 18 +- drivers/net/veth.c | 12 + drivers/net/vmxnet3/vmxnet3_drv.c | 10 +- drivers/net/vmxnet3/vmxnet3_ethtool.c | 3 + drivers/net/wireless/ath/ath9k/main.c | 8 + drivers/net/wireless/ath/ath9k/recv.c | 2 +- drivers/net/wireless/b43/main.c | 1 + drivers/net/wireless/iwlegacy/iwl-4965-tx.c | 28 +- drivers/net/wireless/iwlegacy/iwl-core.c | 7 + drivers/net/wireless/iwlegacy/iwl-dev.h | 6 + drivers/net/wireless/iwlegacy/iwl-led.c | 20 +- drivers/net/wireless/iwlegacy/iwl4965-base.c | 8 +- drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 7 +- drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 27 +- drivers/net/wireless/libertas/cmd.c | 6 +- drivers/net/zorro8390.c | 12 +- drivers/pci/setup-bus.c | 4 +- drivers/platform/x86/eeepc-laptop.c | 57 +- drivers/platform/x86/sony-laptop.c | 130 +++- drivers/platform/x86/thinkpad_acpi.c | 6 +- drivers/rapidio/switches/idt_gen2.c | 9 + drivers/rapidio/switches/idtcps.c | 6 + drivers/rapidio/switches/tsi57x.c | 6 + drivers/rtc/rtc-davinci.c | 5 +- drivers/rtc/rtc-ds1286.c | 2 +- drivers/rtc/rtc-ep93xx.c | 5 +- drivers/rtc/rtc-m41t80.c | 5 +- drivers/rtc/rtc-max8925.c | 5 +- drivers/rtc/rtc-max8998.c | 5 +- drivers/rtc/rtc-mc13xxx.c | 8 +- drivers/rtc/rtc-msm6242.c | 3 +- drivers/rtc/rtc-mxc.c | 19 +- drivers/rtc/rtc-pcap.c | 4 +- drivers/rtc/rtc-rp5c01.c | 5 +- drivers/rtc/rtc-s3c.c | 13 +- drivers/s390/block/dasd.c | 11 +- drivers/s390/block/dasd_diag.c | 2 +- drivers/s390/char/sclp_cmd.c | 2 + drivers/s390/char/tape_block.c | 1 - drivers/s390/kvm/kvm_virtio.c | 2 +- drivers/scsi/scsi_lib.c | 20 +- drivers/scsi/scsi_scan.c | 2 + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 - drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 3 - drivers/staging/gma500/Kconfig | 2 +- drivers/staging/intel_sst/intelmid_v1_control.c | 1 + drivers/staging/intel_sst/intelmid_v2_control.c | 1 + drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 1 + drivers/staging/rts_pstor/debug.h | 2 +- drivers/staging/rts_pstor/ms.c | 1 + drivers/staging/rts_pstor/rtsx_chip.c | 5 +- drivers/staging/rts_pstor/rtsx_scsi.c | 1 + drivers/staging/rts_pstor/sd.c | 4 +- drivers/staging/rts_pstor/trace.h | 2 +- drivers/staging/rts_pstor/xd.c | 1 + drivers/staging/solo6x10/Kconfig | 1 + drivers/staging/usbip/vhci_hcd.c | 11 +- drivers/staging/usbip/vhci_sysfs.c | 7 +- drivers/staging/wlan-ng/cfg80211.c | 2 +- drivers/usb/host/ehci-omap.c | 20 + drivers/usb/host/isp1760-hcd.c | 1 + drivers/usb/host/xhci-hub.c | 19 +- drivers/usb/musb/musb_gadget.c | 6 +- drivers/usb/musb/omap2430.c | 2 +- drivers/video/acornfb.c | 26 +- drivers/video/fbmem.c | 223 ++++-- fs/block_dev.c | 27 +- fs/btrfs/acl.c | 5 +- fs/btrfs/extent-tree.c | 37 +- fs/btrfs/ioctl.c | 24 +- fs/ceph/addr.c | 7 + fs/ceph/caps.c | 30 +- fs/ceph/file.c | 5 +- fs/ceph/inode.c | 7 +- fs/ceph/mds_client.c | 2 +- fs/ceph/snap.c | 2 +- fs/ceph/super.h | 4 +- fs/ceph/xattr.c | 12 +- fs/cifs/cifs_unicode.c | 14 +- fs/cifs/connect.c | 125 ++-- fs/cifs/sess.c | 19 +- fs/fuse/dir.c | 2 +- fs/hpfs/Kconfig | 1 - fs/hpfs/alloc.c | 118 ++-- fs/hpfs/anode.c | 138 ++-- fs/hpfs/buffer.c | 24 +- fs/hpfs/dir.c | 22 +- fs/hpfs/dnode.c | 174 +++--- fs/hpfs/ea.c | 136 ++-- fs/hpfs/file.c | 31 +- fs/hpfs/hpfs.h | 439 +++++++----- fs/hpfs/hpfs_fn.h | 80 +-- fs/hpfs/inode.c | 47 +- fs/hpfs/map.c | 56 +- fs/hpfs/name.c | 33 - fs/hpfs/namei.c | 106 +-- fs/hpfs/super.c | 118 ++-- fs/logfs/super.c | 8 +- fs/namei.c | 2 +- fs/nfs/nfs4filelayout.c | 27 +- fs/nfs/nfs4filelayout.h | 2 +- fs/nfs/nfs4filelayoutdev.c | 34 +- fs/nfs/nfs4proc.c | 6 + fs/nfs/pnfs.c | 34 +- fs/nfs/pnfs.h | 6 +- fs/nfs/read.c | 4 +- fs/nfs/write.c | 4 +- fs/nilfs2/alloc.c | 2 +- fs/partitions/efi.c | 6 + fs/proc/task_mmu.c | 12 +- fs/ubifs/log.c | 20 - fs/ubifs/replay.c | 18 +- fs/ubifs/super.c | 15 +- fs/xfs/linux-2.6/xfs_sync.c | 1 + fs/xfs/xfs_trans_ail.c | 47 +- include/drm/drm_fb_helper.h | 2 +- include/drm/drm_mm.h | 2 +- include/drm/drm_pciids.h | 5 + include/drm/radeon_drm.h | 1 + include/linux/bootmem.h | 2 + include/linux/capability.h | 13 +- include/linux/cred.h | 10 +- include/linux/fb.h | 1 + include/linux/flex_array.h | 2 +- include/linux/fs.h | 1 - include/linux/ftrace_event.h | 1 + include/linux/gfp.h | 2 + include/linux/mfd/wm831x/pdata.h | 2 + include/linux/mm.h | 24 +- include/linux/nfs_xdr.h | 1 + include/linux/pci_ids.h | 4 - include/linux/percpu.h | 2 +- include/linux/proc_fs.h | 2 + include/linux/ptrace.h | 13 +- include/linux/sched.h | 3 + include/linux/usb/usbnet.h | 1 + include/net/inet_ecn.h | 16 +- include/net/ip_vs.h | 17 + include/net/llc_pdu.h | 8 +- include/net/xfrm.h | 3 + include/scsi/scsi_device.h | 1 + include/trace/events/gfpflags.h | 6 +- init/Kconfig | 1 - kernel/capability.c | 12 + kernel/cred.c | 12 +- kernel/exit.c | 2 +- kernel/irq/proc.c | 2 +- kernel/power/suspend.c | 4 +- kernel/power/user.c | 5 +- kernel/ptrace.c | 17 + kernel/time/clocksource.c | 4 +- kernel/time/tick-broadcast.c | 12 +- kernel/trace/trace.c | 1 + kernel/trace/trace_events.c | 1 + lib/flex_array.c | 24 +- lib/vsprintf.c | 2 +- lib/xz/xz_dec_lzma2.c | 6 +- mm/memory.c | 19 +- mm/mlock.c | 5 +- mm/mmap.c | 11 +- mm/page_alloc.c | 57 ++- mm/page_cgroup.c | 2 +- mm/shmem.c | 149 +++-- mm/slub.c | 4 +- mm/swap.c | 3 + mm/vmscan.c | 2 +- net/8021q/vlan.c | 3 + net/8021q/vlan_dev.c | 3 - net/9p/client.c | 2 +- net/9p/protocol.c | 1 + net/9p/trans_common.c | 11 +- net/bluetooth/hci_core.c | 5 +- net/bluetooth/hci_event.c | 2 - net/bluetooth/l2cap_core.c | 1 + net/bridge/br_input.c | 2 +- net/bridge/br_netfilter.c | 2 +- net/bridge/netfilter/ebtables.c | 64 +-- net/can/bcm.c | 7 +- net/can/raw.c | 7 +- net/ceph/messenger.c | 26 +- net/ceph/osd_client.c | 4 +- net/core/dev.c | 38 +- net/dccp/options.c | 2 + net/dsa/Kconfig | 4 +- net/dsa/mv88e6131.c | 26 +- net/ipv4/devinet.c | 2 +- net/ipv4/fib_trie.c | 3 - net/ipv4/ip_fragment.c | 33 +- net/ipv4/route.c | 7 + net/ipv4/tcp_cubic.c | 9 +- net/ipv4/xfrm4_output.c | 8 +- net/ipv4/xfrm4_state.c | 1 + net/ipv6/addrconf.c | 2 +- net/ipv6/esp6.c | 2 +- net/ipv6/netfilter/ip6t_REJECT.c | 4 +- net/ipv6/route.c | 8 +- net/ipv6/udp.c | 2 +- net/ipv6/xfrm6_output.c | 6 +- net/ipv6/xfrm6_state.c | 1 + net/mac80211/cfg.c | 2 + net/mac80211/debugfs_netdev.c | 4 +- net/mac80211/tx.c | 4 + net/netfilter/ipvs/ip_vs_app.c | 17 +- net/netfilter/ipvs/ip_vs_conn.c | 16 +- net/netfilter/ipvs/ip_vs_core.c | 103 +++- net/netfilter/ipvs/ip_vs_ctl.c | 126 +++- net/netfilter/ipvs/ip_vs_est.c | 14 +- net/netfilter/ipvs/ip_vs_proto.c | 11 +- net/netfilter/ipvs/ip_vs_sync.c | 65 +- net/netfilter/nf_conntrack_netlink.c | 4 + net/netfilter/x_tables.c | 4 +- net/netfilter/xt_DSCP.c | 2 +- net/netfilter/xt_conntrack.c | 5 - net/unix/af_unix.c | 16 +- net/xfrm/xfrm_policy.c | 14 +- net/xfrm/xfrm_replay.c | 5 +- net/xfrm/xfrm_user.c | 3 + security/selinux/hooks.c | 3 +- security/selinux/ss/policydb.c | 10 +- sound/pci/au88x0/au88x0_pcm.c | 7 +- sound/pci/hda/patch_realtek.c | 30 +- sound/pci/hda/patch_via.c | 10 +- sound/soc/codecs/ssm2602.c | 10 +- sound/soc/codecs/uda134x.c | 2 - sound/soc/codecs/wm8903.c | 2 +- sound/soc/davinci/davinci-mcasp.c | 19 +- sound/soc/jz4740/jz4740-i2s.c | 2 +- sound/soc/mid-x86/sst_platform.c | 6 + sound/soc/samsung/goni_wm8994.c | 8 +- sound/soc/soc-core.c | 2 + sound/usb/format.c | 4 +- sound/usb/quirks.c | 1 + tools/perf/Makefile | 16 +- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-test.c | 2 +- tools/perf/builtin-top.c | 8 +- tools/perf/util/evlist.c | 153 +++-- tools/perf/util/evlist.h | 3 +- tools/perf/util/python.c | 2 +- 466 files changed, 4774 insertions(+), 2927 deletions(-) create mode 100644 arch/arm/configs/at91x40_defconfig ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Auto-merging block/blk.h CONFLICT (content): Merge conflict in block/blk.h Auto-merging drivers/block/paride/pcd.c CONFLICT (content): Merge conflict in drivers/block/paride/pcd.c Auto-merging drivers/cdrom/viocd.c CONFLICT (content): Merge conflict in drivers/cdrom/viocd.c Auto-merging fs/block_dev.c Automatic merge failed; fix conflicts and then commit the result.