From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 3fd9952..5933f2a master -> origin/mast## Checking out files: 7% (37/524) Checking out files: 8% (42/524) Checking out files: 9% (48/524) Checking out files: 10% (53/524) Checking out files: 11% (58/5Removing patches/ ## # 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-From . * branch block-for-linus -> FETCH_HEAD From . * branch block-for-next -> FETCH_HEAD From . * branch libata-fixes -> FETCH_HEAD From . * branch libata-upstream -> FETCH_HEAD Checking out files: 18% (2102/11139) Checking out files: 19% (2117/11139) Checking out files: 20% (2228/11139) Checking out files: 21% (2340/11139) Checking out files: 22% (2451/11139) Checking out files: 23% (2562/11139) Checking out files: 23% (2646/11139) Checking out files: 24% (2674/11139) Checking out files: 25% (2785/11139) Checking out files: 26% (2897/11139) Checking out files: 26% (3007/11139) Checking out files: 27% (3008/11139) Checking out files: 28% (3119/11139) Checking out files: 29% (3231/11139) Checking out files: 30% (3342/11139) Checking out files: 30% (3415/11139) Checking out files: 31% (3454/11139) Checking out files: 32% (3565/11139) Checking out files: 33% (3676/11139) Checking out files: 34% (3788/11139) Checking out files: 34% (3805/11139) Checking out files: 35% (3899/11139) Checking out files: 36% (4011/11139) Checking out files: 37% (4122/11139) Checking out files: 37% (4156/11139) Checking out files: 38% (4233/11139) Checking out files: 39% (4345/11139) Checking out files: 40% (4456/11139) Checking out files: 41% (4567/11139) Checking out files: 41% (4571/11139) Checking out files: 42% (4679/11139) Checking out files: 43% (4790/11139) Checking out files: 43% (4876/11139) Checking out files: 44% (4902/11139) Checking out files: 45% (5013/11139) Checking out files: 46% (5124/11139) Checking out files: 46% (5170/11139) Checking out files: 47% (5236/11139) Checking out files: 48% (5347/11139) Checking out files: 48% (5419/11139) Checking out files: 49% (5459/11139) Checking out files: 50% (5570/11139) Checking out files: 51% (5681/11139) Checking out files: 51% (5714/11139) Checking out files: 52% (5793/11139) Checking out files: 53% (5904/11139) Checking out files: 53% (5975/11139) Checking out files: 54% (6016/11139) Checking out files: 55% (6127/11139) Checking out files: 56% (6238/11139) Checking out files: 56% (6243/11139) Checking out files: 57% (6350/11139) Checking out files: 58% (6461/11139) Checking out files: 58% (6531/11139) Checking out files: 59% (6573/11139) Checking out files: 60% (6684/11139) Checking out files: 61% (6795/11139) Checking out files: 61% (6835/11139) Checking out files: 62% (6907/11139) Checking out files: 63% (7018/11139) Checking out files: 63% (7094/11139) Checking out files: 64% (7129/11139) Checking out files: 64% (7194/11139) Checking out files: 65% (7241/11139) Checking out files: 66% (7352/11139) Checking out files: 67% (7464/11139) Checking out files: 67% (7548/11139) Checking out files: 68% (7575/11139) Checking out files: 69% (7686/11139) Checking out files: 70% (7798/11139) Checking out files: 70% (7877/11139) Checking out files: 71% (7909/11139) Checking out files: 72% (8021/11139) Checking out files: 72% (8090/11139) Checking out files: 73% (8132/11139) Checking out files: 74% (8243/11139) Checking out files: 74% (8292/11139) Checking out files: 75% (8355/11139) Checking out files: 76% (8466/11139) Checking out files: 76% (8535/11139) Checking out files: 77% (8578/11139) Checking out files: 78% (8689/11139) Checking out files: 78% (8729/11139) Checking out files: 79% (8800/11139) Checking out files: 80% (8912/11139) Checking out files: 80% (8980/11139) Checking out files: 81% (9023/11139) Checking out files: 82% (9134/11139) Checking out files: 83% (9246/11139) Checking out files: 83% (9272/11139) Checking out files: 84% (9357/11139) Checking out files: 85% (9469/11139) Checking out files: 85% (9535/11139) Checking out files: 86% (9580/11139) Checking out files: 87% (9691/11139) Checking out files: 87% (9782/11139) Checking out files: 88% (9803/11139) Checking out files: 89% (9914/11139) Checking out files: 90% (10026/11139) Checking out files: 90% (10064/11139) Checking out files: 91% (10137/11139) Checking out files: 92% (10248/11139) Checking out files: 92% (10318/11139) Checking out files: 93% (10360/11139) Checking out files: 94% (10471/11139) Checking out files: 94% (10578/11139) Checking out files: 95% (10583/11139) Checking out files: 96% (10694/11139) Checking out files: 97% (10805/11139) Checking out files: 97% (10840/11139) Checking out files: 98% (10917/11139) Checking out files: 99% (11028/11139) Checking out files: 99% (11095/11139) Checking out files: 100% (11139/11139) Checking out files: 100% (11139/11139), done. Switched to branch 'device-mapper' Checking out files: 11% (1295/11139) Checking out files: 12% (1337/11139) Checking out files: 13% (1449/11139) Checking out files: 14% (1560/11139) Checking out files: 15% (1671/11139) Checking out files: 16% (1783/11139) Checking out files: 17% (1894/11139) Checking out files: 17% (1896/11139) Checking out files: 18% (2006/11139) Checking out files: 19% (2117/11139) Checking out files: 20% (2228/11139) Checking out files: 21% (2340/11139) Checking out files: 21% (2443/11139) Checking out files: 22% (2451/11139) Checking out files: 23% (2562/11139) Checking out files: 24% (2674/11139) Checking out files: 25% (2785/11139) Checking out files: 26% (2897/11139) Checking out files: 26% (2921/11139) Checking out files: 27% (3008/11139) Checking out files: 28% (3119/11139) Checking out files: 29% (3231/11139) Checking out files: 29% (3282/11139) Checking out files: 30% (3342/11139) Checking out files: 31% (3454/11139) Checking out files: 32% (3565/11139) Checking out files: 33% (3676/11139) Checking out files: 33% (3739/11139) Checking out files: 34% (3788/11139) Checking out files: 35% (3899/11139) Checking out files: 36% (4011/11139) Checking out files: 36% (4052/11139) Checking out files: 37% (4122/11139) Checking out files: 38% (4233/11139) Checking out files: 39% (4345/11139) Checking out files: 39% (4356/11139) Checking out files: 40% (4456/11139) Checking out files: 41% (4567/11139) Checking out files: 42% (4679/11139) Checking out files: 42% (4686/11139) Checking out files: 43% (4790/11139) Checking out files: 44% (4902/11139) Checking out files: 44% (4982/11139) Checking out files: 45% (5013/11139) Checking out files: 46% (5124/11139) Checking out files: 47% (5236/11139) Checking out files: 47% (5336/11139) Checking out files: 48% (5347/11139) Checking out files: 49% (5459/11139) Checking out files: 49% (5520/11139) Checking out files: 50% (5570/11139) Checking out files: 51% (5681/11139) Checking out files: 51% (5790/11139) Checking out files: 52% (5793/11139) Checking out files: 53% (5904/11139) Checking out files: 54% (6016/11139) Checking out files: 54% (6073/11139) Checking out files: 55% (6127/11139) Checking out files: 56% (6238/11139) Checking out files: 57% (6350/11139) Checking out files: 57% (6413/11139) Checking out files: 58% (6461/11139) Checking out files: 59% (6573/11139) Checking out files: 60% (6684/11139) Checking out files: 60% (6704/11139) Checking out files: 61% (6795/11139) Checking out files: 61% (6886/11139) Checking out files: 62% (6907/11139) Checking out files: 63% (7018/11139) Checking out files: 64% (7129/11139) Checking out files: 64% (7235/11139) Checking out files: 65% (7241/11139) Checking out files: 66% (7352/11139) Checking out files: 67% (7464/11139) Checking out files: 67% (7482/11139) Checking out files: 68% (7575/11139) Checking out files: 69% (7686/11139) Checking out files: 69% (7732/11139) Checking out files: 70% (7798/11139) Checking out files: 70% (7890/11139) Checking out files: 71% (7909/11139) Checking out files: 72% (8021/11139) Checking out files: 72% (8092/11139) Checking out files: 73% (8132/11139) Checking out files: 74% (8243/11139) Checking out files: 74% (8253/11139) Checking out files: 75% (8355/11139) Checking out files: 75% (8387/11139) Checking out files: 76% (8466/11139) Checking out files: 76% (8547/11139) Checking out files: 77% (8578/11139) Checking out files: 78% (8689/11139) Checking out files: 78% (8690/11139) Checking out files: 79% (8800/11139) Checking out files: 79% (8898/11139) Checking out files: 80% (8912/11139) Checking out files: 81% (9023/11139) Checking out files: 81% (9127/11139) Checking out files: 82% (9134/11139) Checking out files: 83% (9246/11139) Checking out files: 83% (9349/11139) Checking out files: 84% (9357/11139) Checking out files: 85% (9469/11139) Checking out files: 86% (9580/11139) Checking out files: 86% (9595/11139) Checking out files: 87% (9691/11139) Checking out files: 88% (9803/11139) Checking out files: 88% (9833/11139) Checking out files: 89% (9914/11139) Checking out files: 90% (10026/11139) Checking out files: 90% (10070/11139) Checking out files: 91% (10137/11139) Checking out files: 92% (10248/11139) Checking out files: 93% (10360/11139) Checking out files: 93% (10362/11139) Checking out files: 94% (10471/11139) Checking out files: 95% (10583/11139) Checking out files: 95% (10637/11139) Checking out files: 96% (10694/11139) Checking out files: 97% (10805/11139) Checking out files: 97% (10872/11139) Checking out files: 98% (10917/11139) Checking out files: 99% (11028/11139) Checking out files: 99% (11123/11139) Checking out files: 100% (11139/11139) Checking out files: 100% (11139/11139), done. Switched to branch '2.6.39-rc3-stor18' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + 5e4de8c...c66ac9d master -> scsi-post-merge (forced update) Checking out files: 21% (2660/12542) Checking out files: 22% (2760/12542) Checking out files: 23% (2885/12542) Checking out files: 24% (3011/12542) Checking out files: 24% (3121/12542) Checking out files: 25% (3136/12542) Checking out files: 26% (3261/12542) Checking out files: 27% (3387/12542) Checking out files: 28% (3512/12542) Checking out files: 29% (3638/12542) Checking out files: 29% (3661/12542) Checking out files: 30% (3763/12542) Checking out files: 31% (3889/12542) Checking out files: 32% (4014/12542) Checking out files: 33% (4139/12542) Checking out files: 33% (4151/12542) Checking out files: 34% (4265/12542) Checking out files: 35% (4390/12542) Checking out files: 36% (4516/12542) Checking out files: 36% (4531/12542) Checking out files: 37% (4641/12542) Checking out files: 38% (4766/12542) Checking out files: 39% (4892/12542) Checking out files: 40% (5017/12542) Checking out files: 40% (5140/12542) Checking out files: 41% (5143/12542) Checking out files: 42% (5268/12542) Checking out files: 43% (5394/12542) Checking out files: 44% (5519/12542) Checking out files: 44% (5614/12542) Checking out files: 45% (5644/12542) Checking out files: 46% (5770/12542) Checking out files: 47% (5895/12542) Checking out files: 47% (5968/12542) Checking out files: 48% (6021/12542) Checking out files: 49% (6146/12542) Checking out files: 50% (6271/12542) Checking out files: 50% (6284/12542) Checking out files: 51% (6397/12542) Checking out files: 52% (6522/12542) Checking out files: 52% (6549/12542) Checking out files: 53% (6648/12542) Checking out files: 54% (6773/12542) Checking out files: 54% (6838/12542) Checking out files: 55% (6899/12542) Checking out files: 56% (7024/12542) Checking out files: 56% (7130/12542) Checking out files: 57% (7149/12542) Checking out files: 58% (7275/12542) Checking out files: 58% (7399/12542) Checking out files: 59% (7400/12542) Checking out files: 60% (7526/12542) Checking out files: 60% (7646/12542) Checking out files: 61% (7651/12542) Checking out files: 62% (7777/12542) Checking out files: 63% (7902/12542) Checking out files: 63% (7949/12542) Checking out files: 64% (8027/12542) Checking out files: 65% (8153/12542) Checking out files: 65% (8212/12542) Checking out files: 66% (8278/12542) Checking out files: 67% (8404/12542) Checking out files: 68% (8529/12542) Checking out files: 68% (8552/12542) Checking out files: 69% (8654/12542) Checking out files: 70% (8780/12542) Checking out files: 71% (8905/12542) Checking out files: 71% (8957/12542) Checking out files: 72% (9031/12542) Checking out files: 73% (9156/12542) Checking out files: 73% (9276/12542) Checking out files: 74% (9282/12542) Checking out files: 75% (9407/12542) Checking out files: 76% (9532/12542) Checking out files: 76% (9597/12542) Checking out files: 77% (9658/12542) Checking out files: 78% (9783/12542) Checking out files: 78% (9850/12542) Checking out files: 79% (9909/12542) Checking out files: 80% (10034/12542) Checking out files: 80% (10107/12542) Checking out files: 81% (10160/12542) Checking out files: 82% (10285/12542) Checking out files: 82% (10393/12542) Checking out files: 83% (10410/12542) Checking out files: 84% (10536/12542) Checking out files: 85% (10661/12542) Checking out files: 85% (10673/12542) Checking out files: 86% (10787/12542) Checking out files: 87% (10912/12542) Checking out files: 87% (10945/12542) Checking out files: 88% (11037/12542) Checking out files: 89% (11163/12542) Checking out files: 89% (11208/12542) Checking out files: 90% (11288/12542) Checking out files: 91% (11414/12542) Checking out files: 91% (11500/12542) Checking out files: 92% (11539/12542) Checking out files: 93% (11665/12542) Checking out files: 94% (11790/12542) Checking out files: 94% (11821/12542) Checking out files: 95% (11915/12542) Checking out files: 96% (12041/12542) Checking out files: 96% (12106/12542) Checking out files: 97% (12166/12542) Checking out files: 98% (12292/12542) Checking out files: 98% (12320/12542) Checking out files: 99% (12417/12542) Checking out files: 100% (12542/12542) Checking out files: 100% (12542/12542), done. Switched to branch 'scsi-post-merge' Switched to branch '2.6.39-rc3-stor18' From . * branch scsi-post-merge -> FETCH_HEAD | 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 | 21 +-- 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, 5456 insertions(+), 2396 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 ## Merge made by recursive. 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/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/message/i2o/i2o_block.c | 1 - drivers/s390/char/tape_block.c | 1 - fs/block_dev.c | 27 ++++++++++++++++++--------- 17 files changed, 21 insertions(+), 27 deletions(-) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes libata-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream libata-upstream ## Already up-to-date. ## # quilt /pub/linux/kernel/people/agk/patches/2.6/editing/ device-mapper section NEXT_PATCHES ## sending incremental file list ./ base dm-add-flakey-target.patch dm-add-ioband.patch dm-bufio.patch dm-crypt-wipe-keys-string-immediately-after-key-is-set.patch dm-delay-unplug-queue.patch dm-emulate-BLKRRPART-ioctl.patch dm-export-dm_disk.patch dm-fix-opening-log-and-cow-devices-for-read-only-tables.patch dm-ioctl-add-flag-to-wipe-buffers-for-secure-data.patch dm-ioctl-prepare-for-crypt-key-wiping.patch dm-iostats.patch dm-kcopyd-add-async-destruction-option.patch dm-loop.patch dm-memcache.patch dm-mpath-add-alua.patch dm-mpath-allow-table-load-with-no-priority-groups.patch dm-mpath-fail-message-ioctl-if-specified-path-is-not-valid.patch dm-mpath-improve-err-mesgs.patch dm-mpath-pg_timeout.patch dm-mpath-refactor-pg_init-trigger.patch dm-multisnap-common.patch dm-multisnap-daniel.patch dm-multisnap-mikulas-alloc.patch dm-multisnap-mikulas-blocks.patch dm-multisnap-mikulas-btree.patch dm-multisnap-mikulas-commit.patch dm-multisnap-mikulas-common.patch dm-multisnap-mikulas-config.patch dm-multisnap-mikulas-delete.patch dm-multisnap-mikulas-freelist.patch dm-multisnap-mikulas-headers.patch dm-multisnap-mikulas-io.patch dm-multisnap-mikulas-snaps.patch dm-raid1-clear-region_hash-on-suspend.patch dm-raid1-increase-dm-io-pages.patch dm-raid1-mempool-bug-workaround-reversion.patch dm-raid1-read-balancing.patch dm-raid1-separate-region_hash-interface-part2-to-be-split-and-fixed.patch dm-raid45-to-be-split.patch dm-region_hash-change-primes.patch dm-snapshot-cleanup-style.patch dm-snapshot-invalidate-from-workqueue.patch dm-snapshot-release-memory-if-invalid.patch dm-stripe-implement-merge-method.patch dm-table-extend-device-name-lookups.patch dm-table-limit-max_segments-when-no-merge_bvec-fn.patch dm-throttle.patch dm-tidy-io-initialisation-functions.patch dm-userspace.patch end git-update1.patch git-update2.patch git-update3.patch git-update4.patch git-update5.patch mm next series series.html uml-fixes.patch v6-1-4-dm-replicator-documentation-and-module-registry.patch v6-2-4-dm-replicator-replication-log-and-site-link-handler-interfaces-and-main-replicator-module.patch v6-3-4-dm-replicator-ringbuffer-replication-log-handler.patch v6-4-4-dm-replicator-blockdev-site-link-handler.patch sent 55467060 bytes received 1250 bytes 12326291.11 bytes/sec total size is 55454258 speedup is 1.00 Using base v2.6.38-rc4-213-g055d219 ## # gitrebase /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git master scsi-post-merge merge-base ## First, rewinding head to replay your work on top of it... Fast-forwarded scsi-post-merge to 2.6.39-rc3-stor18. Already up-to-date. ## # check ## Differences exist, continuing ## # label ## [2.6.39-rc3-stor18 85a705f] 2.6.39-rc3-stor18 Committer: James Bottomley Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly: git config --global user.name "Your Name" git config --global user.email you@example.com After doing this, you may fix the identity used for this commit with: git commit --amend --reset-author 1 files changed, 1 insertions(+), 1 deletions(-) ## # diff /pub/linux/kernel/people/jejb/storage-tree/patch- ## ## # log /pub/linux/kernel/people/jejb/storage-tree/log- ##