From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 dc7acbb..29a6ccc master -> origin## # errFrom /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 + 84467ef...7ad20aa master -> scsi-misc (forced update) Checking out files: 15% (217/1379) Checking out fileRemoving patches/ ## # git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git master scsi-rc-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-linus block-for-linus ## Auto-merging MAINTAINERS Removing arch/arm/mach-ux500/cpufreq.c Removing arch/arm/mach-ux500/include/mach/prcmu-defs.h Removing arch/arm/mach-ux500/include/mach/prcmu.h Removing arch/arm/mach-ux500/prcmu.c Removing arch/m68k/kernel/asm-offsets_mm.c Removing arch/m68k/kernel/asm-offsets_no.c Removing arch/m68k/kernel/m68k_ksyms_mm.c Removing arch/m68k/kernel/m68k_ksyms_no.c Removing arch/m68k/kernel/sys_m68k_mm.c Removing arch/m68k/kernel/sys_m68k_no.c Removing arch/m68k/lib/Makefile_mm Removing arch/m68k/lib/Makefile_no Removing arch/m68k/lib/checksum.c Removing arch/m68k/lib/muldi3_mm.c Removing arch/m68k/lib/muldi3_no.c Removing arch/m68k/mm/Makefile_mm Removing arch/m68k/mm/Makefile_no Removing arch/m68k/mm/kmap_mm.c Removing arch/m68k/mm/kmap_no.c Removing arch/tile/configs/tile_defconfig Auto-merging arch/tile/include/asm/vga.h Removing arch/um/drivers/mcast.h Removing arch/um/drivers/mcast_kern.c Removing arch/um/drivers/mcast_user.c Removing arch/xtensa/mm/pgtable.c Removing drivers/leds/leds-h1940.c Auto-merging drivers/mfd/db5500-prcmu-regs.h Removing drivers/s390/char/tape_block.c Auto-merging drivers/scsi/qla4xxx/ql4_nx.c Auto-merging drivers/video/mb862xx/mb862xxfbdrv.c Auto-merging include/video/omap-panel-generic-dpi.h Auto-merging include/video/omap-panel-nokia-dsi.h Auto-merging include/video/omapdss.h Merge made by recursive. .gitignore | 1 + .mailmap | 1 + CREDITS | 8 + Documentation/ABI/testing/sysfs-block | 64 + Documentation/ABI/testing/sysfs-ptp | 98 + Documentation/DocBook/Makefile | 2 +- Documentation/IRQ-affinity.txt | 17 +- Documentation/blockdev/cciss.txt | 15 + Documentation/cachetlb.txt | 2 +- .../devicetree/bindings/net/fsl-tsec-phy.txt | 54 + Documentation/filesystems/9p.txt | 29 +- Documentation/filesystems/proc.txt | 11 +- Documentation/filesystems/ubifs.txt | 26 +- Documentation/hwmon/emc6w201 | 42 + Documentation/hwmon/f71882fg | 4 + Documentation/hwmon/fam15h_power | 37 + Documentation/hwmon/k10temp | 3 +- Documentation/hwmon/max6650 | 21 +- Documentation/i2c/busses/i2c-i801 | 1 + Documentation/i2c/writing-clients | 2 +- Documentation/input/elantech.txt | 123 +- Documentation/input/rotary-encoder.txt | 13 + Documentation/ioctl/ioctl-number.txt | 1 + Documentation/kbuild/kbuild.txt | 13 + Documentation/kbuild/kconfig-language.txt | 32 +- Documentation/kbuild/kconfig.txt | 5 - Documentation/kbuild/makefiles.txt | 53 + Documentation/kernel-parameters.txt | 3 - Documentation/lockstat.txt | 2 +- Documentation/mmc/00-INDEX | 2 + Documentation/mmc/mmc-dev-attrs.txt | 10 + Documentation/mmc/mmc-dev-parts.txt | 27 + Documentation/networking/bonding.txt | 13 +- Documentation/ptp/ptp.txt | 89 + Documentation/ptp/testptp.c | 381 +++ Documentation/ptp/testptp.mk | 33 + Documentation/virtual/uml/UserModeLinux-HOWTO.txt | 10 + Documentation/vm/locking | 2 +- MAINTAINERS | 50 +- Makefile | 67 +- arch/Kconfig | 3 + arch/alpha/Kconfig From /pub/scm/linux/kernel/git/axboe/linux-2.6-block 700c4f3..ac04fee for-next -> block-for-next From . * branch block-for-next -> FETCH_HEAD From . * branch libata-fixes -> FETCH_HEAD From . * branch libata-upstream -> FETCH_HEAD Checking out files: 10% (677/6175) Checking out files: 11% (680/6175) Checking out files: 12% (741/6175) Checking out files: 13% (803/6175) Checking out files: 14% (865/6175) Checking out files: 14% (870/6175) Checking out files: 15% (927/6175) Checking out files: 16% (988/6175) Checking out files: 17% (1050/6175) Checking out files: 18% (1112/6175) Checking out files: 19% (1174/6175) Checking out files: 20% (1235/6175) Checking out files: 20% (1242/6175) Checking out files: 21% (1297/6175) Checking out files: 22% (1359/6175) Checking out files: 22% (1362/6175) Checking out files: 23% (1421/6175) Checking out files: 24% (1482/6175) Checking out files: 24% (1535/6175) Checking out files: 25% (1544/6175) Checking out files: 26% (1606/6175) Checking out files: 26% (1634/6175) Checking out files: 27% (1668/6175) Checking out files: 28% (1729/6175) Checking out files: 29% (1791/6175) Checking out files: 29% (1825/6175) Checking out files: 30% (1853/6175) Checking out files: 31% (1915/6175) Checking out files: 32% (1976/6175) Checking out files: 33% (2038/6175) Checking out files: 34% (2100/6175) Checking out files: 34% (2116/6175) Checking out files: 35% (2162/6175) Checking out files: 36% (2223/6175) Checking out files: 37% (2285/6175) Checking out files: 37% (2330/6175) Checking out files: 38% (2347/6175) Checking out files: 39% (2409/6175) Checking out files: 40% (2470/6175) Checking out files: 41% (2532/6175) Checking out files: 41% (2575/6175) Checking out files: 42% (2594/6175) Checking out files: 43% (2656/6175) Checking out files: 44% (2717/6175) Checking out files: 45% (2779/6175) Checking out files: 46% (2841/6175) Checking out files: 46% (2862/6175) Checking out files: 47% (2903/6175) Checking out files: 48% (2964/6175) Checking out files: 49% (3026/6175) Checking out files: 49% (3077/6175) Checking out files: 50% (3088/6175) Checking out files: 51% (3150/6175) Checking out files: 52% (3211/6175) Checking out files: 52% (3222/6175) Checking out files: 53% (3273/6175) Checking out files: 54% (3335/6175) Checking out files: 55% (3397/6175) Checking out files: 55% (3415/6175) Checking out files: 56% (3458/6175) Checking out files: 57% (3520/6175) Checking out files: 58% (3582/6175) Checking out files: 59% (3644/6175) Checking out files: 59% (3674/6175) Checking out files: 60% (3705/6175) Checking out files: 61% (3767/6175) Checking out files: 62% (3829/6175) Checking out files: 63% (3891/6175) Checking out files: 63% (3919/6175) Checking out files: 64% (3952/6175) Checking out files: 65% (4014/6175) Checking out files: 66% (4076/6175) Checking out files: 67% (4138/6175) Checking out files: 68% (4199/6175) Checking out files: 68% (4221/6175) Checking out files: 69% (4261/6175) Checking out files: 70% (4323/6175) Checking out files: 71% (4385/6175) Checking out files: 72% (4446/6175) Checking out files: 72% (4495/6175) Checking out files: 73% (4508/6175) Checking out files: 74% (4570/6175) Checking out files: 75% (4632/6175) Checking out files: 76% (4693/6175) Checking out files: 76% (4724/6175) Checking out files: 77% (4755/6175) Checking out files: 78% (4817/6175) Checking out files: 79% (4879/6175) Checking out files: 79% (4936/6175) Checking out files: 80% (4940/6175) Checking out files: 81% (5002/6175) Checking out files: 82% (5064/6175) Checking out files: 83% (5126/6175) Checking out files: 84% (5187/6175) Checking out files: 84% (5191/6175) Checking out files: 85% (5249/6175) Checking out files: 86% (5311/6175) Checking out files: 87% (5373/6175) Checking out files: 87% (5397/6175) Checking out files: 88% (5434/6175) Checking out files: 89% (5496/6175) Checking out files: 90% (5558/6175) Checking out files: 90% (5598/6175) Checking out files: 91% (5620/6175) Checking out files: 92% (5681/6175) Checking out files: 93% (5743/6175) Checking out files: 94% (5805/6175) Checking out files: 95% (5867/6175) Checking out files: 95% (5872/6175) Checking out files: 96% (5928/6175) Checking out files: 97% (5990/6175) Checking out files: 98% (6052/6175) Checking out files: 99% (6114/6175) Checking out files: 99% (6118/6175) Checking out files: 100% (6175/6175) Checking out files: 100% (6175/6175), done. Switched to branch 'device-mapper' Checking out files: 17% (1102/6175) Checking out files: 18% (1112/6175) Checking out files: 19% (1174/6175) Checking out files: 20% (1235/6175) Checking out files: 21% (1297/6175) Checking out files: 22% (1359/6175) Checking out files: 23% (1421/6175) Checking out files: 24% (1482/6175) Checking out files: 24% (1519/6175) Checking out files: 25% (1544/6175) Checking out files: 26% (1606/6175) Checking out files: 27% (1668/6175) Checking out files: 28% (1729/6175) Checking out files: 29% (1791/6175) Checking out files: 30% (1853/6175) Checking out files: 30% (1857/6175) Checking out files: 31% (1915/6175) Checking out files: 32% (1976/6175) Checking out files: 33% (2038/6175) Checking out files: 34% (2100/6175) Checking out files: 35% (2162/6175) Checking out files: 35% (2188/6175) Checking out files: 36% (2223/6175) Checking out files: 37% (2285/6175) Checking out files: 38% (2347/6175) Checking out files: 39% (2409/6175) Checking out files: 39% (2460/6175) Checking out files: 40% (2470/6175) Checking out files: 41% (2532/6175) Checking out files: 42% (2594/6175) Checking out files: 43% (2656/6175) Checking out files: 44% (2717/6175) Checking out files: 45% (2779/6175) Checking out files: 45% (2820/6175) Checking out files: 46% (2841/6175) Checking out files: 47% (2903/6175) Checking out files: 48% (2964/6175) Checking out files: 49% (3026/6175) Checking out files: 50% (3088/6175) Checking out files: 50% (3104/6175) Checking out files: 51% (3150/6175) Checking out files: 52% (3211/6175) Checking out files: 53% (3273/6175) Checking out files: 54% (3335/6175) Checking out files: 54% (3393/6175) Checking out files: 55% (3397/6175) Checking out files: 56% (3458/6175) Checking out files: 57% (3520/6175) Checking out files: 58% (3582/6175) Checking out files: 59% (3644/6175) Checking out files: 60% (3705/6175) Checking out files: 60% (3735/6175) Checking out files: 61% (3767/6175) Checking out files: 62% (3829/6175) Checking out files: 63% (3891/6175) Checking out files: 64% (3952/6175) Checking out files: 65% (4014/6175) Checking out files: 65% (4069/6175) Checking out files: 66% (4076/6175) Checking out files: 67% (4138/6175) Checking out files: 68% (4199/6175) Checking out files: 69% (4261/6175) Checking out files: 70% (4323/6175) Checking out files: 71% (4385/6175) Checking out files: 71% (4392/6175) Checking out files: 72% (4446/6175) Checking out files: 73% (4508/6175) Checking out files: 74% (4570/6175) Checking out files: 75% (4632/6175) Checking out files: 76% (4693/6175) Checking out files: 76% (4741/6175) Checking out files: 77% (4755/6175) Checking out files: 78% (4817/6175) Checking out files: 79% (4879/6175) Checking out files: 80% (4940/6175) Checking out files: 80% (4990/6175) Checking out files: 81% (5002/6175) Checking out files: 82% (5064/6175) Checking out files: 83% (5126/6175) Checking out files: 84% (5187/6175) Checking out files: 85% (5249/6175) Checking out files: 85% (5273/6175) Checking out files: 86% (5311/6175) Checking out files: 87% (5373/6175) Checking out files: 88% (5434/6175) Checking out files: 89% (5496/6175) Checking out files: 89% (5522/6175) Checking out files: 90% (5558/6175) Checking out files: 91% (5620/6175) Checking out files: 92% (5681/6175) Checking out files: 93% (5743/6175) Checking out files: 94% (5805/6175) Checking out files: 94% (5811/6175) Checking out files: 95% (5867/6175) Checking out files: 96% (5928/6175) Checking out files: 97% (5990/6175) Checking out files: 98% (6052/6175) Checking out files: 98% (6062/6175) Checking out files: 99% (6114/6175) Checking out files: 100% (6175/6175) Checking out files: 100% (6175/6175), done. Switched to branch '2.6.39-stor7' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + 7c348e5...c66ac9d master -> scsi-post-merge (forced update) Checking out files: 21% (3265/15383) Checking out files: 22% (3385/15383) Checking out files: 23% (3539/15383) Checking out files: 23% (3646/15383) Checking out files: 24% (3692/15383) Checking out files: 25% (3846/15383) Checking out files: 26% (4000/15383) Checking out files: 26% (4132/15383) Checking out files: 27% (4154/15383) Checking out files: 28% (4308/15383) Checking out files: 29% (4462/15383) Checking out files: 30% (4615/15383) Checking out files: 30% (4651/15383) Checking out files: 31% (4769/15383) Checking out files: 32% (4923/15383) Checking out files: 33% (5077/15383) Checking out files: 33% (5148/15383) Checking out files: 34% (5231/15383) Checking out files: 35% (5385/15383) Checking out files: 35% (5493/15383) Checking out files: 36% (5538/15383) Checking out files: 37% (5692/15383) Checking out files: 37% (5820/15383) Checking out files: 38% (5846/15383) Checking out files: 39% (6000/15383) Checking out files: 39% (6141/15383) Checking out files: 40% (6154/15383) Checking out files: 41% (6308/15383) Checking out files: 41% (6445/15383) Checking out files: 42% (6461/15383) Checking out files: 43% (6615/15383) Checking out files: 44% (6769/15383) Checking out files: 44% (6771/15383) Checking out files: 45% (6923/15383) Checking out files: 46% (7077/15383) Checking out files: 46% (7092/15383) Checking out files: 47% (7231/15383) Checking out files: 47% (7358/15383) Checking out files: 48% (7384/15383) Checking out files: 49% (7538/15383) Checking out files: 49% (7620/15383) Checking out files: 50% (7692/15383) Checking out files: 51% (7846/15383) Checking out files: 51% (7885/15383) Checking out files: 52% (8000/15383) Checking out files: 52% (8132/15383) Checking out files: 53% (8153/15383) Checking out files: 54% (8307/15383) Checking out files: 54% (8423/15383) Checking out files: 55% (8461/15383) Checking out files: 55% (8602/15383) Checking out files: 56% (8615/15383) Checking out files: 57% (8769/15383) Checking out files: 57% (8871/15383) Checking out files: 58% (8923/15383) Checking out files: 59% (9076/15383) Checking out files: 59% (9080/15383) Checking out files: 60% (9230/15383) Checking out files: 60% (9263/15383) Checking out files: 61% (9384/15383) Checking out files: 62% (9538/15383) Checking out files: 62% (9557/15383) Checking out files: 63% (9692/15383) Checking out files: 63% (9775/15383) Checking out files: 64% (9846/15383) Checking out files: 64% (9968/15383) Checking out files: 65% (9999/15383) Checking out files: 65% (10120/15383) Checking out files: 66% (10153/15383) Checking out files: 66% (10267/15383) Checking out files: 67% (10307/15383) Checking out files: 68% (10461/15383) Checking out files: 68% (10528/15383) Checking out files: 69% (10615/15383) Checking out files: 70% (10769/15383) Checking out files: 70% (10879/15383) Checking out files: 71% (10922/15383) Checking out files: 72% (11076/15383) Checking out files: 72% (11077/15383) Checking out files: 73% (11230/15383) Checking out files: 73% (11371/15383) Checking out files: 74% (11384/15383) Checking out files: 75% (11538/15383) Checking out files: 75% (11600/15383) Checking out files: 76% (11692/15383) Checking out files: 77% (11845/15383) Checking out files: 77% (11910/15383) Checking out files: 78% (11999/15383) Checking out files: 78% (12127/15383) Checking out files: 79% (12153/15383) Checking out files: 80% (12307/15383) Checking out files: 80% (12398/15383) Checking out files: 81% (12461/15383) Checking out files: 82% (12615/15383) Checking out files: 82% (12677/15383) Checking out files: 83% (12768/15383) Checking out files: 84% (12922/15383) Checking out files: 84% (12947/15383) Checking out files: 85% (13076/15383) Checking out files: 85% (13179/15383) Checking out files: 86% (13230/15383) Checking out files: 87% (13384/15383) Checking out files: 87% (13415/15383) Checking out files: 88% (13538/15383) Checking out files: 88% (13613/15383) Checking out files: 89% (13691/15383) Checking out files: 90% (13845/15383) Checking out files: 90% (13861/15383) Checking out files: 91% (13999/15383) Checking out files: 91% (14144/15383) Checking out files: 92% (14153/15383) Checking out files: 93% (14307/15383) Checking out files: 94% (14461/15383) Checking out files: 94% (14466/15383) Checking out files: 95% (14614/15383) Checking out files: 95% (14683/15383) Checking out files: 96% (14768/15383) Checking out files: 96% (14901/15383) Checking out files: 97% (14922/15383) Checking out files: 98% (15076/15383) Checking out files: 98% (15098/15383) Checking out files: 99% (15230/15383) Checking out files: 99% (15334/15383) Checking out files: 100% (15383/15383) Checking out files: 100% (15383/15383), done. Switched to branch 'scsi-post-merge' Switched to branch '2.6.39-stor7' From . * branch scsi-post-merge -> FETCH_HEAD | 1 + arch/s390/include/asm/tlb.h | 62 +- arch/s390/include/asm/tlbflush.h | 13 +- arch/s390/include/asm/unistd.h | 1 + arch/s390/kernel/asm-offsets.c | 4 +- arch/s390/kernel/entry.S | 1 + arch/s390/kernel/entry64.S | 1 + arch/s390/kernel/irq.c | 1 + arch/s390/kernel/process.c | 19 +- arch/s390/kernel/setup.c | 31 +- arch/s390/kernel/smp.c | 30 +- arch/s390/kernel/time.c | 4 +- arch/s390/kernel/topology.c | 16 +- arch/s390/kernel/vdso32/Makefile | 3 + arch/s390/kernel/vdso64/Makefile | 3 + arch/s390/kernel/vmlinux.lds.S | 2 +- arch/s390/mm/extmem.c | 6 +- arch/s390/mm/fault.c | 187 +- arch/s390/mm/hugetlbpage.c | 10 - arch/s390/mm/init.c | 3 +- arch/s390/mm/pageattr.c | 2 +- arch/s390/mm/pgtable.c | 69 +- arch/s390/mm/vmem.c | 14 +- arch/s390/oprofile/hwsampler.c | 21 +- arch/score/Kconfig.debug | 9 - arch/score/mm/init.c | 2 - arch/sh/Kconfig.debug | 9 - arch/sh/include/asm/tlb.h | 28 +- arch/sh/kernel/vmlinux.lds.S | 2 +- arch/sh/mm/init.c | 1 - arch/sparc/Kconfig.debug | 9 - arch/sparc/include/asm/pgalloc_64.h | 3 + arch/sparc/include/asm/pgtable_64.h | 15 +- arch/sparc/include/asm/tlb_64.h | 91 +- arch/sparc/include/asm/tlbflush_64.h | 12 +- arch/sparc/kernel/setup_32.c | 2 +- arch/sparc/kernel/vmlinux.lds.S | 2 +- arch/sparc/mm/init_32.c | 4 +- arch/sparc/mm/tlb.c | 43 +- arch/sparc/mm/tsb.c | 15 +- arch/tile/Kconfig | 8 + arch/tile/Kconfig.debug | 9 - arch/tile/configs/tile_defconfig | 71 - arch/tile/configs/tilegx_defconfig | 1833 ++++++++++++++ arch/tile/configs/tilepro_defconfig | 1163 +++++++++ arch/tile/include/arch/chip_tilegx.h | 258 ++ arch/tile/include/arch/icache.h | 11 +- arch/tile/include/arch/interrupts_64.h | 276 +++ arch/tile/include/arch/spr_def.h | 13 +- arch/tile/include/arch/spr_def_64.h | 173 ++ arch/tile/include/asm/atomic.h | 49 +- arch/tile/include/asm/atomic_32.h | 10 - arch/tile/include/asm/atomic_64.h | 156 ++ arch/tile/include/asm/backtrace.h | 82 +- arch/tile/include/asm/bitops.h | 1 + arch/tile/include/asm/bitops_32.h | 1 - arch/tile/include/asm/bitops_64.h | 105 + arch/tile/include/asm/cacheflush.h | 18 +- arch/tile/include/asm/compat.h | 4 +- arch/tile/include/asm/dma-mapping.h | 3 +- arch/tile/include/asm/fb.h | 1 + arch/tile/include/asm/io.h | 18 + arch/tile/include/asm/irq.h | 2 + arch/tile/include/asm/mmu_context.h | 4 +- arch/tile/include/asm/opcode-tile_32.h | 7 + arch/tile/include/asm/opcode-tile_64.h | 1500 +++++------- arch/tile/include/asm/opcode_constants_64.h | 1043 +++++---- arch/tile/include/asm/page.h | 18 +- arch/tile/include/asm/parport.h | 1 + arch/tile/include/asm/pci.h | 3 +- arch/tile/include/asm/pgtable_64.h | 175 ++ arch/tile/include/asm/processor.h | 9 +- arch/tile/include/asm/serial.h | 1 + arch/tile/include/asm/signal.h | 4 + arch/tile/include/asm/spinlock_64.h | 161 ++ arch/tile/include/asm/stat.h | 2 +- arch/tile/include/asm/swab.h | 6 - arch/tile/include/asm/thread_info.h | 5 +- arch/tile/include/asm/topology.h | 75 +- arch/tile/include/asm/traps.h | 4 + arch/tile/include/asm/unistd.h | 2 +- arch/tile/include/{hv/pagesize.h => asm/vga.h} | 35 +- arch/tile/include/hv/hypervisor.h | 12 +- arch/tile/kernel/backtrace.c | 103 +- arch/tile/kernel/compat.c | 13 +- arch/tile/kernel/compat_signal.c | 4 +- arch/tile/kernel/futex_64.S | 55 + arch/tile/kernel/hardwall.c | 6 +- arch/tile/kernel/head_64.S | 269 +++ arch/tile/kernel/intvec_32.S | 175 +- arch/tile/kernel/intvec_64.S | 1231 ++++++++++ arch/tile/kernel/module.c | 8 +- arch/tile/kernel/pci-dma.c | 2 +- arch/tile/kernel/pci.c | 206 +- arch/tile/kernel/process.c | 52 +- arch/tile/kernel/regs_64.S | 145 ++ arch/tile/kernel/setup.c | 6 + arch/tile/kernel/signal.c | 128 +- arch/tile/kernel/single_step.c | 12 + arch/tile/kernel/stack.c | 14 +- arch/tile/kernel/sys.c | 9 - arch/tile/kernel/tile-desc_32.c | 11 +- arch/tile/kernel/tile-desc_64.c | 2200 +++++++++++++++++ arch/tile/kernel/time.c | 2 + arch/tile/kernel/tlb.c | 12 +- arch/tile/kernel/traps.c | 1 + arch/tile/kernel/vmlinux.lds.S | 2 +- arch/tile/lib/atomic_asm_32.S | 2 +- arch/tile/lib/cacheflush.c | 18 + arch/tile/lib/memchr_64.c | 71 + arch/tile/lib/memcpy_64.c | 220 ++ arch/tile/lib/memcpy_user_64.c | 86 + arch/tile/lib/memset_64.c | 145 ++ arch/tile/lib/spinlock_64.c | 104 + arch/tile/lib/strchr_64.c | 67 + arch/tile/lib/strlen_64.c | 38 + arch/tile/lib/usercopy_64.S | 196 ++ arch/tile/mm/fault.c | 30 +- arch/tile/mm/init.c | 2 - arch/tile/mm/migrate_64.S | 187 ++ arch/um/Kconfig.debug | 16 +- arch/um/Kconfig.x86 | 4 +- arch/um/drivers/Makefile | 4 +- arch/um/drivers/mcast.h | 24 - arch/um/drivers/mcast_kern.c | 120 - arch/um/drivers/mcast_user.c | 165 -- arch/um/drivers/umcast.h | 27 + arch/um/drivers/umcast_kern.c | 188 ++ arch/um/drivers/umcast_user.c | 186 ++ arch/um/drivers/xterm.c | 2 +- arch/um/include/asm/common.lds.S | 2 +- arch/um/include/asm/processor-generic.h | 2 + arch/um/include/asm/smp.h | 1 - arch/um/include/asm/tlb.h | 29 +- arch/um/include/shared/os.h | 7 + arch/um/kernel/Makefile | 1 + arch/um/kernel/early_printk.c | 33 + arch/um/kernel/smp.c | 3 - arch/um/kernel/trap.c | 24 + arch/um/os-Linux/main.c | 3 +- arch/um/os-Linux/process.c | 1 + arch/um/os-Linux/util.c | 5 + arch/unicore32/Kconfig.debug | 7 - arch/unicore32/mm/init.c | 2 +- arch/unicore32/mm/mmu.c | 2 - arch/x86/Kconfig | 3 +- arch/x86/Kconfig.debug | 20 - arch/x86/include/asm/io.h | 24 +- arch/x86/include/asm/linkage.h | 5 - arch/x86/include/asm/percpu.h | 7 +- arch/x86/kernel/apic/io_apic.c | 4 +- arch/x86/kernel/ptrace.c | 4 +- arch/x86/kernel/setup.c | 2 + arch/x86/kernel/tboot.c | 1 - arch/x86/kernel/vmlinux.lds.S | 2 +- arch/x86/kvm/mmu.c | 3 +- arch/x86/mm/fault.c | 12 +- arch/x86/mm/hugetlbpage.c | 4 +- arch/x86/mm/init.c | 2 - arch/xtensa/include/asm/page.h | 4 - arch/xtensa/kernel/vmlinux.lds.S | 2 +- arch/xtensa/mm/mmu.c | 2 - arch/xtensa/mm/pgtable.c | 72 - block/blk-cgroup.c | 200 ++- block/blk-cgroup.h | 40 +- block/blk-core.c | 37 +- block/blk-exec.c | 2 +- block/blk-flush.c | 16 +- block/blk-ioc.c | 3 + block/blk-lib.c | 82 +- block/blk-settings.c | 9 +- block/blk-sysfs.c | 3 +- block/blk-throttle.c | 313 ++- block/blk.h | 23 +- block/cfq-iosched.c | 232 ++- block/elevator.c | 11 +- block/genhd.c | 2 +- drivers/Kconfig | 2 + drivers/Makefile | 3 +- drivers/acpi/Kconfig | 11 - drivers/acpi/Makefile | 1 - drivers/acpi/apei/einj.c | 8 + drivers/acpi/atomicio.c | 4 + drivers/ata/libata-scsi.c | 13 +- drivers/ata/pata_pcmcia.c | 2 +- drivers/base/node.c | 14 +- drivers/bcma/host_pci.c | 1 + drivers/block/Kconfig | 21 + drivers/block/Makefile | 1 + drivers/block/brd.c | 42 +- drivers/block/cciss.c | 571 ++++- drivers/block/cciss.h | 11 +- drivers/block/cciss_cmd.h | 11 + drivers/block/cciss_scsi.c | 41 +- drivers/block/cciss_scsi.h | 4 - drivers/block/drbd/drbd_actlog.c | 2 +- drivers/block/drbd/drbd_bitmap.c | 6 +- drivers/block/drbd/drbd_int.h | 19 +- drivers/block/drbd/drbd_main.c | 37 +- drivers/block/drbd/drbd_nl.c | 127 +- drivers/block/drbd/drbd_receiver.c | 68 +- drivers/block/drbd/drbd_req.c | 20 +- drivers/block/drbd/drbd_req.h | 5 +- drivers/block/drbd/drbd_worker.c | 98 +- drivers/block/loop.c | 28 +- drivers/block/paride/pcd.c | 2 + drivers/block/rbd.c | 27 +- drivers/block/xen-blkback/Makefile | 3 + drivers/block/xen-blkback/blkback.c | 824 +++++++ drivers/block/xen-blkback/common.h | 233 ++ drivers/block/xen-blkback/xenbus.c | 768 ++++++ drivers/block/xen-blkfront.c | 51 +- drivers/bluetooth/bluecard_cs.c | 2 +- drivers/bluetooth/bt3c_cs.c | 2 +- drivers/bluetooth/btuart_cs.c | 2 +- drivers/bluetooth/dtl1_cs.c | 2 +- drivers/cdrom/viocd.c | 4 +- drivers/char/agp/intel-agp.c | 3 + drivers/char/agp/intel-agp.h | 8 + drivers/char/agp/intel-gtt.c | 10 + drivers/char/agp/uninorth-agp.c | 2 +- drivers/char/i8k.c | 166 ++- drivers/char/pcmcia/cm4000_cs.c | 2 +- drivers/char/pcmcia/cm4040_cs.c | 2 +- drivers/char/pcmcia/synclink_cs.c | 2 +- drivers/cpufreq/Makefile | 2 + drivers/cpufreq/db8500-cpufreq.c | 169 ++ drivers/crypto/Kconfig | 2 + drivers/dma/shdma.c | 42 +- drivers/dma/shdma.h | 2 +- drivers/edac/i3200_edac.c | 13 + drivers/gpio/ml_ioh_gpio.c | 3 + drivers/gpio/vx855_gpio.c | 1 + drivers/gpu/drm/drm_edid.c | 61 +- drivers/gpu/drm/drm_fb_helper.c | 207 +-- drivers/gpu/drm/drm_irq.c | 9 +- drivers/gpu/drm/drm_modes.c | 156 ++ drivers/gpu/drm/drm_stub.c | 21 + drivers/gpu/drm/i915/i915_debugfs.c | 131 +- drivers/gpu/drm/i915/i915_dma.c | 60 +- drivers/gpu/drm/i915/i915_drv.c | 68 +- drivers/gpu/drm/i915/i915_drv.h | 113 +- drivers/gpu/drm/i915/i915_gem.c | 45 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 35 +- drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 311 ++- drivers/gpu/drm/i915/i915_reg.h | 35 +- drivers/gpu/drm/i915/i915_suspend.c | 3 +- drivers/gpu/drm/i915/intel_bios.c | 6 +- drivers/gpu/drm/i915/intel_crt.c | 24 +- drivers/gpu/drm/i915/intel_display.c | 2379 +++++++++++-------- drivers/gpu/drm/i915/intel_drv.h | 19 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 88 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 35 +- drivers/gpu/drm/i915/intel_sdvo.c | 10 +- drivers/gpu/drm/i915/intel_tv.c | 13 +- drivers/gpu/drm/nouveau/Kconfig | 2 + drivers/gpu/drm/nouveau/Makefile | 2 + drivers/gpu/drm/nouveau/nouveau_acpi.c | 108 +- drivers/gpu/drm/nouveau/nouveau_bios.c | 7 +- drivers/gpu/drm/nouveau/nouveau_bios.h | 1 + drivers/gpu/drm/nouveau/nouveau_channel.c | 20 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 8 +- drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- drivers/gpu/drm/nouveau/nouveau_drv.c | 25 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 208 +- drivers/gpu/drm/nouveau/nouveau_grctx.h | 10 +- drivers/gpu/drm/nouveau/nouveau_mem.c | 66 +- drivers/gpu/drm/nouveau/nouveau_object.c | 118 +- drivers/gpu/drm/nouveau/nouveau_perf.c | 92 +- drivers/gpu/drm/nouveau/nouveau_pm.c | 21 +- drivers/gpu/drm/nouveau/nouveau_reg.h | 14 +- drivers/gpu/drm/nouveau/nouveau_state.c | 212 +- drivers/gpu/drm/nouveau/nouveau_vm.h | 3 +- drivers/gpu/drm/nouveau/nouveau_volt.c | 10 +- drivers/gpu/drm/nouveau/nv04_crtc.c | 9 +- drivers/gpu/drm/nouveau/nv04_graph.c | 383 ++-- drivers/gpu/drm/nouveau/nv04_instmem.c | 3 + drivers/gpu/drm/nouveau/nv10_graph.c | 212 +- drivers/gpu/drm/nouveau/nv20_graph.c | 510 ++--- drivers/gpu/drm/nouveau/nv40_fifo.c | 2 + drivers/gpu/drm/nouveau/nv40_graph.c | 323 ++-- drivers/gpu/drm/nouveau/nv40_mpeg.c | 311 +++ drivers/gpu/drm/nouveau/nv50_calc.c | 68 +- drivers/gpu/drm/nouveau/nv50_crtc.c | 13 +- drivers/gpu/drm/nouveau/nv50_display.c | 18 +- drivers/gpu/drm/nouveau/nv50_graph.c | 442 ++-- drivers/gpu/drm/nouveau/nv50_grctx.c | 10 +- drivers/gpu/drm/nouveau/nv50_mpeg.c | 256 ++ drivers/gpu/drm/nouveau/nv50_pm.c | 15 + drivers/gpu/drm/nouveau/nv50_vm.c | 12 +- drivers/gpu/drm/nouveau/nv84_crypt.c | 135 +- drivers/gpu/drm/nouveau/nva3_copy.c | 226 ++ drivers/gpu/drm/nouveau/nva3_copy.fuc | 870 +++++++ drivers/gpu/drm/nouveau/nva3_copy.fuc.h | 534 +++++ drivers/gpu/drm/nouveau/nva3_pm.c | 169 ++- drivers/gpu/drm/nouveau/nvc0_copy.c | 243 ++ drivers/gpu/drm/nouveau/nvc0_copy.fuc.h | 527 ++++ drivers/gpu/drm/nouveau/nvc0_fifo.c | 142 +- drivers/gpu/drm/nouveau/nvc0_graph.c | 600 +++--- drivers/gpu/drm/nouveau/nvc0_graph.h | 29 +- drivers/gpu/drm/nouveau/nvc0_grctx.c | 20 +- drivers/gpu/drm/radeon/atom.c | 4 +- drivers/gpu/drm/radeon/atombios.h | 22 +- drivers/gpu/drm/radeon/atombios_crtc.c | 132 +- drivers/gpu/drm/radeon/atombios_dp.c | 1046 +++++---- drivers/gpu/drm/radeon/evergreen.c | 14 +- drivers/gpu/drm/radeon/evergreend.h | 2 + drivers/gpu/drm/radeon/ni.c | 8 +- drivers/gpu/drm/radeon/nid.h | 4 +- drivers/gpu/drm/radeon/radeon_asic.c | 4 + drivers/gpu/drm/radeon/radeon_combios.c | 117 +- drivers/gpu/drm/radeon/radeon_connectors.c | 607 ++++-- drivers/gpu/drm/radeon/radeon_device.c | 3 + drivers/gpu/drm/radeon/radeon_display.c | 10 +- drivers/gpu/drm/radeon/radeon_drv.c | 3 +- drivers/gpu/drm/radeon/radeon_encoders.c | 252 ++- drivers/gpu/drm/radeon/radeon_i2c.c | 2 + drivers/gpu/drm/radeon/radeon_mode.h | 19 +- drivers/gpu/drm/ttm/ttm_page_alloc.c | 4 +- drivers/gpu/vga/vga_switcheroo.c | 6 - drivers/gpu/vga/vgaarb.c | 113 +- drivers/hwmon/Kconfig | 42 +- drivers/hwmon/Makefile | 3 + drivers/hwmon/abituguru.c | 3 - drivers/hwmon/abituguru3.c | 13 - .../power_meter.c => hwmon/acpi_power_meter.c} | 0 drivers/hwmon/adcxx.c | 16 +- drivers/hwmon/emc6w201.c | 539 +++++ drivers/hwmon/f71882fg.c | 115 +- drivers/hwmon/fam15h_power.c | 229 ++ drivers/hwmon/ibmaem.c | 10 +- drivers/hwmon/it87.c | 31 +- drivers/hwmon/jc42.c | 2 +- drivers/hwmon/k10temp.c | 11 +- drivers/hwmon/k8temp.c | 8 +- drivers/hwmon/lm70.c | 10 +- drivers/hwmon/max6650.c | 78 +- drivers/hwmon/sch5627.c | 46 +- drivers/hwmon/ultra45_env.c | 4 +- drivers/i2c/busses/Kconfig | 12 +- drivers/i2c/busses/i2c-eg20t.c | 2 + drivers/i2c/busses/i2c-i801.c | 61 +- drivers/i2c/busses/i2c-nomadik.c | 276 ++- drivers/i2c/busses/i2c-parport-light.c | 10 +- drivers/i2c/busses/i2c-parport.c | 30 +- drivers/i2c/busses/i2c-parport.h | 74 +- drivers/i2c/busses/i2c-sh_mobile.c | 19 +- drivers/i2c/busses/i2c-tegra.c | 39 +- drivers/ide/ide-cd.c | 3 +- drivers/ide/ide-cs.c | 2 +- drivers/input/evdev.c | 19 +- drivers/input/input-compat.h | 2 +- drivers/input/input-polldev.c | 56 +- drivers/input/input.c | 1 - drivers/input/joydev.c | 1 - drivers/input/keyboard/Kconfig | 22 + drivers/input/keyboard/Makefile | 2 + drivers/input/keyboard/adp5589-keys.c | 771 ++++++ drivers/input/keyboard/gpio_keys.c | 11 +- drivers/input/keyboard/mpr121_touchkey.c | 339 +++ drivers/input/keyboard/omap-keypad.c | 6 +- drivers/input/keyboard/qt1070.c | 1 + drivers/input/keyboard/sh_keysc.c | 53 +- drivers/input/keyboard/tegra-kbc.c | 60 +- drivers/input/misc/ad714x.c | 129 +- drivers/input/misc/ati_remote2.c | 9 +- drivers/input/misc/rotary_encoder.c | 119 +- drivers/input/misc/twl4030-pwrbutton.c | 2 +- drivers/input/mouse/elantech.c | 72 +- drivers/input/mouse/elantech.h | 6 + drivers/input/mousedev.c | 1 - drivers/input/touchscreen/Kconfig | 12 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/ads7846.c | 26 +- drivers/input/touchscreen/atmel_mxt_ts.c | 92 +- drivers/input/touchscreen/atmel_tsadcc.c | 2 +- drivers/input/touchscreen/h3600_ts_input.c | 8 +- drivers/input/touchscreen/max11801_ts.c | 272 +++ drivers/input/touchscreen/tsc2007.c | 26 +- drivers/isdn/hardware/avm/avm_cs.c | 2 +- drivers/isdn/hardware/mISDN/netjet.c | 6 + drivers/isdn/hisax/avma1_cs.c | 2 +- drivers/isdn/hisax/elsa_cs.c | 2 +- drivers/isdn/hisax/sedlbauer_cs.c | 2 +- drivers/isdn/hisax/teles_cs.c | 2 +- drivers/leds/Kconfig | 24 +- drivers/leds/Makefile | 2 +- drivers/leds/led-class.c | 3 +- drivers/leds/leds-gpio-register.c | 42 + drivers/leds/leds-h1940.c | 170 -- drivers/leds/leds-lm3530.c | 73 +- drivers/leds/leds-pca9532.c | 191 ++- drivers/leds/leds.h | 7 + drivers/leds/ledtrig-timer.c | 3 + drivers/media/video/omap/omap_vout.c | 2 +- drivers/media/video/omap/omap_voutdef.h | 2 +- drivers/mfd/Kconfig | 22 +- drivers/mfd/Makefile | 5 +- drivers/mfd/ab8500-i2c.c | 3 +- .../mfd/db5500-prcmu-regs.h | 27 +- drivers/mfd/db5500-prcmu.c | 448 ++++ drivers/mfd/db8500-prcmu-regs.h | 166 ++ drivers/mfd/db8500-prcmu.c | 2069 ++++++++++++++++ drivers/mmc/card/block.c | 712 +++++- drivers/mmc/card/mmc_test.c | 116 +- drivers/mmc/card/queue.c | 8 - drivers/mmc/core/bus.c | 11 +- drivers/mmc/core/core.c | 111 +- drivers/mmc/core/core.h | 7 +- drivers/mmc/core/host.c | 4 +- drivers/mmc/core/mmc.c | 186 ++- drivers/mmc/core/mmc_ops.c | 80 +- drivers/mmc/core/mmc_ops.h | 1 - drivers/mmc/core/quirks.c | 89 +- drivers/mmc/core/sd.c | 405 +++- drivers/mmc/core/sd.h | 2 +- drivers/mmc/core/sd_ops.c | 51 +- drivers/mmc/core/sdio.c | 24 +- drivers/mmc/core/sdio_irq.c | 33 +- drivers/mmc/core/sdio_ops.c | 18 +- drivers/mmc/host/Kconfig | 33 +- drivers/mmc/host/Makefile | 1 + drivers/mmc/host/dw_mmc.c | 6 +- drivers/mmc/host/sdhci-pci.c | 49 +- drivers/mmc/host/sdhci-pxa.c | 48 +- drivers/mmc/host/sdhci-tegra.c | 2 + drivers/mmc/host/sdhci.c | 854 ++++++- drivers/mmc/host/sdhci.h | 59 +- drivers/mmc/host/sdricoh_cs.c | 2 +- drivers/mmc/host/sh_mmcif.c | 126 +- drivers/mmc/host/sh_mobile_sdhi.c | 50 +- drivers/mmc/host/tmio_mmc.c | 32 +- drivers/mmc/host/tmio_mmc.h | 16 +- drivers/mmc/host/tmio_mmc_dma.c | 21 +- drivers/mmc/host/tmio_mmc_pio.c | 184 ++- drivers/mmc/host/vub300.c | 2506 ++++++++++++++++++++ drivers/mtd/maps/pcmciamtd.c | 2 +- drivers/mtd/ubi/cdev.c | 14 +- drivers/mtd/ubi/debug.c | 21 +- drivers/mtd/ubi/debug.h | 161 +- drivers/mtd/ubi/io.c | 6 +- drivers/mtd/ubi/scan.c | 2 +- drivers/mtd/ubi/ubi-media.h | 6 +- drivers/mtd/ubi/ubi.h | 4 +- drivers/mtd/ubi/wl.c | 3 +- drivers/net/Makefile | 1 + drivers/net/arm/ixp4xx_eth.c | 195 ++- drivers/net/benet/be_cmds.c | 3 +- drivers/net/bnx2x/bnx2x_cmn.c | 2 +- drivers/net/bnx2x/bnx2x_main.c | 3 +- drivers/net/bonding/bond_alb.c | 4 - drivers/net/bonding/bond_main.c | 28 +- drivers/net/bonding/bond_sysfs.c | 16 +- drivers/net/can/softing/softing_cs.c | 2 +- drivers/net/ehea/ehea_main.c | 2 +- drivers/net/gianfar_ptp.c | 588 +++++ drivers/net/ioc3-eth.c | 2 +- drivers/net/irda/bfin_sir.c | 59 +- drivers/net/irda/bfin_sir.h | 63 +- drivers/net/pcmcia/3c574_cs.c | 2 +- drivers/net/pcmcia/3c589_cs.c | 2 +- drivers/net/pcmcia/axnet_cs.c | 2 +- drivers/net/pcmcia/com20020_cs.c | 2 +- drivers/net/pcmcia/fmvj18x_cs.c | 2 +- drivers/net/pcmcia/ibmtr_cs.c | 2 +- drivers/net/pcmcia/nmclan_cs.c | 2 +- drivers/net/pcmcia/pcnet_cs.c | 2 +- drivers/net/pcmcia/smc91c92_cs.c | 2 +- drivers/net/pcmcia/xirc2ps_cs.c | 2 +- drivers/net/phy/Makefile | 1 + drivers/net/phy/dp83640.c | 1100 +++++++++ drivers/net/phy/dp83640_reg.h | 267 +++ drivers/net/tg3.c | 1 + drivers/net/tile/tilepro.c | 8 +- drivers/net/usb/cdc_ncm.c | 73 +- drivers/net/via-velocity.h | 2 +- drivers/net/wireless/airo.c | 33 +- drivers/net/wireless/airo_cs.c | 2 +- drivers/net/wireless/ath/ath9k/ahb.c | 2 +- drivers/net/wireless/ath/ath9k/ani.c | 2 +- drivers/net/wireless/ath/ath9k/ani.h | 2 +- drivers/net/wireless/ath/ath9k/ar5008_initvals.h | 2 +- drivers/net/wireless/ath/ath9k/ar5008_phy.c | 2 +- drivers/net/wireless/ath/ath9k/ar9001_initvals.h | 2 +- drivers/net/wireless/ath/ath9k/ar9002_calib.c | 2 +- drivers/net/wireless/ath/ath9k/ar9002_hw.c | 2 +- drivers/net/wireless/ath/ath9k/ar9002_initvals.h | 2 +- drivers/net/wireless/ath/ath9k/ar9002_mac.c | 2 +- drivers/net/wireless/ath/ath9k/ar9002_phy.c | 2 +- drivers/net/wireless/ath/ath9k/ar9002_phy.h | 2 +- .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 2 +- drivers/net/wireless/ath/ath9k/ar9003_calib.c | 2 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 16 + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 2 +- drivers/net/wireless/ath/ath9k/ar9003_mac.c | 2 +- drivers/net/wireless/ath/ath9k/ar9003_mac.h | 2 +- drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 2 +- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 2 +- drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 +- drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 2 +- drivers/net/wireless/ath/ath9k/ath9k.h | 5 +- drivers/net/wireless/ath/ath9k/beacon.c | 48 +- drivers/net/wireless/ath/ath9k/btcoex.c | 2 +- drivers/net/wireless/ath/ath9k/btcoex.h | 2 +- drivers/net/wireless/ath/ath9k/calib.c | 2 +- drivers/net/wireless/ath/ath9k/calib.h | 2 +- drivers/net/wireless/ath/ath9k/common.c | 2 +- drivers/net/wireless/ath/ath9k/common.h | 2 +- drivers/net/wireless/ath/ath9k/debug.c | 10 +- drivers/net/wireless/ath/ath9k/debug.h | 2 +- drivers/net/wireless/ath/ath9k/eeprom.c | 2 +- drivers/net/wireless/ath/ath9k/eeprom.h | 2 +- drivers/net/wireless/ath/ath9k/eeprom_4k.c | 2 +- drivers/net/wireless/ath/ath9k/eeprom_9287.c | 2 +- drivers/net/wireless/ath/ath9k/eeprom_def.c | 2 +- drivers/net/wireless/ath/ath9k/gpio.c | 2 +- drivers/net/wireless/ath/ath9k/hif_usb.c | 2 +- drivers/net/wireless/ath/ath9k/hif_usb.h | 4 +- drivers/net/wireless/ath/ath9k/htc.h | 25 +- drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 2 +- drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 2 +- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 9 +- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 79 +- drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 6 +- drivers/net/wireless/ath/ath9k/htc_hst.c | 2 +- drivers/net/wireless/ath/ath9k/htc_hst.h | 2 +- drivers/net/wireless/ath/ath9k/hw-ops.h | 2 +- drivers/net/wireless/ath/ath9k/hw.c | 2 +- drivers/net/wireless/ath/ath9k/hw.h | 2 +- drivers/net/wireless/ath/ath9k/init.c | 2 +- drivers/net/wireless/ath/ath9k/mac.c | 2 +- drivers/net/wireless/ath/ath9k/mac.h | 2 +- drivers/net/wireless/ath/ath9k/main.c | 42 +- drivers/net/wireless/ath/ath9k/pci.c | 2 +- drivers/net/wireless/ath/ath9k/phy.h | 2 +- drivers/net/wireless/ath/ath9k/rc.c | 2 +- drivers/net/wireless/ath/ath9k/rc.h | 2 +- drivers/net/wireless/ath/ath9k/recv.c | 2 +- drivers/net/wireless/ath/ath9k/reg.h | 2 +- drivers/net/wireless/ath/ath9k/wmi.c | 2 +- drivers/net/wireless/ath/ath9k/wmi.h | 2 +- drivers/net/wireless/ath/ath9k/xmit.c | 2 +- drivers/net/wireless/ath/carl9170/carl9170.h | 4 + drivers/net/wireless/ath/carl9170/fw.c | 19 +- drivers/net/wireless/ath/carl9170/main.c | 10 +- drivers/net/wireless/ath/hw.c | 10 +- drivers/net/wireless/atmel_cs.c | 4 +- drivers/net/wireless/b43/b43.h | 24 +- drivers/net/wireless/b43/dma.c | 37 +- drivers/net/wireless/b43/leds.c | 4 +- drivers/net/wireless/b43/lo.c | 4 +- drivers/net/wireless/b43/main.c | 194 +- drivers/net/wireless/b43/pcmcia.c | 2 +- drivers/net/wireless/b43/phy_a.c | 16 +- drivers/net/wireless/b43/phy_common.c | 8 +- drivers/net/wireless/b43/phy_g.c | 48 +- drivers/net/wireless/b43/phy_lp.c | 22 +- drivers/net/wireless/b43/phy_n.c | 24 +- drivers/net/wireless/b43/pio.c | 30 +- drivers/net/wireless/b43/rfkill.c | 6 +- drivers/net/wireless/b43/sdio.c | 4 +- drivers/net/wireless/b43/sysfs.c | 4 +- drivers/net/wireless/b43/tables_lpphy.c | 4 +- drivers/net/wireless/b43/wa.c | 4 +- drivers/net/wireless/b43/xmit.c | 2 +- drivers/net/wireless/hostap/hostap_cs.c | 2 +- drivers/net/wireless/iwlwifi/iwl-1000.c | 4 - drivers/net/wireless/iwlwifi/iwl-2000.c | 8 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 12 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 12 +- drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 14 +- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 14 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 86 +- drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 9 +- drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 4 +- drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 16 +- drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 6 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 250 +-- drivers/net/wireless/iwlwifi/iwl-agn.h | 13 +- drivers/net/wireless/iwlwifi/iwl-commands.h | 5 +- drivers/net/wireless/iwlwifi/iwl-core.h | 10 - drivers/net/wireless/iwlwifi/iwl-dev.h | 66 +- drivers/net/wireless/iwlwifi/iwl-devtrace.h | 58 +- drivers/net/wireless/iwlwifi/iwl-eeprom.c | 7 +- drivers/net/wireless/iwlwifi/iwl-hcmd.c | 9 +- drivers/net/wireless/iwlwifi/iwl-led.c | 4 +- drivers/net/wireless/iwlwifi/iwl-sta.c | 12 +- drivers/net/wireless/iwlwifi/iwl-sv-open.c | 177 ++- drivers/net/wireless/iwlwifi/iwl-testmode.h | 34 + drivers/net/wireless/iwlwifi/iwl-tx.c | 364 +++- drivers/net/wireless/iwmc3200wifi/rx.c | 4 +- drivers/net/wireless/libertas/if_cs.c | 2 +- drivers/net/wireless/mwifiex/11n_aggr.c | 4 + drivers/net/wireless/mwifiex/main.h | 9 +- drivers/net/wireless/mwifiex/txrx.c | 4 +- drivers/net/wireless/mwifiex/wmm.c | 59 +- drivers/net/wireless/orinoco/orinoco_cs.c | 2 +- drivers/net/wireless/orinoco/spectrum_cs.c | 2 +- drivers/net/wireless/p54/p54usb.c | 1 + drivers/net/wireless/ray_cs.c | 2 +- drivers/net/wireless/rndis_wlan.c | 3 +- drivers/net/wireless/rtlwifi/ps.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 69 + drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | 1 + drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 1 + drivers/net/wireless/wl3501_cs.c | 2 +- drivers/net/xen-netfront.c | 2 + drivers/parport/parport_cs.c | 2 +- drivers/pci/pci.c | 25 +- drivers/pcmcia/ds.c | 6 +- drivers/pcmcia/sa1100_generic.c | 2 +- drivers/platform/x86/Kconfig | 7 + drivers/platform/x86/Makefile | 1 + drivers/platform/x86/ibm_rtl.c | 13 + drivers/platform/x86/intel_ips.c | 13 + drivers/platform/x86/mxm-wmi.c | 111 + drivers/ptp/Kconfig | 75 + drivers/ptp/Makefile | 7 + drivers/ptp/ptp_chardev.c | 159 ++ drivers/ptp/ptp_clock.c | 343 +++ drivers/ptp/ptp_ixp46x.c | 332 +++ drivers/ptp/ptp_private.h | 92 + drivers/ptp/ptp_sysfs.c | 230 ++ drivers/regulator/Kconfig | 7 + drivers/regulator/Makefile | 1 + drivers/regulator/db8500-prcmu.c | 558 +++++ drivers/rtc/Kconfig | 7 + drivers/rtc/Makefile | 1 + drivers/rtc/rtc-tile.c | 162 ++ drivers/s390/block/dasd_alias.c | 4 - drivers/s390/block/dasd_eckd.c | 11 +- drivers/s390/char/Kconfig | 12 - drivers/s390/char/Makefile | 3 +- drivers/s390/char/monwriter.c | 4 +- drivers/s390/char/raw3270.c | 2 - drivers/s390/char/sclp.h | 24 + drivers/s390/char/sclp_config.c | 14 +- drivers/s390/char/sclp_ocf.c | 145 ++ drivers/s390/char/sclp_sdias.c | 3 - drivers/s390/char/sclp_tty.c | 122 +- drivers/s390/char/tape_3590.c | 11 +- drivers/s390/char/tape_block.c | 444 ---- drivers/s390/char/tape_std.c | 3 +- drivers/s390/cio/chsc.c | 35 +- drivers/s390/cio/device_fsm.c | 8 +- drivers/s390/cio/device_ops.c | 3 - drivers/s390/cio/qdio_main.c | 2 +- drivers/s390/crypto/ap_bus.c | 8 +- drivers/scsi/pcmcia/aha152x_stub.c | 2 +- drivers/scsi/pcmcia/fdomain_stub.c | 2 +- drivers/scsi/pcmcia/nsp_cs.c | 2 +- drivers/scsi/pcmcia/qlogic_stub.c | 2 +- drivers/scsi/pcmcia/sym53c500_cs.c | 2 +- drivers/scsi/qla4xxx/ql4_nx.c | 21 + drivers/scsi/sr.c | 2 +- drivers/spi/coldfire_qspi.c | 1 + drivers/staging/ath6kl/os/linux/cfg80211.c | 2 +- drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 2 +- drivers/staging/comedi/drivers/cb_das16_cs.c | 2 +- drivers/staging/comedi/drivers/das08_cs.c | 2 +- drivers/staging/comedi/drivers/ni_daq_700.c | 2 +- drivers/staging/comedi/drivers/ni_daq_dio24.c | 2 +- drivers/staging/comedi/drivers/ni_labpc_cs.c | 2 +- drivers/staging/comedi/drivers/ni_mio_cs.c | 2 +- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 2 +- drivers/staging/wlags49_h2/wl_cs.c | 2 +- drivers/staging/wlan-ng/cfg80211.c | 2 +- drivers/staging/zcache/zcache.c | 5 +- drivers/telephony/ixj_pcmcia.c | 2 +- drivers/tty/ipwireless/main.c | 2 +- drivers/tty/serial/68328serial.c | 2 +- drivers/tty/serial/pch_uart.c | 1 + drivers/tty/serial/serial_cs.c | 2 +- drivers/usb/host/sl811_cs.c | 2 +- drivers/video/Kconfig | 42 +- drivers/video/Makefile | 1 + drivers/video/amifb.c | 27 +- drivers/video/backlight/adp5520_bl.c | 6 +- drivers/video/da8xx-fb.c | 4 +- drivers/video/efifb.c | 4 +- drivers/video/mb862xx/Makefile | 5 +- drivers/video/mb862xx/mb862xx-i2c.c | 178 ++ drivers/video/mb862xx/mb862xx_reg.h | 58 +- drivers/video/mb862xx/mb862xxfb.h | 36 + .../video/mb862xx/{mb862xxfb.c => mb862xxfbdrv.c} | 152 ++- drivers/video/omap/dispc.c | 4 +- drivers/video/omap/omapfb_main.c | 2 +- drivers/video/omap/rfbi.c | 2 +- drivers/video/omap2/Makefile | 4 +- drivers/video/omap2/displays/Kconfig | 9 +- drivers/video/omap2/displays/panel-acx565akm.c | 2 +- drivers/video/omap2/displays/panel-generic-dpi.c | 57 +- .../omap2/displays/panel-lgphilips-lb035q02.c | 2 +- .../omap2/displays/panel-nec-nl8048hl11-01b.c | 2 +- .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 6 +- drivers/video/omap2/displays/panel-taal.c | 536 ++++- .../video/omap2/displays/panel-tpo-td043mtea1.c | 10 +- drivers/video/omap2/dss/Kconfig | 33 +- drivers/video/omap2/dss/core.c | 15 +- drivers/video/omap2/dss/dispc.c | 1552 +++++++------ drivers/video/omap2/dss/dispc.h | 691 ++++++ drivers/video/omap2/dss/display.c | 46 +- drivers/video/omap2/dss/dpi.c | 113 +- drivers/video/omap2/dss/dsi.c | 2367 +++++++++++++------ drivers/video/omap2/dss/dss.c | 118 +- drivers/video/omap2/dss/dss.h | 98 +- drivers/video/omap2/dss/dss_features.c | 105 +- drivers/video/omap2/dss/dss_features.h | 39 +- drivers/video/omap2/dss/hdmi.c | 461 ++++- drivers/video/omap2/dss/hdmi.h | 222 ++- drivers/video/omap2/dss/hdmi_omap4_panel.c | 2 +- drivers/video/omap2/dss/manager.c | 14 +- drivers/video/omap2/dss/overlay.c | 43 +- drivers/video/omap2/dss/rfbi.c | 176 +-- drivers/video/omap2/dss/sdi.c | 2 +- drivers/video/omap2/dss/venc.c | 23 +- drivers/video/omap2/omapfb/omapfb-ioctl.c | 14 +- drivers/video/omap2/omapfb/omapfb-main.c | 231 +- drivers/video/omap2/omapfb/omapfb-sysfs.c | 23 +- drivers/video/omap2/omapfb/omapfb.h | 8 +- drivers/video/s3c-fb.c | 121 +- drivers/video/s3c2410fb.c | 8 +- drivers/video/s3fb.c | 209 ++- drivers/video/savage/savagefb-i2c.c | 2 + drivers/video/savage/savagefb.h | 8 +- drivers/video/savage/savagefb_driver.c | 15 +- drivers/video/sh7760fb.c | 6 +- drivers/video/sh_mobile_hdmi.c | 10 +- drivers/video/sh_mobile_lcdcfb.c | 126 +- drivers/video/sh_mobile_lcdcfb.h | 1 + drivers/video/sh_mobile_meram.c | 567 +++++ drivers/video/sh_mobile_meram.h | 41 + drivers/video/sm501fb.c | 24 +- drivers/video/udlfb.c | 20 +- fs/9p/Kconfig | 5 +- fs/9p/vfs_inode_dotl.c | 11 +- fs/Kconfig | 17 + fs/binfmt_flat.c | 8 + fs/block_dev.c | 17 +- fs/ceph/addr.c | 5 +- fs/ceph/caps.c | 61 +- fs/ceph/dir.c | 7 +- fs/ceph/export.c | 25 +- fs/ceph/mds_client.c | 7 +- fs/ceph/mds_client.h | 1 + fs/dcache.c | 8 +- fs/dlm/config.c | 9 +- fs/dlm/config.h | 1 + fs/dlm/dlm_internal.h | 3 + fs/dlm/lock.c | 182 ++- fs/dlm/lock.h | 1 + fs/dlm/lockspace.c | 6 +- fs/dlm/plock.c | 65 +- fs/dlm/user.c | 1 - fs/drop_caches.c | 5 +- fs/exec.c | 12 +- fs/ext2/super.c | 3 +- fs/ext3/namei.c | 80 +- fs/fscache/operation.c | 10 - fs/fscache/page.c | 13 - fs/gfs2/glock.c | 5 +- fs/gfs2/quota.c | 12 +- fs/gfs2/quota.h | 4 +- fs/hugetlbfs/inode.c | 4 +- fs/inode.c | 9 +- fs/jbd/commit.c | 15 +- fs/jbd/journal.c | 16 +- fs/jbd/transaction.c | 3 +- fs/jbd2/commit.c | 6 - fs/mbcache.c | 10 +- fs/ncpfs/inode.c | 4 +- fs/nfs/dir.c | 5 +- fs/nfs/internal.h | 2 +- fs/partitions/check.c | 10 +- fs/proc/Makefile | 1 + fs/proc/base.c | 20 +- fs/proc/generic.c | 1 + fs/proc/inode.c | 7 + fs/proc/internal.h | 26 + fs/proc/namespaces.c | 198 ++ fs/proc/task_mmu.c | 204 ++- fs/quota/dquot.c | 5 +- fs/splice.c | 33 +- fs/ubifs/budget.c | 104 +- fs/ubifs/commit.c | 2 +- fs/ubifs/debug.c | 167 +- fs/ubifs/debug.h | 178 +- fs/ubifs/dir.c | 4 +- fs/ubifs/file.c | 28 +- fs/ubifs/find.c | 10 +- fs/ubifs/gc.c | 71 +- fs/ubifs/io.c | 33 +- fs/ubifs/journal.c | 29 +- fs/ubifs/log.c | 28 +- fs/ubifs/lprops.c | 115 +- fs/ubifs/lpt_commit.c | 55 +- fs/ubifs/master.c | 8 +- fs/ubifs/misc.h | 17 + fs/ubifs/orphan.c | 3 +- fs/ubifs/recovery.c | 354 ++-- fs/ubifs/replay.c | 468 ++-- fs/ubifs/sb.c | 153 ++- fs/ubifs/super.c | 46 +- fs/ubifs/tnc.c | 10 +- fs/ubifs/tnc_commit.c | 18 +- fs/ubifs/ubifs-media.h | 30 +- fs/ubifs/ubifs.h | 86 +- fs/ubifs/xattr.c | 8 +- fs/xfs/linux-2.6/xfs_buf.c | 4 +- fs/xfs/linux-2.6/xfs_sync.c | 5 +- fs/xfs/quota/xfs_qm.c | 6 +- include/asm-generic/audit_change_attr.h | 4 + include/asm-generic/audit_dir_write.h | 14 + include/asm-generic/audit_read.h | 5 + include/asm-generic/audit_write.h | 2 + include/asm-generic/bug.h | 37 + include/asm-generic/cacheflush.h | 5 +- include/asm-generic/pgtable.h | 12 +- include/asm-generic/resource.h | 2 +- include/asm-generic/tlb.h | 156 +- include/asm-generic/unistd.h | 221 +- include/asm-generic/vmlinux.lds.h | 61 +- include/drm/drmP.h | 49 +- include/drm/drm_crtc.h | 6 +- include/drm/drm_dp_helper.h | 5 + include/drm/drm_edid.h | 25 +- include/drm/drm_fb_helper.h | 16 +- include/linux/Kbuild | 2 + include/linux/bitmap.h | 5 +- include/linux/blk_types.h | 2 - include/linux/blkdev.h | 15 +- include/linux/bootmem.h | 25 +- include/linux/c2port.h | 3 - include/linux/capability.h | 5 - include/linux/ceph/ceph_fs.h | 1 + include/linux/compat.h | 236 ++- include/linux/compiler-gcc.h | 4 + include/linux/compiler-gcc4.h | 2 +- include/linux/cpumask.h | 15 + include/linux/dlm_plock.h | 6 +- include/linux/drbd.h | 10 +- include/linux/drbd_tag_magic.h | 2 +- include/linux/fs.h | 7 +- include/linux/fscache-cache.h | 12 - include/linux/genalloc.h | 25 +- include/linux/genhd.h | 2 +- include/linux/gfp.h | 9 +- include/linux/gpio_keys.h | 8 +- include/linux/huge_mm.h | 8 +- include/linux/i2c.h | 2 +- include/linux/i2c/i2c-sh_mobile.h | 10 + include/linux/i2c/mpr121_touchkey.h | 20 + include/linux/i2c/tsc2007.h | 7 + include/linux/if_link.h | 1 + include/linux/if_vlan.h | 5 + include/linux/init_task.h | 7 - include/linux/input/ad714x.h | 3 +- include/linux/input/adp5589.h | 213 ++ include/linux/kernel.h | 39 + include/linux/key.h | 13 + include/linux/kmod.h | 3 + include/linux/leds-pca9532.h | 3 +- include/linux/leds.h | 2 + include/linux/linkage.h | 4 - include/linux/lockdep.h | 3 + include/linux/lru_cache.h | 12 +- include/linux/lsm_audit.h | 11 +- include/linux/memblock.h | 9 +- include/linux/mempolicy.h | 7 +- include/linux/mfd/db5500-prcmu.h | 45 + include/linux/mfd/db8500-prcmu.h | 978 ++++++++ include/linux/mfd/tmio.h | 17 + include/linux/mm.h | 121 +- include/linux/mm_types.h | 19 +- include/linux/mmc/Kbuild | 1 + include/linux/mmc/card.h | 189 ++- include/linux/mmc/core.h | 5 +- include/linux/mmc/host.h | 49 +- include/linux/mmc/ioctl.h | 54 + include/linux/mmc/mmc.h | 18 + include/linux/mmc/sd.h | 9 +- include/linux/mmc/sdhci.h | 15 + include/linux/mmc/sh_mobile_sdhi.h | 4 + include/linux/mmu_notifier.h | 2 +- include/linux/mmzone.h | 9 +- include/linux/mtd/ubi.h | 4 +- include/linux/mutex.h | 9 + include/linux/mxm-wmi.h | 33 + include/linux/oom.h | 2 + include/linux/page-flags.h | 2 +- include/linux/pagemap.h | 15 + include/linux/pci.h | 7 +- include/linux/percpu_counter.h | 6 +- include/linux/posix-timers.h | 1 + include/linux/printk.h | 7 + include/linux/proc_fs.h | 29 +- include/linux/ptp_classify.h | 7 + include/linux/ptp_clock.h | 84 + include/linux/ptp_clock_kernel.h | 139 ++ include/linux/regulator/db8500-prcmu.h | 45 + include/linux/rfkill-gpio.h | 43 + include/linux/rmap.h | 29 +- include/linux/rotary_encoder.h | 1 + include/linux/sched.h | 2 +- include/linux/shmem_fs.h | 8 +- include/linux/spi/ads7846.h | 3 +- include/linux/syscalls.h | 1 + include/linux/vmstat.h | 7 +- include/linux/xattr.h | 8 +- include/mtd/ubi-user.h | 40 +- include/net/9p/9p.h | 13 +- include/net/9p/client.h | 2 +- include/net/9p/transport.h | 3 +- include/net/cfg80211.h | 8 +- include/net/dst.h | 2 + include/net/net_namespace.h | 1 + include/pcmcia/ds.h | 2 +- .../video/omap-panel-generic-dpi.h | 8 +- .../video/omap-panel-nokia-dsi.h | 14 +- .../plat/display.h => include/video/omapdss.h | 114 +- include/video/sh_mobile_lcdc.h | 3 + include/video/sh_mobile_meram.h | 68 + include/xen/interface/io/blkif.h | 13 + init/Kconfig | 30 +- init/calibrate.c | 75 +- init/main.c | 3 + ipc/namespace.c | 37 + kernel/capability.c | 4 - kernel/compat.c | 8 + kernel/cred.c | 6 +- kernel/fork.c | 42 +- kernel/hrtimer.c | 2 +- kernel/irq/proc.c | 54 +- kernel/kmod.c | 100 + kernel/mutex.c | 25 +- kernel/nsproxy.c | 42 + kernel/posix-timers.c | 25 +- kernel/printk.c | 93 +- kernel/ptrace.c | 2 +- kernel/signal.c | 6 +- kernel/sysctl.c | 8 +- kernel/utsname.c | 39 + kernel/workqueue.c | 4 +- lib/Kconfig.debug | 20 + lib/audit.c | 2 + lib/bitmap.c | 109 +- lib/flex_array.c | 26 +- lib/genalloc.c | 45 +- lib/kstrtox.c | 26 + lib/lru_cache.c | 2 +- lib/show_mem.c | 2 +- lib/vsprintf.c | 2 +- mm/backing-dev.c | 4 +- mm/filemap.c | 71 +- mm/filemap_xip.c | 4 +- mm/fremap.c | 4 +- mm/huge_memory.c | 25 +- mm/hugetlb.c | 14 +- mm/init-mm.c | 1 - mm/internal.h | 4 + mm/ksm.c | 7 +- mm/memcontrol.c | 13 +- mm/memory-failure.c | 21 +- mm/memory.c | 440 ++-- mm/memory_hotplug.c | 21 +- mm/mempolicy.c | 164 +-- mm/migrate.c | 17 +- mm/mmap.c | 121 +- mm/mremap.c | 5 +- mm/nobootmem.c | 23 - mm/nommu.c | 108 +- mm/oom_kill.c | 36 +- mm/page_alloc.c | 121 +- mm/percpu.c | 6 +- mm/readahead.c | 2 +- mm/rmap.c | 183 ++- mm/shmem.c | 320 +++- mm/slub.c | 4 +- mm/swap.c | 52 +- mm/swapfile.c | 6 +- mm/util.c | 24 + mm/vmalloc.c | 15 +- mm/vmscan.c | 80 +- mm/vmstat.c | 264 ++- net/802/psnap.c | 1 - net/8021q/vlan.h | 5 - net/9p/Kconfig | 8 +- net/9p/client.c | 30 +- net/9p/mod.c | 4 +- net/9p/trans_fd.c | 7 +- net/9p/util.c | 2 +- net/atm/proc.c | 4 +- net/bridge/br_netfilter.c | 6 +- net/can/bcm.c | 6 +- net/ceph/messenger.c | 82 +- net/ceph/osd_client.c | 19 +- net/ceph/osdmap.c | 13 +- net/core/dev.c | 12 +- net/core/dst.c | 2 +- net/core/fib_rules.c | 1 + net/core/filter.c | 4 +- net/core/net_namespace.c | 65 + net/core/rtnetlink.c | 14 +- net/dns_resolver/dns_key.c | 10 +- net/ipv4/igmp.c | 10 +- net/ipv4/ping.c | 3 - net/ipv4/raw.c | 2 +- net/ipv4/tcp_ipv4.c | 6 +- net/ipv4/udp.c | 2 +- net/ipv6/raw.c | 2 +- net/ipv6/tcp_ipv6.c | 6 +- net/ipv6/udp.c | 2 +- net/ipv6/xfrm6_tunnel.c | 2 +- net/key/af_key.c | 2 +- net/mac80211/iface.c | 4 +- net/mac80211/main.c | 22 +- net/mac80211/mesh.h | 7 +- net/mac80211/mesh_pathtbl.c | 204 +- net/mac80211/scan.c | 5 + net/netlink/af_netlink.c | 2 +- net/packet/af_packet.c | 2 +- net/phonet/socket.c | 2 +- net/rfkill/Kconfig | 9 + net/rfkill/Makefile | 1 + net/rfkill/rfkill-gpio.c | 227 ++ net/sched/sch_sfq.c | 22 +- net/sctp/associola.c | 16 + net/sctp/proc.c | 4 +- net/sunrpc/auth.c | 4 +- net/unix/af_unix.c | 2 +- net/wireless/core.h | 5 +- net/wireless/nl80211.c | 12 +- net/wireless/sme.c | 19 +- net/wireless/util.c | 2 +- scripts/.gitignore | 1 + scripts/Kbuild.include | 12 + scripts/Makefile | 7 +- scripts/Makefile.asm-generic | 23 + scripts/Makefile.build | 74 +- scripts/Makefile.headersinst | 10 +- scripts/Makefile.lib | 2 +- scripts/basic/.gitignore | 2 - scripts/basic/Makefile | 3 +- scripts/checkpatch.pl | 13 +- scripts/checkversion.pl | 1 + scripts/{basic => }/docproc.c | 0 scripts/export_report.pl | 26 +- scripts/gen_initramfs_list.sh | 27 +- scripts/kallsyms.c | 2 + scripts/kconfig/Makefile | 38 +- scripts/kconfig/confdata.c | 20 +- scripts/kconfig/expr.h | 4 - scripts/kconfig/gconf.c | 12 +- scripts/kconfig/lex.zconf.c_shipped | 33 +- scripts/kconfig/nconf.c | 14 +- scripts/kconfig/qconf.cc | 5 +- scripts/kconfig/zconf.l | 33 +- scripts/mkcompile_h | 30 +- scripts/package/Makefile | 4 +- scripts/package/mkspec | 19 +- scripts/patch-kernel | 2 +- security/Kconfig | 1 + security/commoncap.c | 13 +- security/keys/internal.h | 4 +- security/keys/keyctl.c | 6 + security/keys/keyring.c | 37 +- security/keys/proc.c | 2 +- security/keys/process_keys.c | 12 +- security/keys/request_key.c | 3 +- security/keys/request_key_auth.c | 3 +- security/keys/user_defined.c | 4 +- security/lsm_audit.c | 59 +- security/selinux/avc.c | 2 +- security/selinux/hooks.c | 92 +- security/selinux/include/security.h | 9 +- security/selinux/netnode.c | 1 + security/selinux/selinuxfs.c | 28 +- security/selinux/ss/policydb.c | 244 ++- security/selinux/ss/policydb.h | 12 +- security/selinux/ss/services.c | 72 +- security/smack/smack.h | 11 +- security/smack/smack_lsm.c | 48 +- security/tomoyo/common.c | 17 +- security/tomoyo/file.c | 1 - security/tomoyo/memory.c | 1 + security/tomoyo/mount.c | 1 + security/tomoyo/util.c | 2 +- sound/pcmcia/pdaudiocf/pdaudiocf.c | 2 +- sound/pcmcia/vx/vxpocket.c | 2 +- usr/gen_init_cpio.c | 53 +- 1369 files changed, 67618 insertions(+), 21757 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-ptp create mode 100644 Documentation/hwmon/emc6w201 create mode 100644 Documentation/hwmon/fam15h_power create mode 100644 Documentation/mmc/mmc-dev-parts.txt create mode 100644 Documentation/ptp/ptp.txt create mode 100644 Documentation/ptp/testptp.c create mode 100644 Documentation/ptp/testptp.mk create mode 100644 arch/alpha/include/asm/gpio.h create mode 100644 arch/arm/mach-ixp4xx/include/mach/ixp46x_ts.h create mode 100644 arch/arm/mach-shmobile/cpuidle.c create mode 100644 arch/arm/mach-shmobile/pm-sh7372.c create mode 100644 arch/arm/mach-shmobile/sleep-sh7372.S create mode 100644 arch/arm/mach-shmobile/suspend.c delete mode 100644 arch/arm/mach-ux500/cpufreq.c create mode 100644 arch/arm/mach-ux500/include/mach/irqs-board-u5500.h delete mode 100644 arch/arm/mach-ux500/include/mach/prcmu-defs.h delete mode 100644 arch/arm/mach-ux500/include/mach/prcmu.h delete mode 100644 arch/arm/mach-ux500/prcmu.c create mode 100644 arch/blackfin/include/asm/bfin_pfmon.h create mode 100644 arch/blackfin/include/asm/perf_event.h create mode 100644 arch/blackfin/include/mach-common/irq.h create mode 100644 arch/blackfin/kernel/debug-mmrs.c create mode 100644 arch/blackfin/kernel/perf_event.c delete mode 100644 arch/m68k/kernel/asm-offsets_mm.c delete mode 100644 arch/m68k/kernel/asm-offsets_no.c delete mode 100644 arch/m68k/kernel/m68k_ksyms_mm.c delete mode 100644 arch/m68k/kernel/m68k_ksyms_no.c delete mode 100644 arch/m68k/kernel/sys_m68k_mm.c delete mode 100644 arch/m68k/kernel/sys_m68k_no.c delete mode 100644 arch/m68k/lib/Makefile_mm delete mode 100644 arch/m68k/lib/Makefile_no delete mode 100644 arch/m68k/lib/checksum.c delete mode 100644 arch/m68k/lib/muldi3_mm.c delete mode 100644 arch/m68k/lib/muldi3_no.c delete mode 100644 arch/m68k/mm/Makefile_mm delete mode 100644 arch/m68k/mm/Makefile_no delete mode 100644 arch/m68k/mm/kmap_mm.c delete mode 100644 arch/m68k/mm/kmap_no.c delete mode 100644 arch/tile/configs/tile_defconfig create mode 100644 arch/tile/configs/tilegx_defconfig create mode 100644 arch/tile/configs/tilepro_defconfig create mode 100644 arch/tile/include/arch/chip_tilegx.h create mode 100644 arch/tile/include/arch/interrupts_64.h create mode 100644 arch/tile/include/arch/spr_def_64.h create mode 100644 arch/tile/include/asm/atomic_64.h create mode 100644 arch/tile/include/asm/bitops_64.h create mode 100644 arch/tile/include/asm/fb.h create mode 100644 arch/tile/include/asm/parport.h create mode 100644 arch/tile/include/asm/pgtable_64.h create mode 100644 arch/tile/include/asm/serial.h create mode 100644 arch/tile/include/asm/spinlock_64.h rename arch/tile/include/{hv/pagesize.h => asm/vga.h} (52%) create mode 100644 arch/tile/kernel/futex_64.S create mode 100644 arch/tile/kernel/head_64.S create mode 100644 arch/tile/kernel/intvec_64.S create mode 100644 arch/tile/kernel/regs_64.S create mode 100644 arch/tile/kernel/tile-desc_64.c create mode 100644 arch/tile/lib/memchr_64.c create mode 100644 arch/tile/lib/memcpy_64.c create mode 100644 arch/tile/lib/memcpy_user_64.c create mode 100644 arch/tile/lib/memset_64.c create mode 100644 arch/tile/lib/spinlock_64.c create mode 100644 arch/tile/lib/strchr_64.c create mode 100644 arch/tile/lib/strlen_64.c create mode 100644 arch/tile/lib/usercopy_64.S create mode 100644 arch/tile/mm/migrate_64.S delete mode 100644 arch/um/drivers/mcast.h delete mode 100644 arch/um/drivers/mcast_kern.c delete mode 100644 arch/um/drivers/mcast_user.c create mode 100644 arch/um/drivers/umcast.h create mode 100644 arch/um/drivers/umcast_kern.c create mode 100644 arch/um/drivers/umcast_user.c create mode 100644 arch/um/kernel/early_printk.c delete mode 100644 arch/xtensa/mm/pgtable.c create mode 100644 drivers/block/xen-blkback/Makefile create mode 100644 drivers/block/xen-blkback/blkback.c create mode 100644 drivers/block/xen-blkback/common.h create mode 100644 drivers/block/xen-blkback/xenbus.c create mode 100644 drivers/cpufreq/db8500-cpufreq.c create mode 100644 drivers/gpu/drm/nouveau/nv40_mpeg.c create mode 100644 drivers/gpu/drm/nouveau/nv50_mpeg.c create mode 100644 drivers/gpu/drm/nouveau/nva3_copy.c create mode 100644 drivers/gpu/drm/nouveau/nva3_copy.fuc create mode 100644 drivers/gpu/drm/nouveau/nva3_copy.fuc.h create mode 100644 drivers/gpu/drm/nouveau/nvc0_copy.c create mode 100644 drivers/gpu/drm/nouveau/nvc0_copy.fuc.h rename drivers/{acpi/power_meter.c => hwmon/acpi_power_meter.c} (100%) create mode 100644 drivers/hwmon/emc6w201.c create mode 100644 drivers/hwmon/fam15h_power.c create mode 100644 drivers/input/keyboard/adp5589-keys.c create mode 100644 drivers/input/keyboard/mpr121_touchkey.c create mode 100644 drivers/input/touchscreen/max11801_ts.c create mode 100644 drivers/leds/leds-gpio-register.c delete mode 100644 drivers/leds/leds-h1940.c rename arch/arm/mach-ux500/include/mach/prcmu-regs.h => drivers/mfd/db5500-prcmu-regs.h (80%) create mode 100644 drivers/mfd/db5500-prcmu.c create mode 100644 drivers/mfd/db8500-prcmu-regs.h create mode 100644 drivers/mfd/db8500-prcmu.c create mode 100644 drivers/mmc/host/vub300.c create mode 100644 drivers/net/gianfar_ptp.c create mode 100644 drivers/net/phy/dp83640.c create mode 100644 drivers/net/phy/dp83640_reg.h create mode 100644 drivers/platform/x86/mxm-wmi.c create mode 100644 drivers/ptp/Kconfig create mode 100644 drivers/ptp/Makefile create mode 100644 drivers/ptp/ptp_chardev.c create mode 100644 drivers/ptp/ptp_clock.c create mode 100644 drivers/ptp/ptp_ixp46x.c create mode 100644 drivers/ptp/ptp_private.h create mode 100644 drivers/ptp/ptp_sysfs.c create mode 100644 drivers/regulator/db8500-prcmu.c create mode 100644 drivers/rtc/rtc-tile.c create mode 100644 drivers/s390/char/sclp_ocf.c delete mode 100644 drivers/s390/char/tape_block.c create mode 100644 drivers/video/mb862xx/mb862xx-i2c.c rename drivers/video/mb862xx/{mb862xxfb.c => mb862xxfbdrv.c} (86%) create mode 100644 drivers/video/omap2/dss/dispc.h create mode 100644 drivers/video/sh_mobile_meram.c create mode 100644 drivers/video/sh_mobile_meram.h create mode 100644 fs/proc/namespaces.c create mode 100644 include/linux/i2c/i2c-sh_mobile.h create mode 100644 include/linux/i2c/mpr121_touchkey.h create mode 100644 include/linux/input/adp5589.h create mode 100644 include/linux/mfd/db5500-prcmu.h create mode 100644 include/linux/mfd/db8500-prcmu.h create mode 100644 include/linux/mmc/Kbuild create mode 100644 include/linux/mmc/ioctl.h create mode 100644 include/linux/mxm-wmi.h create mode 100644 include/linux/ptp_clock.h create mode 100644 include/linux/ptp_clock_kernel.h create mode 100644 include/linux/regulator/db8500-prcmu.h create mode 100644 include/linux/rfkill-gpio.h rename arch/arm/plat-omap/include/plat/panel-generic-dpi.h => include/video/omap-panel-generic-dpi.h (86%) rename arch/arm/plat-omap/include/plat/nokia-dsi-panel.h => include/video/omap-panel-nokia-dsi.h (65%) rename arch/arm/plat-omap/include/plat/display.h => include/video/omapdss.h (85%) create mode 100644 include/video/sh_mobile_meram.h create mode 100644 net/rfkill/rfkill-gpio.c create mode 100644 scripts/Makefile.asm-generic rename scripts/{basic => }/docproc.c (100%) ## # 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-io-use-fixed-initial-mempool-size.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-kcopyd-add-gfp-parm-to-alloc_pl.patch dm-kcopyd-alloc-pages-from-the-main-page-allocator.patch dm-kcopyd-avoid-pointless-job-splitting.patch dm-kcopyd-preallocate-sub-jobs-to-avoid-deadlock.patch dm-kcopyd-remove-superfluous-page-allocation-spinlock.patch dm-kcopyd-reserve-fewer-pages.patch dm-kcopyd-return-client-directly-and-not-through-a-pointer.patch dm-loop.patch dm-memcache.patch dm-mpath-add-alua.patch dm-mpath-allow-table-load-with-no-priority-groups.patch dm-mpath-do-not-fail-paths-after-integrity-errors.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-allow-targets-to-support-discards-internally.patch dm-table-extend-device-name-lookups.patch dm-table-limit-max_segments-when-no-merge_bvec-fn.patch dm-table-propagate-non-rotational-flag.patch dm-table-reject-devices-without-request-fns.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 git-update6.patch git-update7.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 99403086 bytes received 1516 bytes 18073564.00 bytes/sec total size is 99383406 speedup is 1.00 Using base v2.6.39 ## # 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-stor7. Already up-to-date. ## # check ## Differences exist, continuing ## # label ## [2.6.39-stor7 67a981f] 2.6.39-stor7 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- ##