From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 0143832..e53beac master -> origin/master * [new tag] v2.6.37-rc2## # errors /pubSwitched to branch '2.6.37-rc1-stor8' From . * branch scsi-rc-fixes -> FETCH_HEAD Checking out files: 46% (103/221) Checking out files: 47% (104/221) Checking out files: 48% (107/221) Checking out files: 49% (109/221) CheckUpdating 151f52f..59055a9 Fast-forward arch/arm/mach-shmobile/Kconfig | 2 + arch/arm/mach-shmobile/board-ap4evb.c | 46 ++++- arch/arm/mach-shmobile/clock-sh7372.c | 102 ++++++++ arch/arm/mach-shmobile/include/mach/gpio.h | 4 +- arch/arm/mach-shmobile/include/mach/sh7372.h | 2 + arch/ia64/hp/sim/simscsi.c | 4 +- arch/sh/Kconfig | 1 + arch/sh/Makefile | 3 - arch/sh/boards/Kconfig | 7 - arch/sh/boards/Makefile | 2 + arch/sh/boards/board-edosk7705.c | 78 ++++++ .../setup.c => board-secureedge5410.c} | 38 +--- arch/sh/boards/mach-edosk7705/Makefile | 5 - arch/sh/boards/mach-edosk7705/io.c | 71 ------ arch/sh/boards/mach-edosk7705/setup.c | 36 --- arch/sh/boards/mach-microdev/io.c | 246 +------------------- arch/sh/boards/mach-microdev/setup.c | 23 +-- arch/sh/boards/mach-se/7206/Makefile | 2 +- arch/sh/boards/mach-se/7206/io.c | 104 -------- arch/sh/boards/mach-se/7206/irq.c | 4 +- arch/sh/boards/mach-se/7206/setup.c | 15 -- arch/sh/boards/mach-se/770x/Makefile | 2 +- arch/sh/boards/mach-se/770x/io.c | 156 ------------- arch/sh/boards/mach-se/770x/setup.c | 22 -- arch/sh/boards/mach-se/7751/Makefile | 2 +- arch/sh/boards/mach-se/7751/io.c | 119 ---------- arch/sh/boards/mach-se/7751/setup.c | 18 -- arch/sh/boards/mach-snapgear/Makefile | 5 - arch/sh/boards/mach-snapgear/io.c | 121 ---------- arch/sh/boards/mach-systemh/Makefile | 13 - arch/sh/boards/mach-systemh/io.c From /pub/scm/linux/kernel/git/axboe/linux-2.6-block cedb4a7..3e9bb2a for-linus -> block-for-linus From . * branch block-for-linus -> FETCH_HEAD From /pub/scm/linux/kernel/git/axboe/linux-2.6-block + db6af4e...82cc2e4 for-next -> block-for-next (forced update) From . * branch block-for-next -> FETCH_HEAD From /pub/scm/linux/kernel/git/jgarzik/libata-dev fad16e7..f254379 upstream-fixes -> libata-fixes From . * branch libata-fixes -> FETCH_HEAD From /pub/scm/linux/kernel/git/jgarzik/libata-dev 89692c0..a74350f upstream -> libata-upstream From . * branch libata-upstream -> FETCH_HEAD Checking out files: 35% (227/642) Checking out files: 36% (232/642) Checking out files: 37% (238/642) Checking out files: 38% (244/642) Checking out files: 39% (251/642) Checking out files: 40% (257/642) Checking out files: 41% (264/642) Checking out files: 42% (270/642) Checking out files: 43% (277/642) Checking out files: 44% (283/642) Checking out files: 45% (289/642) Checking out files: 46% (296/642) Checking out files: 47% (302/642) Checking out files: 48% (309/642) Checking out files: 49% (315/642) Checking out files: 50% (321/642) Checking out files: 51% (328/642) Checking out files: 52% (334/642) Checking out files: 53% (341/642) Checking out files: 53% (344/642) Checking out files: 54% (347/642) Checking out files: 55% (354/642) Checking out files: 56% (360/642) Checking out files: 57% (366/642) Checking out files: 58% (373/642) Checking out files: 59% (379/642) Checking out files: 60% (386/642) Checking out files: 61% (392/642) Checking out files: 62% (399/642) Checking out files: 63% (405/642) Checking out files: 64% (411/642) Checking out files: 65% (418/642) Checking out files: 66% (424/642) Checking out files: 67% (431/642) Checking out files: 68% (437/642) Checking out files: 69% (443/642) Checking out files: 70% (450/642) Checking out files: 71% (456/642) Checking out files: 72% (463/642) Checking out files: 73% (469/642) Checking out files: 74% (476/642) Checking out files: 75% (482/642) Checking out files: 76% (488/642) Checking out files: 77% (495/642) Checking out files: 78% (501/642) Checking out files: 79% (508/642) Checking out files: 80% (514/642) Checking out files: 81% (521/642) Checking out files: 82% (527/642) Checking out files: 82% (529/642) Checking out files: 83% (533/642) Checking out files: 84% (540/642) Checking out files: 85% (546/642) Checking out files: 86% (553/642) Checking out files: 87% (559/642) Checking out files: 88% (565/642) Checking out files: 89% (572/642) Checking out files: 90% (578/642) Checking out files: 91% (585/642) Checking out files: 92% (591/642) Checking out files: 93% (598/642) Checking out files: 94% (604/642) Checking out files: 95% (610/642) Checking out files: 96% (617/642) Checking out files: 97% (623/642) Checking out files: 98% (630/642) Checking out files: 99% (636/642) Checking out files: 100% (642/642) Checking out files: 100% (642/642), done. Switched to branch 'device-mapper' Checking out files: 35% (230/642) Checking out files: 36% (232/642) Checking out files: 37% (238/642) Checking out files: 38% (244/642) Checking out files: 39% (251/642) Checking out files: 40% (257/642) Checking out files: 41% (264/642) Checking out files: 42% (270/642) Checking out files: 43% (277/642) Checking out files: 44% (283/642) Checking out files: 45% (289/642) Checking out files: 46% (296/642) Checking out files: 47% (302/642) Checking out files: 48% (309/642) Checking out files: 49% (315/642) Checking out files: 50% (321/642) Checking out files: 51% (328/642) Checking out files: 52% (334/642) Checking out files: 53% (341/642) Checking out files: 54% (347/642) Checking out files: 55% (354/642) Checking out files: 56% (360/642) Checking out files: 57% (366/642) Checking out files: 58% (373/642) Checking out files: 59% (379/642) Checking out files: 59% (380/642) Checking out files: 60% (386/642) Checking out files: 61% (392/642) Checking out files: 62% (399/642) Checking out files: 63% (405/642) Checking out files: 64% (411/642) Checking out files: 65% (418/642) Checking out files: 66% (424/642) Checking out files: 67% (431/642) Checking out files: 68% (437/642) Checking out files: 69% (443/642) Checking out files: 70% (450/642) Checking out files: 71% (456/642) Checking out files: 72% (463/642) Checking out files: 73% (469/642) Checking out files: 74% (476/642) Checking out files: 75% (482/642) Checking out files: 76% (488/642) Checking out files: 77% (495/642) Checking out files: 78% (501/642) Checking out files: 79% (508/642) Checking out files: 80% (514/642) Checking out files: 81% (521/642) Checking out files: 82% (527/642) Checking out files: 83% (533/642) Checking out files: 84% (540/642) Checking out files: 85% (546/642) Checking out files: 86% (553/642) Checking out files: 87% (559/642) Checking out files: 88% (565/642) Checking out files: 89% (572/642) Checking out files: 90% (578/642) Checking out files: 90% (582/642) Checking out files: 91% (585/642) Checking out files: 92% (591/642) Checking out files: 93% (598/642) Checking out files: 94% (604/642) Checking out files: 95% (610/642) Checking out files: 96% (617/642) Checking out files: 97% (623/642) Checking out files: 98% (630/642) Checking out files: 99% (636/642) Checking out files: 100% (642/642) Checking out files: 100% (642/642), done. Switched to branch '2.6.37-rc1-stor8' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + dbcb58c...2bfc96a master -> scsi-post-merge (forced update) Checking out files: 16% (1785/11044) Checking out files: 17% (1878/11044) Checking out files: 17% (1984/11044) Checking out files: 18% (1988/11044) Checking out files: 19% (2099/11044) Checking out files: 19% (2206/11044) Checking out files: 20% (2209/11044) Checking out files: 21% (2320/11044) Checking out files: 21% (2359/11044) Checking out files: 22% (2430/11044) Checking out files: 23% (2541/11044) Checking out files: 23% (2570/11044) Checking out files: 23% (2647/11044) Checking out files: 24% (2651/11044) Checking out files: 25% (2761/11044) Checking out files: 25% (2787/11044) Checking out files: 26% (2872/11044) Checking out files: 26% (2924/11044) Checking out files: 27% (2982/11044) Checking out files: 27% (3066/11044) Checking out files: 28% (3093/11044) Checking out files: 29% (3203/11044) Checking out files: 29% (3213/11044) Checking out files: 30% (3314/11044) Checking out files: 31% (3424/11044) Checking out files: 32% (3535/11044) Checking out files: 33% (3645/11044) Checking out files: 33% (3682/11044) Checking out files: 34% (3755/11044) Checking out files: 35% (3866/11044) Checking out files: 35% (3872/11044) Checking out files: 36% (3976/11044) Checking out files: 37% (4087/11044) Checking out files: 37% (4136/11044) Checking out files: 38% (4197/11044) Checking out files: 39% (4308/11044) Checking out files: 39% (4401/11044) Checking out files: 40% (4418/11044) Checking out files: 41% (4529/11044) Checking out files: 41% (4634/11044) Checking out files: 42% (4639/11044) Checking out files: 43% (4749/11044) Checking out files: 43% (4786/11044) Checking out files: 43% (4828/11044) Checking out files: 44% (4860/11044) Checking out files: 44% (4899/11044) Checking out files: 45% (4970/11044) Checking out files: 46% (5081/11044) Checking out files: 46% (5117/11044) Checking out files: 47% (5191/11044) Checking out files: 48% (5302/11044) Checking out files: 48% (5326/11044) Checking out files: 48% (5382/11044) Checking out files: 49% (5412/11044) Checking out files: 49% (5506/11044) Checking out files: 49% (5508/11044) Checking out files: 50% (5522/11044) Checking out files: 51% (5633/11044) Checking out files: 51% (5653/11044) Checking out files: 51% (5655/11044) Checking out files: 52% (5743/11044) Checking out files: 52% (5773/11044) Checking out files: 53% (5854/11044) Checking out files: 53% (5929/11044) Checking out files: 54% (5964/11044) Checking out files: 55% (6075/11044) Checking out files: 55% (6109/11044) Checking out files: 56% (6185/11044) Checking out files: 56% (6223/11044) Checking out files: 57% (6296/11044) Checking out files: 58% (6406/11044) Checking out files: 58% (6449/11044) Checking out files: 59% (6516/11044) Checking out files: 60% (6627/11044) Checking out files: 60% (6684/11044) Checking out files: 61% (6737/11044) Checking out files: 62% (6848/11044) Checking out files: 62% (6906/11044) Checking out files: 63% (6958/11044) Checking out files: 64% (7069/11044) Checking out files: 64% (7141/11044) Checking out files: 65% (7179/11044) Checking out files: 66% (7290/11044) Checking out files: 67% (7400/11044) Checking out files: 67% (7418/11044) Checking out files: 68% (7510/11044) Checking out files: 69% (7621/11044) Checking out files: 69% (7650/11044) Checking out files: 70% (7731/11044) Checking out files: 71% (7842/11044) Checking out files: 72% (7952/11044) Checking out files: 72% (7980/11044) Checking out files: 73% (8063/11044) Checking out files: 74% (8173/11044) Checking out files: 74% (8247/11044) Checking out files: 75% (8283/11044) Checking out files: 76% (8394/11044) Checking out files: 76% (8457/11044) Checking out files: 77% (8504/11044) Checking out files: 78% (8615/11044) Checking out files: 78% (8646/11044) Checking out files: 79% (8725/11044) Checking out files: 79% (8832/11044) Checking out files: 80% (8836/11044) Checking out files: 81% (8946/11044) Checking out files: 81% (9056/11044) Checking out files: 82% (9057/11044) Checking out files: 83% (9167/11044) Checking out files: 84% (9277/11044) Checking out files: 84% (9279/11044) Checking out files: 85% (9388/11044) Checking out files: 86% (9498/11044) Checking out files: 86% (9502/11044) Checking out files: 87% (9609/11044) Checking out files: 87% (9714/11044) Checking out files: 88% (9719/11044) Checking out files: 89% (9830/11044) Checking out files: 89% (9934/11044) Checking out files: 90% (9940/11044) Checking out files: 91% (10051/11044) Checking out files: 91% (10138/11044) Checking out files: 92% (10161/11044) Checking out files: 93% (10271/11044) Checking out files: 93% (10353/11044) Checking out files: 94% (10382/11044) Checking out files: 95% (10492/11044) Checking out files: 95% (10572/11044) Checking out files: 96% (10603/11044) Checking out files: 97% (10713/11044) Checking out files: 97% (10797/11044) Checking out files: 98% (10824/11044) Checking out files: 99% (10934/11044) Checking out files: 99% (11028/11044) Checking out files: 100% (11044/11044) Checking out files: 100% (11044/11044), done. Switched to branch 'scsi-post-merge' Switched to branch '2.6.37-rc1-stor8' From . * branch scsi-post-merge -> FETCH_HEAD %) rename drivers/{char => tty}/tty_io.c (100%) rename drivers/{char => tty}/tty_ioctl.c (100%) rename drivers/{char => tty}/tty_ldisc.c (100%) rename drivers/{char => tty}/tty_mutex.c (100%) rename drivers/{char => tty}/tty_port.c (100%) rename drivers/{char => tty/vt}/.gitignore (100%) create mode 100644 drivers/tty/vt/Makefile rename drivers/{char => tty/vt}/consolemap.c (100%) rename drivers/{char => tty/vt}/cp437.uni (100%) rename drivers/{char => tty/vt}/defkeymap.c_shipped (100%) rename drivers/{char => tty/vt}/defkeymap.map (100%) rename drivers/{char => tty/vt}/keyboard.c (100%) rename drivers/{char => tty/vt}/selection.c (100%) rename drivers/{char => tty/vt}/vc_screen.c (100%) rename drivers/{char => tty/vt}/vt.c (100%) rename drivers/{char => tty/vt}/vt_ioctl.c (100%) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-linus block-for-linus ## Auto-merging drivers/scsi/scsi_error.c Auto-merging drivers/usb/storage/uas.c Merge made by recursive. Documentation/block/switching-sched.txt | 8 +- Documentation/kernel-parameters.txt | 2 +- Documentation/rbtree.txt | 4 +- block/blk-core.c | 11 +-- block/blk-ioc.c | 14 -- block/blk-map.c | 2 + block/blk-throttle.c | 2 +- block/compat_ioctl.c | 4 +- block/elevator.c | 4 +- block/ioctl.c | 7 +- block/scsi_ioctl.c | 34 ++++-- drivers/block/amiflop.c | 2 +- drivers/block/aoe/aoeblk.c | 3 - drivers/block/ataflop.c | 2 +- drivers/block/cciss.c | 131 +++++++++---------- drivers/block/cciss.h | 4 + drivers/block/drbd/drbd_actlog.c | 42 ++++--- drivers/block/drbd/drbd_int.h | 52 ++++---- drivers/block/drbd/drbd_main.c | 148 ++++++++++++--------- drivers/block/drbd/drbd_nl.c | 25 +++- drivers/block/drbd/drbd_proc.c | 1 - drivers/block/drbd/drbd_receiver.c | 217 +++++-------------------------- drivers/block/drbd/drbd_req.c | 38 +++--- drivers/block/drbd/drbd_worker.c | 23 +--- drivers/block/loop.c | 6 - drivers/block/xen-blkfront.c | 55 +++++---- drivers/md/md.c | 20 ++-- drivers/scsi/scsi_error.c | 18 +-- drivers/usb/storage/uas.c | 5 +- fs/bio.c | 23 +++- fs/ioprio.c | 13 +-- include/linux/bio.h | 4 - include/linux/blk_types.h | 6 +- include/linux/blkdev.h | 3 +- include/linux/drbd.h | 2 +- include/linux/iocontext.h | 1 - kernel/trace/blktrace.c | 4 - 37 files changed, 390 insertions(+), 550 deletions(-) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Auto-merging drivers/ata/libata-scsi.c Removing drivers/staging/tidspbridge/core/dsp-mmu.c Removing drivers/staging/tidspbridge/include/dspbridge/dsp-mmu.h Merge made by recursive. Documentation/ABI/obsolete/proc-pid-oom_adj | 22 + .../filesystems/xfs-delayed-logging-design.txt | 11 - Documentation/leds-class.txt | 21 +- Documentation/leds/leds-lp5521.txt | 88 ++ Documentation/leds/leds-lp5523.txt | 83 ++ Documentation/networking/ip-sysctl.txt | 9 + Documentation/sysctl/kernel.txt | 14 + MAINTAINERS | 14 +- arch/arm/Kconfig | 2 +- arch/arm/common/gic.c | 28 +- arch/arm/include/asm/hardware/it8152.h | 2 +- arch/arm/kernel/hw_breakpoint.c | 3 +- arch/arm/kernel/perf_event.c | 2 +- arch/arm/kernel/stacktrace.c | 2 +- arch/arm/kernel/traps.c | 5 +- arch/arm/kernel/unwind.c | 2 +- arch/arm/mach-ep93xx/include/mach/dma.h | 111 ++- arch/arm/mach-kirkwood/common.c | 7 +- arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +- arch/arm/mach-kirkwood/lacie_v2-common.c | 14 - arch/arm/mach-kirkwood/lacie_v2-common.h | 2 - arch/arm/mach-kirkwood/mpp.c | 4 +- arch/arm/mach-kirkwood/netspace_v2-setup.c | 6 +- arch/arm/mach-kirkwood/netxbig_v2-setup.c | 4 +- arch/arm/mach-kirkwood/ts41x-setup.c | 14 +- arch/arm/mach-mmp/include/mach/cputype.h | 3 +- arch/arm/mach-mv78xx0/mpp.c | 4 +- arch/arm/mach-orion5x/mpp.c | 4 +- arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- arch/arm/mach-pxa/cm-x2xx.c | 2 - arch/arm/mach-pxa/saar.c | 2 +- arch/arm/mach-vexpress/ct-ca9x4.c | 2 + arch/arm/mm/dma-mapping.c | 2 +- arch/arm/plat-omap/devices.c | 4 +- arch/arm/plat-orion/include/plat/pcie.h | 3 + arch/arm/plat-orion/pcie.c | 5 - arch/um/include/asm/ptrace-generic.h | 4 +- arch/um/kernel/ptrace.c | 2 +- arch/x86/include/asm/apic.h | 10 +- arch/x86/include/asm/uv/uv_mmrs.h | 189 ++-- arch/x86/kernel/apic/apic.c | 1 - arch/x86/kernel/apic/x2apic_uv_x.c | 12 +- arch/x86/kernel/cpu/perf_event_amd.c | 4 +- arch/x86/kernel/microcode_amd.c | 2 +- arch/x86/kernel/mmconf-fam10h_64.c | 7 +- arch/x86/kernel/pvclock.c | 38 - arch/x86/mm/tlb.c | 2 +- arch/x86/pci/xen.c | 8 +- arch/x86/platform/uv/tlb_uv.c | 13 +- arch/x86/xen/mmu.c | 2 +- arch/x86/xen/setup.c | 18 +- crypto/pcrypt.c | 1 - drivers/acpi/debugfs.c | 2 +- drivers/ata/libata-scsi.c | 5 +- drivers/ata/pata_legacy.c | 2 +- drivers/ata/pata_octeon_cf.c | 2 - drivers/atm/solos-attrlist.c | 1 + drivers/atm/solos-pci.c | 8 + drivers/bluetooth/btusb.c | 5 + drivers/char/agp/intel-gtt.c | 6 +- drivers/char/amiserial.c | 1 - drivers/char/i8k.c | 5 +- drivers/char/nozomi.c | 1 - drivers/char/pcmcia/cm4000_cs.c | 3 +- drivers/char/pcmcia/synclink_cs.c | 1 + drivers/crypto/n2_core.c | 2 +- drivers/crypto/padlock-aes.c | 2 +- drivers/gpu/drm/drm_crtc_helper.c | 2 +- drivers/gpu/drm/drm_edid.c | 26 +- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem.c | 118 ++- drivers/gpu/drm/i915/i915_gem_evict.c | 8 +- drivers/gpu/drm/i915/i915_suspend.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 70 +- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_lvds.c | 16 +- drivers/gpu/drm/i915/intel_opregion.c | 2 +- drivers/gpu/drm/i915/intel_overlay.c | 4 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 129 +++- drivers/gpu/drm/i915/intel_ringbuffer.h | 3 + drivers/gpu/drm/radeon/evergreen.c | 8 +- drivers/gpu/drm/radeon/r100.c | 4 +- drivers/gpu/drm/radeon/r300.c | 2 +- drivers/gpu/drm/radeon/r600.c | 12 +- drivers/gpu/drm/radeon/radeon_atombios.c | 27 +- drivers/gpu/drm/radeon/radeon_connectors.c | 16 +- drivers/gpu/drm/radeon/radeon_display.c | 18 +- drivers/gpu/drm/radeon/radeon_encoders.c | 26 + drivers/gpu/drm/radeon/radeon_fence.c | 3 +- drivers/gpu/drm/radeon/radeon_i2c.c | 41 +- drivers/gpu/drm/radeon/radeon_mode.h | 17 +- drivers/gpu/drm/radeon/radeon_object.c | 4 +- drivers/gpu/drm/radeon/radeon_ttm.c | 3 +- drivers/gpu/drm/radeon/rs400.c | 2 +- drivers/gpu/drm/radeon/rs600.c | 4 +- drivers/gpu/drm/ttm/ttm_bo.c | 86 +-- drivers/gpu/drm/ttm/ttm_bo_manager.c | 81 +- drivers/gpu/drm/ttm/ttm_tt.c | 4 +- drivers/gpu/drm/via/via_dmablit.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 5 + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +- drivers/gpu/stub/Kconfig | 3 + drivers/hwmon/ad7414.c | 6 +- drivers/hwmon/adt7470.c | 4 +- drivers/hwmon/gpio-fan.c | 8 +- drivers/input/input.c | 87 ++- drivers/input/keyboard/adp5588-keys.c | 74 +- drivers/input/keyboard/atkbd.c | 12 +- drivers/input/misc/pcf8574_keypad.c | 23 +- drivers/input/serio/i8042-x86ia64io.h | 11 + drivers/input/tablet/acecad.c | 3 +- drivers/leds/Kconfig | 20 +- drivers/leds/Makefile | 2 + drivers/leds/led-class.c | 105 ++- drivers/leds/led-triggers.c | 2 +- drivers/leds/leds-gpio.c | 2 +- drivers/leds/leds-lp5521.c | 821 +++++++++++++++ drivers/leds/leds-lp5523.c | 1065 +++++++++++++++++++ drivers/leds/ledtrig-timer.c | 124 +-- drivers/macintosh/adb-iop.c | 4 +- drivers/media/Kconfig | 1 - drivers/media/dvb/frontends/dibx000_common.c | 1 + drivers/media/video/cafe_ccic.c | 5 +- drivers/media/video/cx231xx/cx231xx-417.c | 6 +- drivers/media/video/cx23885/cx23885-417.c | 9 +- drivers/media/video/cx23885/cx23885-video.c | 5 - drivers/media/video/mx2_camera.c | 13 +- drivers/media/video/mx3_camera.c | 4 + drivers/media/video/omap1_camera.c | 16 +- drivers/media/video/ov6650.c | 4 +- drivers/media/video/saa7134/saa7134-cards.c | 24 +- drivers/media/video/se401.c | 7 +- drivers/media/video/stk-webcam.c | 4 - drivers/media/video/tlg2300/pd-main.c | 13 +- drivers/media/video/usbvideo/vicam.c | 29 +- drivers/media/video/v4l2-dev.c | 7 +- drivers/media/video/zoran/zoran.h | 1 + drivers/media/video/zoran/zoran_card.c | 1 + drivers/media/video/zoran/zoran_driver.c | 27 +- drivers/misc/apds9802als.c | 2 +- drivers/misc/bh1770glc.c | 8 +- drivers/misc/isl29020.c | 4 +- drivers/net/bnx2x/bnx2x_cmn.c | 2 +- drivers/net/cxgb4vf/cxgb4vf_main.c | 42 +- drivers/net/cxgb4vf/sge.c | 122 ++- drivers/net/cxgb4vf/t4vf_common.h | 1 + drivers/net/cxgb4vf/t4vf_hw.c | 19 + drivers/net/gianfar_ethtool.c | 5 +- drivers/net/ixgbe/ixgbe_main.c | 60 +- drivers/net/pcmcia/axnet_cs.c | 30 +- drivers/net/r8169.c | 9 +- drivers/net/skge.c | 1 - drivers/net/ucc_geth.c | 25 +- drivers/net/virtio_net.c | 12 +- drivers/net/wireless/ath/ath9k/ar9002_hw.c | 3 + drivers/net/wireless/ath/ath9k/ath9k.h | 1 + drivers/net/wireless/ath/ath9k/hif_usb.c | 31 +- drivers/net/wireless/ath/ath9k/hw.c | 15 +- drivers/net/wireless/ath/ath9k/hw.h | 1 + drivers/net/wireless/ath/ath9k/init.c | 8 + drivers/net/wireless/ath/ath9k/main.c | 29 +- drivers/net/wireless/ath/ath9k/recv.c | 4 +- drivers/net/wireless/ath/ath9k/reg.h | 1 + drivers/net/wireless/ath/carl9170/usb.c | 4 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 3 +- drivers/net/wireless/libertas/cfg.c | 5 +- drivers/net/wireless/libertas/dev.h | 1 + drivers/net/wireless/libertas/main.c | 7 + drivers/net/wireless/rt2x00/Kconfig | 3 - drivers/pci/xen-pcifront.c | 6 +- drivers/pcmcia/pd6729.c | 8 +- drivers/pcmcia/pd6729.h | 2 +- drivers/pcmcia/pxa2xx_sharpsl.c | 2 +- drivers/pcmcia/sa1100_assabet.c | 2 +- drivers/pcmcia/sa1100_cerf.c | 2 +- drivers/pcmcia/sa1100_generic.c | 2 +- drivers/pcmcia/sa1100_h3600.c | 2 +- drivers/pcmcia/sa1100_shannon.c | 2 +- drivers/pcmcia/sa1100_simpad.c | 2 +- drivers/pcmcia/soc_common.c | 9 +- drivers/rapidio/rio.c | 4 +- drivers/s390/net/qeth_core.h | 9 - drivers/s390/net/qeth_core_main.c | 55 +- drivers/serial/8250_pci.c | 5 + drivers/serial/bfin_5xx.c | 31 +- drivers/serial/kgdboc.c | 59 ++ drivers/staging/ath6kl/Kconfig | 2 +- drivers/staging/ath6kl/os/linux/ar6000_drv.c | 5 +- drivers/staging/ath6kl/os/linux/cfg80211.c | 7 +- drivers/staging/batman-adv/hard-interface.c | 15 +- drivers/staging/batman-adv/routing.c | 12 +- drivers/staging/batman-adv/routing.h | 4 +- drivers/staging/batman-adv/unicast.c | 2 +- drivers/staging/bcm/Bcmchar.c | 49 +- drivers/staging/brcm80211/README | 2 +- drivers/staging/brcm80211/TODO | 2 +- drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2 - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 12 +- drivers/staging/cpia/cpia.c | 6 +- drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c | 1 - drivers/staging/hv/hv_utils.c | 3 - .../staging/intel_sst/intel_sst_app_interface.c | 284 +++--- drivers/staging/intel_sst/intel_sst_common.h | 4 +- drivers/staging/keucr/init.c | 18 +- drivers/staging/keucr/ms.c | 14 +- drivers/staging/keucr/msscsi.c | 6 +- drivers/staging/keucr/sdscsi.c | 4 +- drivers/staging/keucr/smilsub.c | 18 +- drivers/staging/keucr/transport.c | 2 +- drivers/staging/rt2860/common/cmm_aes.c | 2 - drivers/staging/rt2860/usb_main_dev.c | 1 + drivers/staging/rtl8192e/r8192E_core.c | 3 + drivers/staging/stradis/stradis.c | 11 +- drivers/staging/tidspbridge/Kconfig | 1 - drivers/staging/tidspbridge/Makefile | 7 +- drivers/staging/tidspbridge/core/_deh.h | 5 +- drivers/staging/tidspbridge/core/_tiomap.h | 19 +- drivers/staging/tidspbridge/core/dsp-mmu.c | 317 ------ drivers/staging/tidspbridge/core/io_sm.c | 180 +++- drivers/staging/tidspbridge/core/tiomap3430.c | 1083 ++++++++++++++++++-- drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 4 + drivers/staging/tidspbridge/core/tiomap_io.c | 17 +- drivers/staging/tidspbridge/core/ue_deh.c | 115 ++- drivers/staging/tidspbridge/hw/EasiGlobal.h | 41 + drivers/staging/tidspbridge/hw/MMUAccInt.h | 76 ++ drivers/staging/tidspbridge/hw/MMURegAcM.h | 225 ++++ drivers/staging/tidspbridge/hw/hw_defs.h | 58 ++ drivers/staging/tidspbridge/hw/hw_mmu.c | 562 ++++++++++ drivers/staging/tidspbridge/hw/hw_mmu.h | 163 +++ .../tidspbridge/include/dspbridge/cfgdefs.h | 1 + .../staging/tidspbridge/include/dspbridge/dev.h | 24 + .../staging/tidspbridge/include/dspbridge/dmm.h | 75 ++ .../staging/tidspbridge/include/dspbridge/drv.h | 10 + .../tidspbridge/include/dspbridge/dsp-mmu.h | 67 -- .../tidspbridge/include/dspbridge/dspdefs.h | 44 + .../tidspbridge/include/dspbridge/dspioctl.h | 7 + .../staging/tidspbridge/include/dspbridge/proc.h | 46 + drivers/staging/tidspbridge/pmgr/dev.c | 63 ++- drivers/staging/tidspbridge/pmgr/dmm.c | 533 ++++++++++ drivers/staging/tidspbridge/pmgr/dspapi.c | 34 +- drivers/staging/tidspbridge/rmgr/drv.c | 15 + drivers/staging/tidspbridge/rmgr/drv_interface.c | 2 + drivers/staging/tidspbridge/rmgr/node.c | 48 +- drivers/staging/tidspbridge/rmgr/proc.c | 197 ++++- drivers/staging/tm6000/tm6000-video.c | 1 + drivers/staging/udlfb/udlfb.c | 2 +- drivers/staging/vt6656/main_usb.c | 3 +- .../staging/westbridge/astoria/api/src/cyasusb.c | 1 - drivers/staging/wlan-ng/cfg80211.c | 6 +- drivers/staging/wlan-ng/p80211netdev.c | 2 +- drivers/tty/n_gsm.c | 5 +- drivers/tty/tty_buffer.c | 14 +- drivers/tty/tty_ldisc.c | 49 +- drivers/tty/vt/vc_screen.c | 6 +- drivers/usb/core/devio.c | 7 +- drivers/usb/gadget/Kconfig | 2 +- drivers/usb/gadget/goku_udc.h | 3 +- drivers/usb/gadget/u_serial.c | 54 +- drivers/usb/host/Kconfig | 2 +- drivers/usb/host/ehci-mxc.c | 14 +- drivers/usb/host/ohci-jz4740.c | 2 +- drivers/usb/misc/iowarrior.c | 1 + drivers/usb/misc/sisusbvga/sisusb.c | 1 + drivers/usb/musb/blackfin.c | 80 +- drivers/usb/musb/musb_core.c | 41 +- drivers/usb/musb/musb_core.h | 2 +- drivers/usb/musb/musb_gadget.c | 41 +- drivers/usb/musb/musb_regs.h | 3 +- drivers/usb/musb/musbhsdma.c | 14 + drivers/usb/serial/ftdi_sio.c | 2 + drivers/usb/serial/ftdi_sio_ids.h | 7 + drivers/usb/serial/option.c | 2 +- drivers/uwb/allocator.c | 3 +- drivers/video/backlight/adp8860_bl.c | 8 +- drivers/video/backlight/l4f00242t03.c | 2 +- drivers/video/backlight/lms283gf05.c | 2 +- drivers/video/backlight/mbp_nvidia_bl.c | 18 + drivers/video/backlight/pwm_bl.c | 7 +- drivers/video/backlight/s6e63m0.c | 7 +- drivers/xen/events.c | 25 +- fs/hugetlbfs/inode.c | 3 +- fs/locks.c | 19 +- fs/nfsd/nfs4state.c | 16 +- fs/xfs/linux-2.6/xfs_aops.c | 7 +- fs/xfs/linux-2.6/xfs_buf.c | 2 +- fs/xfs/linux-2.6/xfs_ioctl.c | 2 +- fs/xfs/linux-2.6/xfs_iops.c | 3 +- fs/xfs/linux-2.6/xfs_super.c | 3 - fs/xfs/linux-2.6/xfs_sync.c | 1 + fs/xfs/xfs_filestream.c | 8 +- fs/xfs/xfs_mount.c | 1 + fs/xfs/xfs_quota.h | 20 +- include/drm/ttm/ttm_bo_api.h | 4 + include/drm/ttm/ttm_bo_driver.h | 79 ++- include/linux/atomic.h | 37 + include/linux/highmem.h | 1 + include/linux/i2c/adp5588.h | 15 +- include/linux/if_vlan.h | 25 + include/linux/input.h | 4 +- include/linux/kernel.h | 1 + include/linux/leds-lp5521.h | 47 + include/linux/leds-lp5523.h | 47 + include/linux/leds.h | 47 +- include/linux/netdevice.h | 5 + include/linux/netfilter.h | 2 +- include/linux/perf_event.h | 10 + include/linux/pwm_backlight.h | 1 + include/linux/radix-tree.h | 39 +- include/linux/resource.h | 1 + include/linux/sunrpc/svc_xprt.h | 18 +- include/linux/tty.h | 2 +- include/linux/usb.h | 2 +- include/linux/usb/musb.h | 2 + include/net/dn.h | 2 +- include/net/dst_ops.h | 1 + include/net/sock.h | 4 +- include/net/tcp.h | 6 +- include/net/udp.h | 4 +- kernel/latencytop.c | 17 +- kernel/perf_event.c | 42 +- kernel/printk.c | 6 + kernel/range.c | 2 +- kernel/sysctl.c | 9 + lib/radix-tree.c | 83 ++- mm/filemap.c | 29 +- mm/memcontrol.c | 16 +- mm/vmscan.c | 2 +- net/ax25/af_ax25.c | 2 +- net/bluetooth/hci_event.c | 6 + net/bluetooth/hidp/Kconfig | 2 +- net/bluetooth/l2cap.c | 8 +- net/bluetooth/rfcomm/core.c | 13 +- net/can/bcm.c | 2 +- net/core/dst.c | 1 + net/core/filter.c | 64 +- net/core/pktgen.c | 6 +- net/core/rtnetlink.c | 9 +- net/core/sock.c | 14 +- net/decnet/af_decnet.c | 2 +- net/decnet/sysctl_net_decnet.c | 4 +- net/ipv4/igmp.c | 4 +- net/ipv4/proc.c | 8 +- net/ipv4/sysctl_net_ipv4.c | 5 +- net/ipv4/tcp.c | 6 +- net/ipv4/tcp_input.c | 11 +- net/ipv4/tcp_ipv4.c | 8 +- net/ipv4/udp.c | 4 +- net/ipv6/addrconf.c | 24 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- net/ipv6/reassembly.c | 2 +- net/ipv6/route.c | 6 +- net/mac80211/iface.c | 6 +- net/packet/af_packet.c | 7 +- net/rds/message.c | 4 +- net/sched/cls_basic.c | 4 + net/sctp/protocol.c | 2 +- net/sctp/socket.c | 4 +- net/sctp/sysctl.c | 4 +- net/tipc/socket.c | 1 + net/wireless/nl80211.c | 4 +- net/x25/x25_facilities.c | 12 +- security/Kconfig | 12 + security/apparmor/lsm.c | 6 +- security/apparmor/policy.c | 2 +- security/commoncap.c | 2 + tools/perf/Documentation/perf-trace.txt | 57 +- tools/perf/builtin-record.c | 10 +- tools/perf/builtin-top.c | 12 +- tools/perf/builtin-trace.c | 209 +++-- tools/perf/scripts/perl/bin/failed-syscalls-record | 2 +- tools/perf/scripts/perl/bin/rw-by-file-record | 2 +- tools/perf/scripts/perl/bin/rw-by-pid-record | 2 +- tools/perf/scripts/perl/bin/rwtop-record | 2 +- tools/perf/scripts/perl/bin/wakeup-latency-record | 2 +- tools/perf/scripts/perl/bin/workqueue-stats-record | 2 +- .../python/bin/failed-syscalls-by-pid-record | 2 +- .../scripts/python/bin/futex-contention-record | 2 +- tools/perf/scripts/python/bin/netdev-times-record | 2 +- .../perf/scripts/python/bin/sched-migration-record | 2 +- tools/perf/scripts/python/bin/sctop-record | 2 +- .../python/bin/syscall-counts-by-pid-record | 2 +- .../perf/scripts/python/bin/syscall-counts-record | 2 +- tools/perf/util/ui/util.c | 5 +- 387 files changed, 8728 insertions(+), 2377 deletions(-) create mode 100644 Documentation/ABI/obsolete/proc-pid-oom_adj create mode 100644 Documentation/leds/leds-lp5521.txt create mode 100644 Documentation/leds/leds-lp5523.txt create mode 100644 drivers/leds/leds-lp5521.c create mode 100644 drivers/leds/leds-lp5523.c delete mode 100644 drivers/staging/tidspbridge/core/dsp-mmu.c create mode 100644 drivers/staging/tidspbridge/hw/EasiGlobal.h create mode 100644 drivers/staging/tidspbridge/hw/MMUAccInt.h create mode 100644 drivers/staging/tidspbridge/hw/MMURegAcM.h create mode 100644 drivers/staging/tidspbridge/hw/hw_defs.h create mode 100644 drivers/staging/tidspbridge/hw/hw_mmu.c create mode 100644 drivers/staging/tidspbridge/hw/hw_mmu.h create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dmm.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dsp-mmu.h create mode 100644 drivers/staging/tidspbridge/pmgr/dmm.c create mode 100644 include/linux/atomic.h create mode 100644 include/linux/leds-lp5521.h create mode 100644 include/linux/leds-lp5523.h ## # 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 ## Merge made by recursive. drivers/ata/Kconfig | 8 + drivers/ata/Makefile | 1 + drivers/ata/acard-ahci.c | 528 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/ata/ahci.h | 3 + drivers/ata/libahci.c | 11 +- 5 files changed, 545 insertions(+), 6 deletions(-) create mode 100644 drivers/ata/acard-ahci.c ## # 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-change-clone-bi_private-pointer-during-cleanup.patch dm-delay-unplug-queue.patch dm-emulate-BLKRRPART-ioctl.patch dm-export-dm_disk.patch dm-extract-region_hash.patch dm-flakey.patch dm-handle-clone-reprocessing.patch dm-ioctl-allow-rename-to-fill-empty-uuid.patch dm-iostats.patch dm-kcopyd-add-async-destruction-option.patch dm-loop.patch dm-memcache.patch dm-mpath-add-alua.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-remove-struct-clone_info.patch dm-snapshot-cleanup-style.patch dm-snapshot-invalidate-from-workqueue.patch dm-snapshot-release-memory-if-invalid.patch dm-split-bios-into-only-two-pieces.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-use-singlethread-workqueues.patch dm-userspace.patch end git-update1.patch mm next next-20101013.patch 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 59188301 bytes received 1212 bytes 39459675.33 bytes/sec total size is 59175123 speedup is 1.00 Using base scsi-misc ## # 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.37-rc1-stor8. Already up-to-date. ## # check ## Differences exist, continuing ## # label ## [2.6.37-rc1-stor8 d6e1c7a] 2.6.37-rc1-stor8 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 If the identity used for this commit is wrong, you can fix it with: git commit --amend --author='Your Name ' 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- ##