From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 e8dad69..fafc992 master -> origin/mast## Checking out files: 27% (100/363) Checking out files: 28% (102/363) Checking out files: 29% (106/363) Checking out files: 30% (109/363) Checking out files: 31% (Removing patches/ ## # git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git master scsi-rc-fixes ## Auto-merging MAINTAINERS Merge made by recursive. 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 +- MAINTAINERS | 3 +- 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-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-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/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 From . * branch libata-fixes -> FETCH_HEAD From . * branch libata-upstream -> FETCH_HEAD Checking out files: 19% (2121/11071) Checking out files: 20% (2215/11071) Checking out files: 21% (2325/11071) Checking out files: 22% (2436/11071) Checking out files: 23% (2547/11071) Checking out files: 23% (2582/11071) Checking out files: 24% (2658/11071) Checking out files: 25% (2768/11071) Checking out files: 26% (2879/11071) Checking out files: 27% (2990/11071) Checking out files: 27% (3023/11071) Checking out files: 28% (3100/11071) Checking out files: 29% (3211/11071) Checking out files: 30% (3322/11071) Checking out files: 31% (3433/11071) Checking out files: 31% (3488/11071) Checking out files: 32% (3543/11071) Checking out files: 33% (3654/11071) Checking out files: 34% (3765/11071) Checking out files: 35% (3875/11071) Checking out files: 35% (3901/11071) Checking out files: 36% (3986/11071) Checking out files: 37% (4097/11071) Checking out files: 38% (4207/11071) Checking out files: 39% (4318/11071) Checking out files: 39% (4330/11071) Checking out files: 40% (4429/11071) Checking out files: 41% (4540/11071) Checking out files: 42% (4650/11071) Checking out files: 42% (4724/11071) Checking out files: 43% (4761/11071) Checking out files: 44% (4872/11071) Checking out files: 45% (4982/11071) Checking out files: 45% (5084/11071) Checking out files: 46% (5093/11071) Checking out files: 47% (5204/11071) Checking out files: 48% (5315/11071) Checking out files: 48% (5416/11071) Checking out files: 49% (5425/11071) Checking out files: 50% (5536/11071) Checking out files: 51% (5647/11071) Checking out files: 51% (5701/11071) Checking out files: 52% (5757/11071) Checking out files: 53% (5868/11071) Checking out files: 53% (5939/11071) Checking out files: 54% (5979/11071) Checking out files: 55% (6090/11071) Checking out files: 55% (6161/11071) Checking out files: 56% (6200/11071) Checking out files: 57% (6311/11071) Checking out files: 58% (6422/11071) Checking out files: 58% (6434/11071) Checking out files: 59% (6532/11071) Checking out files: 60% (6643/11071) Checking out files: 60% (6694/11071) Checking out files: 61% (6754/11071) Checking out files: 62% (6865/11071) Checking out files: 63% (6975/11071) Checking out files: 63% (6997/11071) Checking out files: 64% (7086/11071) Checking out files: 65% (7197/11071) Checking out files: 65% (7222/11071) Checking out files: 66% (7307/11071) Checking out files: 67% (7418/11071) Checking out files: 68% (7529/11071) Checking out files: 68% (7618/11071) Checking out files: 69% (7639/11071) Checking out files: 70% (7750/11071) Checking out files: 71% (7861/11071) Checking out files: 71% (7898/11071) Checking out files: 72% (7972/11071) Checking out files: 73% (8082/11071) Checking out files: 73% (8184/11071) Checking out files: 74% (8193/11071) Checking out files: 75% (8304/11071) Checking out files: 76% (8414/11071) Checking out files: 76% (8456/11071) Checking out files: 77% (8525/11071) Checking out files: 78% (8636/11071) Checking out files: 78% (8690/11071) Checking out files: 79% (8747/11071) Checking out files: 80% (8857/11071) Checking out files: 81% (8968/11071) Checking out files: 81% (8970/11071) Checking out files: 82% (9079/11071) Checking out files: 83% (9189/11071) Checking out files: 83% (9212/11071) Checking out files: 84% (9300/11071) Checking out files: 85% (9411/11071) Checking out files: 85% (9436/11071) Checking out files: 86% (9522/11071) Checking out files: 87% (9632/11071) Checking out files: 87% (9689/11071) Checking out files: 88% (9743/11071) Checking out files: 89% (9854/11071) Checking out files: 89% (9926/11071) Checking out files: 90% (9964/11071) Checking out files: 91% (10075/11071) Checking out files: 91% (10139/11071) Checking out files: 92% (10186/11071) Checking out files: 93% (10297/11071) Checking out files: 93% (10351/11071) Checking out files: 94% (10407/11071) Checking out files: 95% (10518/11071) Checking out files: 95% (10602/11071) Checking out files: 96% (10629/11071) Checking out files: 97% (10739/11071) Checking out files: 97% (10832/11071) Checking out files: 98% (10850/11071) Checking out files: 99% (10961/11071) Checking out files: 100% (11071/11071) Checking out files: 100% (11071/11071), done. Switched to branch 'device-mapper' Checking out files: 13% (1501/11071) Checking out files: 14% (1550/11071) Checking out files: 15% (1661/11071) Checking out files: 16% (1772/11071) Checking out files: 17% (1883/11071) Checking out files: 18% (1993/11071) Checking out files: 18% (2064/11071) Checking out files: 19% (2104/11071) Checking out files: 20% (2215/11071) Checking out files: 21% (2325/11071) Checking out files: 22% (2436/11071) Checking out files: 23% (2547/11071) Checking out files: 23% (2558/11071) Checking out files: 24% (2658/11071) Checking out files: 25% (2768/11071) Checking out files: 26% (2879/11071) Checking out files: 27% (2990/11071) Checking out files: 27% (3029/11071) Checking out files: 28% (3100/11071) Checking out files: 29% (3211/11071) Checking out files: 30% (3322/11071) Checking out files: 31% (3433/11071) Checking out files: 31% (3442/11071) Checking out files: 32% (3543/11071) Checking out files: 33% (3654/11071) Checking out files: 34% (3765/11071) Checking out files: 35% (3875/11071) Checking out files: 35% (3920/11071) Checking out files: 36% (3986/11071) Checking out files: 36% (4007/11071) Checking out files: 37% (4097/11071) Checking out files: 37% (4102/11071) Checking out files: 38% (4207/11071) Checking out files: 39% (4318/11071) Checking out files: 39% (4329/11071) Checking out files: 40% (4429/11071) Checking out files: 40% (4538/11071) Checking out files: 41% (4540/11071) Checking out files: 42% (4650/11071) Checking out files: 43% (4761/11071) Checking out files: 44% (4872/11071) Checking out files: 44% (4944/11071) Checking out files: 45% (4982/11071) Checking out files: 46% (5093/11071) Checking out files: 46% (5141/11071) Checking out files: 47% (5204/11071) Checking out files: 48% (5315/11071) Checking out files: 48% (5335/11071) Checking out files: 49% (5425/11071) Checking out files: 50% (5536/11071) Checking out files: 50% (5569/11071) Checking out files: 51% (5647/11071) Checking out files: 52% (5757/11071) Checking out files: 52% (5864/11071) Checking out files: 53% (5868/11071) Checking out files: 54% (5979/11071) Checking out files: 54% (6088/11071) Checking out files: 55% (6090/11071) Checking out files: 56% (6200/11071) Checking out files: 57% (6311/11071) Checking out files: 57% (6379/11071) Checking out files: 58% (6422/11071) Checking out files: 59% (6532/11071) Checking out files: 60% (6643/11071) Checking out files: 60% (6650/11071) Checking out files: 61% (6754/11071) Checking out files: 61% (6854/11071) Checking out files: 62% (6865/11071) Checking out files: 63% (6975/11071) Checking out files: 64% (7086/11071) Checking out files: 65% (7197/11071) Checking out files: 65% (7253/11071) Checking out files: 66% (7307/11071) Checking out files: 67% (7418/11071) Checking out files: 68% (7529/11071) Checking out files: 68% (7626/11071) Checking out files: 69% (7639/11071) Checking out files: 70% (7750/11071) Checking out files: 71% (7861/11071) Checking out files: 71% (7892/11071) Checking out files: 72% (7972/11071) Checking out files: 73% (8082/11071) Checking out files: 73% (8175/11071) Checking out files: 74% (8193/11071) Checking out files: 75% (8304/11071) Checking out files: 75% (8407/11071) Checking out files: 76% (8414/11071) Checking out files: 77% (8525/11071) Checking out files: 78% (8636/11071) Checking out files: 78% (8661/11071) Checking out files: 79% (8747/11071) Checking out files: 80% (8857/11071) Checking out files: 81% (8968/11071) Checking out files: 81% (8974/11071) Checking out files: 82% (9079/11071) Checking out files: 83% (9189/11071) Checking out files: 84% (9300/11071) Checking out files: 84% (9329/11071) Checking out files: 85% (9411/11071) Checking out files: 86% (9522/11071) Checking out files: 86% (9605/11071) Checking out files: 87% (9632/11071) Checking out files: 88% (9743/11071) Checking out files: 89% (9854/11071) Checking out files: 89% (9944/11071) Checking out files: 90% (9964/11071) Checking out files: 91% (10075/11071) Checking out files: 92% (10186/11071) Checking out files: 92% (10246/11071) Checking out files: 93% (10297/11071) Checking out files: 94% (10407/11071) Checking out files: 94% (10506/11071) Checking out files: 95% (10518/11071) Checking out files: 96% (10629/11071) Checking out files: 97% (10739/11071) Checking out files: 97% (10826/11071) Checking out files: 98% (10850/11071) Checking out files: 99% (10961/11071) Checking out files: 100% (11071/11071) Checking out files: 100% (11071/11071), done. Switched to branch '2.6.39-rc3-stor14' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + 4981d76...c66ac9d master -> scsi-post-merge (forced update) Checking out files: 22% (2821/12478) Checking out files: 23% (2870/12478) Checking out files: 24% (2995/12478) Checking out files: 25% (3120/12478) Checking out files: 26% (3245/12478) Checking out files: 27% (3370/12478) Checking out files: 28% (3494/12478) Checking out files: 28% (3537/12478) Checking out files: 29% (3619/12478) Checking out files: 30% (3744/12478) Checking out files: 31% (3869/12478) Checking out files: 32% (3993/12478) Checking out files: 32% (4076/12478) Checking out files: 33% (4118/12478) Checking out files: 34% (4243/12478) Checking out files: 35% (4368/12478) Checking out files: 36% (4493/12478) Checking out files: 36% (4554/12478) Checking out files: 37% (4617/12478) Checking out files: 38% (4742/12478) Checking out files: 39% (4867/12478) Checking out files: 40% (4992/12478) Checking out files: 41% (5116/12478) Checking out files: 41% (5184/12478) Checking out files: 42% (5241/12478) Checking out files: 43% (5366/12478) Checking out files: 44% (5491/12478) Checking out files: 45% (5616/12478) Checking out files: 45% (5668/12478) Checking out files: 46% (5740/12478) Checking out files: 47% (5865/12478) Checking out files: 48% (5990/12478) Checking out files: 48% (6046/12478) Checking out files: 49% (6115/12478) Checking out files: 50% (6239/12478) Checking out files: 51% (6364/12478) Checking out files: 51% (6398/12478) Checking out files: 52% (6489/12478) Checking out files: 53% (6614/12478) Checking out files: 53% (6722/12478) Checking out files: 54% (6739/12478) Checking out files: 55% (6863/12478) Checking out files: 56% (6988/12478) Checking out files: 56% (7015/12478) Checking out files: 57% (7113/12478) Checking out files: 58% (7238/12478) Checking out files: 58% (7317/12478) Checking out files: 59% (7363/12478) Checking out files: 60% (7487/12478) Checking out files: 60% (7585/12478) Checking out files: 61% (7612/12478) Checking out files: 62% (7737/12478) Checking out files: 62% (7856/12478) Checking out files: 63% (7862/12478) Checking out files: 64% (7986/12478) Checking out files: 65% (8111/12478) Checking out files: 65% (8164/12478) Checking out files: 66% (8236/12478) Checking out files: 67% (8361/12478) Checking out files: 68% (8486/12478) Checking out files: 68% (8511/12478) Checking out files: 69% (8610/12478) Checking out files: 70% (8735/12478) Checking out files: 71% (8860/12478) Checking out files: 71% (8960/12478) Checking out files: 72% (8985/12478) Checking out files: 73% (9109/12478) Checking out files: 74% (9234/12478) Checking out files: 74% (9306/12478) Checking out files: 75% (9359/12478) Checking out files: 76% (9484/12478) Checking out files: 77% (9609/12478) Checking out files: 77% (9639/12478) Checking out files: 78% (9733/12478) Checking out files: 79% (9858/12478) Checking out files: 79% (9928/12478) Checking out files: 80% (9983/12478) Checking out files: 81% (10108/12478) Checking out files: 81% (10220/12478) Checking out files: 82% (10232/12478) Checking out files: 83% (10357/12478) Checking out files: 84% (10482/12478) Checking out files: 84% (10518/12478) Checking out files: 85% (10607/12478) Checking out files: 86% (10732/12478) Checking out files: 86% (10817/12478) Checking out files: 87% (10856/12478) Checking out files: 88% (10981/12478) Checking out files: 88% (11098/12478) Checking out files: 89% (11106/12478) Checking out files: 90% (11231/12478) Checking out files: 91% (11355/12478) Checking out files: 91% (11406/12478) Checking out files: 92% (11480/12478) Checking out files: 93% (11605/12478) Checking out files: 94% (11730/12478) Checking out files: 94% (11745/12478) Checking out files: 95% (11855/12478) Checking out files: 96% (11979/12478) Checking out files: 96% (12039/12478) Checking out files: 97% (12104/12478) Checking out files: 98% (12229/12478) Checking out files: 98% (12282/12478) Checking out files: 99% (12354/12478) Checking out files: 100% (12478/12478) Checking out files: 100% (12478/12478), done. Switched to branch 'scsi-post-merge' Switched to branch '2.6.39-rc3-stor14' From . * branch scsi-post-merge -> FETCH_HEAD | 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/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 + security/capability.c | 2 +- security/security.c | 6 +- security/selinux/hooks.c | 6 +- security/smack/smack_lsm.c | 6 +- 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 +- 340 files changed, 3378 insertions(+), 1668 deletions(-) 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 ## # 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/gdrom.c | 1 - drivers/cdrom/viocd.c | 1 - drivers/message/i2o/i2o_block.c | 1 - drivers/s390/char/tape_block.c | 1 - 15 files changed, 0 insertions(+), 15 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 ## Merge made by recursive. 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 ++++++++++++++-- include/linux/libata.h | 3 +- 8 files changed, 103 insertions(+), 11 deletions(-) ## # 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 22187324.00 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-stor14. Already up-to-date. ## # check ## Differences exist, continuing ## # label ## [2.6.39-rc3-stor14 6e018f9] 2.6.39-rc3-stor14 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- ##