$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 522dba7 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 Merging origin/master $ git merge origin/master Updating 522dba7..bca14dd Fast-forward .gitignore | 20 +- Documentation/DMA-API.txt | 122 +- Documentation/DocBook/mtdnand.tmpl | 6 +- Documentation/DocBook/v4l/common.xml | 2 +- Documentation/DocBook/v4l/vidioc-g-parm.xml | 2 +- Documentation/IPMI.txt | 12 + Documentation/Makefile | 4 +- Documentation/PCI/PCI-DMA-mapping.txt | 352 +- Documentation/SubmitChecklist | 8 +- Documentation/arm/Samsung-S3C24XX/CPUfreq.txt | 4 +- Documentation/arm/Samsung/Overview.txt | 86 + .../arm/Samsung/clksrc-change-registers.awk | 167 + Documentation/cgroups/cgroup_event_listener.c | 110 + Documentation/cgroups/cgroups.txt | 39 +- Documentation/cgroups/cpusets.txt | 127 +- Documentation/cgroups/memcg_test.txt | 47 +- Documentation/cgroups/memory.txt | 80 +- Documentation/console/console.txt | 2 +- Documentation/driver-model/platform.txt | 2 +- Documentation/eisa.txt | 2 +- Documentation/email-clients.txt | 30 +- Documentation/filesystems/00-INDEX | 2 + Documentation/filesystems/Makefile | 8 + Documentation/filesystems/dnotify.txt | 39 +- Documentation/filesystems/dnotify_test.c | 34 + Documentation/filesystems/proc.txt | 2 +- Documentation/hwmon/abituguru | 2 +- Documentation/input/rotary-encoder.txt | 2 +- Documentation/laptops/00-INDEX | 6 + Documentation/laptops/Makefile | 8 + Documentation/laptops/dslm.c | 166 + Documentation/laptops/laptop-mode.txt | 170 +- Documentation/networking/skfp.txt | 2 +- .../networking/timestamping/timestamping.c | 2 +- Documentation/pnp.txt | 13 +- Documentation/power/runtime_pm.txt | 2 +- Documentation/s390/kvm.txt | 2 +- Documentation/scsi/ChangeLog.lpfc | 10 +- Documentation/serial/tty.txt | 4 + Documentation/sysctl/vm.txt | 5 +- Documentation/timers/00-INDEX | 2 + Documentation/timers/Makefile | 8 + Documentation/timers/hpet.txt | 273 +- Documentation/timers/hpet_example.c | 269 + Documentation/trace/ftrace.txt | 2 +- Documentation/vm/00-INDEX | 16 +- Documentation/vm/Makefile | 2 +- Documentation/vm/hugepage-mmap.c | 91 + Documentation/vm/hugepage-shm.c | 98 + Documentation/vm/hugetlbpage.txt | 169 +- Documentation/vm/map_hugetlb.c | 6 +- Documentation/voyager.txt | 95 - MAINTAINERS | 56 +- arch/alpha/Kconfig | 4 + arch/alpha/include/asm/dma-mapping.h | 80 +- arch/alpha/include/asm/pci.h | 139 +- arch/alpha/include/asm/ptrace.h | 1 + arch/alpha/kernel/pci-noop.c | 101 +- arch/alpha/kernel/pci_iommu.c | 201 +- arch/alpha/kernel/ptrace.c | 59 +- arch/arm/Kconfig | 74 +- arch/arm/Kconfig.debug | 2 +- arch/arm/Makefile | 16 +- arch/arm/boot/bootp/init.S | 2 +- arch/arm/boot/compressed/head.S | 50 +- arch/arm/boot/compressed/vmlinux.lds.in | 3 + arch/arm/common/clkdev.c | 2 +- arch/arm/common/it8152.c | 27 - arch/arm/common/locomo.c | 362 +- arch/arm/common/sa1111.c | 112 +- arch/arm/common/scoop.c | 2 +- arch/arm/configs/ap4evb_defconfig | 779 ++ arch/arm/configs/g3evm_defconfig | 774 ++ arch/arm/configs/g4evm_defconfig | 779 ++ arch/arm/configs/imote2_defconfig | 2077 ++++ arch/arm/configs/kirkwood_defconfig | 126 +- arch/arm/configs/mini2440_defconfig | 6 +- arch/arm/configs/mmp2_defconfig | 1194 ++ arch/arm/configs/mv78xx0_defconfig | 1 + arch/arm/configs/mx1ads_defconfig | 742 -- arch/arm/configs/mx27_defconfig | 2 +- arch/arm/configs/mx51_defconfig | 1286 ++ arch/arm/configs/nuc950_defconfig | 53 +- arch/arm/configs/orion5x_defconfig | 101 +- arch/arm/configs/pxa168_defconfig | 229 +- arch/arm/configs/raumfeld_defconfig | 1898 +++ arch/arm/configs/s3c2410_defconfig | 6 +- arch/arm/configs/s3c6400_defconfig | 360 +- arch/arm/configs/s5p6440_defconfig | 969 ++ arch/arm/configs/s5p6442_defconfig | 883 ++ arch/arm/configs/s5pc110_defconfig | 894 ++ arch/arm/configs/s5pv210_defconfig | 894 ++ arch/arm/include/asm/dma-mapping.h | 8 + .../asm/entry-macro-vic2.S} | 29 +- arch/arm/include/asm/hardware/it8152.h | 12 + arch/arm/include/asm/hardware/locomo.h | 4 + arch/arm/include/asm/hardware/sa1111.h | 4 + arch/arm/include/asm/pci.h | 11 - arch/arm/include/asm/ptrace.h | 2 + arch/arm/include/asm/unistd.h | 3 + arch/arm/kernel/calls.S | 4 +- arch/arm/kernel/perf_event.c | 4 +- arch/arm/kernel/ptrace.c | 60 +- arch/arm/kernel/ptrace.h | 14 - arch/arm/kernel/sys_arm.c | 129 - arch/arm/kernel/sys_oabi-compat.c | 3 - arch/arm/kernel/unwind.c | 4 +- arch/arm/mach-at91/at91rm9200_time.c | 20 +- arch/arm/mach-at91/at91sam926x_time.c | 11 +- arch/arm/mach-at91/include/mach/at91_mci.h | 2 +- arch/arm/mach-davinci/include/mach/i2c.h | 2 +- arch/arm/mach-dove/common.c | 8 +- arch/arm/mach-ep93xx/micro9.c | 2 +- arch/arm/mach-ixp4xx/common-pci.c | 26 - arch/arm/mach-ixp4xx/include/mach/hardware.h | 5 - arch/arm/mach-kirkwood/Kconfig | 23 + arch/arm/mach-kirkwood/Makefile | 4 +- arch/arm/mach-kirkwood/common.c | 8 +- arch/arm/mach-kirkwood/netspace_v2-setup.c | 59 +- arch/arm/mach-kirkwood/openrd-setup.c | 118 + arch/arm/mach-kirkwood/openrd_base-setup.c | 96 - arch/arm/mach-kirkwood/sheevaplug-setup.c | 50 +- arch/arm/mach-mmp/Kconfig | 35 +- arch/arm/mach-mmp/Makefile | 10 +- arch/arm/mach-mmp/avengers_lite.c | 51 + arch/arm/mach-mmp/common.h | 4 + arch/arm/mach-mmp/flint.c | 123 + arch/arm/mach-mmp/include/mach/cputype.h | 9 + arch/arm/mach-mmp/include/mach/devices.h | 12 + arch/arm/mach-mmp/include/mach/entry-macro.S | 7 +- arch/arm/mach-mmp/include/mach/irqs.h | 115 +- arch/arm/mach-mmp/include/mach/mfp-mmp2.h | 240 + arch/arm/mach-mmp/include/mach/mfp-pxa168.h | 4 +- arch/arm/mach-mmp/include/mach/mmp2.h | 60 + arch/arm/mach-mmp/include/mach/regs-apbc.h | 41 + arch/arm/mach-mmp/include/mach/regs-icu.h | 42 +- arch/arm/mach-mmp/include/mach/uncompress.h | 13 +- arch/arm/mach-mmp/irq-mmp2.c | 154 + arch/arm/mach-mmp/{irq.c => irq-pxa168.c} | 0 arch/arm/mach-mmp/jasper.c | 80 + arch/arm/mach-mmp/mmp2.c | 123 + arch/arm/mach-mmp/time.c | 26 +- arch/arm/mach-mv78xx0/Kconfig | 6 + arch/arm/mach-mv78xx0/Makefile | 3 +- arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 155 + arch/arm/mach-mv78xx0/mpp.c | 96 + arch/arm/mach-mv78xx0/mpp.h | 347 + arch/arm/mach-mx1/Makefile | 5 +- arch/arm/mach-mx1/{mx1ads.c => mach-mx1ads.c} | 8 +- arch/arm/mach-mx1/{scb9328.c => mach-scb9328.c} | 4 +- arch/arm/mach-mx2/Kconfig | 10 +- arch/arm/mach-mx2/Makefile | 23 +- arch/arm/mach-mx2/clock_imx21.c | 236 +- arch/arm/mach-mx2/clock_imx27.c | 33 +- arch/arm/mach-mx2/cpu_imx27.c | 3 +- arch/arm/mach-mx2/crm_regs.h | 258 - arch/arm/mach-mx2/devices.c | 640 +- arch/arm/mach-mx2/devices.h | 13 +- arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c | 2 +- .../{eukrea_cpuimx27.c => mach-cpuimx27.c} | 19 +- arch/arm/mach-mx2/{mx27lite.c => mach-imx27lite.c} | 8 +- arch/arm/mach-mx2/{mx21ads.c => mach-mx21ads.c} | 16 +- arch/arm/mach-mx2/{mx27pdk.c => mach-mx27_3ds.c} | 8 +- arch/arm/mach-mx2/{mx27ads.c => mach-mx27ads.c} | 12 +- arch/arm/mach-mx2/{mxt_td60.c => mach-mxt_td60.c} | 10 +- arch/arm/mach-mx2/mach-pca100.c | 395 + arch/arm/mach-mx2/{pcm038.c => mach-pcm038.c} | 40 +- arch/arm/mach-mx2/{generic.c => mm-imx21.c} | 46 +- arch/arm/mach-mx2/{generic.c => mm-imx27.c} | 44 +- arch/arm/mach-mx2/pca100.c | 244 - arch/arm/mach-mx2/pcm970-baseboard.c | 6 +- arch/arm/mach-mx2/serial.c | 48 +- arch/arm/mach-mx25/Kconfig | 1 - arch/arm/mach-mx25/Makefile | 2 +- arch/arm/mach-mx25/clock.c | 14 + arch/arm/mach-mx25/devices.c | 62 + arch/arm/mach-mx25/devices.h | 3 + arch/arm/mach-mx25/{mx25pdk.c => mach-mx25pdk.c} | 67 +- arch/arm/mach-mx3/Kconfig | 2 + arch/arm/mach-mx3/Makefile | 32 +- arch/arm/mach-mx3/{clock.c => clock-imx31.c} | 5 +- arch/arm/mach-mx3/clock-imx35.c | 5 +- arch/arm/mach-mx3/cpu.c | 2 +- arch/arm/mach-mx3/crm_regs.h | 2 +- arch/arm/mach-mx3/{iomux.c => iomux-imx31.c} | 2 +- .../{armadillo5x0.c => mach-armadillo5x0.c} | 14 +- .../mach-mx3/{kzmarm11.c => mach-kzm_arm11_01.c} | 33 +- arch/arm/mach-mx3/{mx31pdk.c => mach-mx31_3ds.c} | 12 +- arch/arm/mach-mx3/{mx31ads.c => mach-mx31ads.c} | 44 +- .../arm/mach-mx3/{mx31lilly.c => mach-mx31lilly.c} | 10 +- arch/arm/mach-mx3/{mx31lite.c => mach-mx31lite.c} | 16 +- .../mach-mx3/{mx31moboard.c => mach-mx31moboard.c} | 49 +- arch/arm/mach-mx3/{mx35pdk.c => mach-mx35pdk.c} | 6 +- arch/arm/mach-mx3/{pcm037.c => mach-pcm037.c} | 155 +- .../mach-mx3/{pcm037_eet.c => mach-pcm037_eet.c} | 0 arch/arm/mach-mx3/mach-pcm043.c | 413 + arch/arm/mach-mx3/{qong.c => mach-qong.c} | 20 +- arch/arm/mach-mx3/mx31lite-db.c | 30 +- arch/arm/mach-mx3/mx31moboard-devboard.c | 32 + arch/arm/mach-mx3/mx31moboard-marxbot.c | 39 +- arch/arm/mach-mx3/mx31moboard-smartbot.c | 162 + arch/arm/mach-mx3/pcm043.c | 259 - arch/arm/mach-mx5/Kconfig | 18 + arch/arm/mach-mx5/Makefile | 9 + arch/arm/mach-mx5/Makefile.boot | 3 + arch/arm/mach-mx5/board-mx51_babbage.c | 98 + arch/arm/mach-mx5/clock-mx51.c | 825 ++ arch/arm/mach-mx5/cpu.c | 47 + arch/arm/mach-mx5/crm_regs.h | 583 + arch/arm/mach-mx5/devices.c | 96 + arch/arm/mach-mx5/devices.h | 4 + arch/arm/mach-mx5/mm.c | 89 + arch/arm/mach-mxc91231/magx-zn5.c | 2 +- arch/arm/mach-nomadik/board-nhk8815.c | 2 +- arch/arm/mach-orion5x/Kconfig | 7 + arch/arm/mach-orion5x/Makefile | 1 + arch/arm/mach-orion5x/common.c | 4 +- arch/arm/mach-orion5x/d2net-setup.c | 45 +- arch/arm/mach-orion5x/dns323-setup.c | 36 +- arch/arm/mach-orion5x/ls_hgl-setup.c | 276 + arch/arm/mach-orion5x/lsmini-setup.c | 8 +- arch/arm/mach-pxa/Kconfig | 35 + arch/arm/mach-pxa/Makefile | 5 + arch/arm/mach-pxa/am300epd.c | 2 +- arch/arm/mach-pxa/balloon3.c | 33 +- arch/arm/mach-pxa/capc7117.c | 158 + arch/arm/mach-pxa/cm-x255.c | 21 +- arch/arm/mach-pxa/cm-x270.c | 83 +- arch/arm/mach-pxa/cm-x2xx-pci.c | 2 +- arch/arm/mach-pxa/e740.c | 6 + arch/arm/mach-pxa/e750.c | 6 + arch/arm/mach-pxa/e800.c | 9 + arch/arm/mach-pxa/em-x270.c | 21 +- arch/arm/mach-pxa/icontrol.c | 202 + arch/arm/mach-pxa/idp.c | 20 +- arch/arm/mach-pxa/imote2.c | 3 +- arch/arm/mach-pxa/include/mach/balloon3.h | 10 + arch/arm/mach-pxa/include/mach/hardware.h | 1 - arch/arm/mach-pxa/include/mach/irqs.h | 153 +- arch/arm/mach-pxa/include/mach/lpd270.h | 4 + arch/arm/mach-pxa/include/mach/lubbock.h | 11 + arch/arm/mach-pxa/include/mach/mainstone.h | 17 + arch/arm/mach-pxa/include/mach/mfp-pxa25x.h | 32 + arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | 27 + arch/arm/mach-pxa/include/mach/mxm8x10.h | 21 + arch/arm/mach-pxa/include/mach/pcm027.h | 7 + arch/arm/mach-pxa/include/mach/ssp.h | 2 + arch/arm/mach-pxa/include/mach/uncompress.h | 41 +- arch/arm/mach-pxa/include/mach/zeus.h | 3 +- arch/arm/mach-pxa/lpd270.c | 6 +- arch/arm/mach-pxa/lubbock.c | 35 +- arch/arm/mach-pxa/magician.c | 21 +- arch/arm/mach-pxa/mainstone.c | 27 +- arch/arm/mach-pxa/mioa701.c | 24 +- arch/arm/mach-pxa/mxm8x10.c | 474 + arch/arm/mach-pxa/palmld.c | 21 +- arch/arm/mach-pxa/palmt5.c | 21 +- arch/arm/mach-pxa/palmtc.c | 21 +- arch/arm/mach-pxa/palmte2.c | 21 +- arch/arm/mach-pxa/palmtreo.c | 20 +- arch/arm/mach-pxa/palmtx.c | 21 +- arch/arm/mach-pxa/palmz72.c | 22 +- arch/arm/mach-pxa/pcm990-baseboard.c | 9 +- arch/arm/mach-pxa/poodle.c | 28 +- arch/arm/mach-pxa/pxa27x.c | 19 + arch/arm/mach-pxa/raumfeld.c | 1108 ++ arch/arm/mach-pxa/spitz.c | 20 +- arch/arm/mach-pxa/ssp.c | 5 + arch/arm/mach-pxa/time.c | 10 +- arch/arm/mach-pxa/tosa.c | 117 +- arch/arm/mach-pxa/trizeps4.c | 27 +- arch/arm/mach-pxa/viper.c | 8 +- arch/arm/mach-pxa/zeus.c | 91 +- arch/arm/mach-s3c2410/dma.c | 2 +- .../include/mach/{gpio-core.h => gpio-track.h} | 1 - .../plat => mach-s3c2410/include/mach}/pm-core.h | 2 +- arch/arm/mach-s3c2410/include/mach/regs-gpio.h | 10 +- .../mach-s3c2410/include/mach/regs-s3c2443-clock.h | 32 +- arch/arm/mach-s3c2410/include/mach/spi-gpio.h | 2 +- .../include/mach/timex.h | 2 - .../include/mach/vmalloc.h | 4 +- arch/arm/mach-s3c2410/mach-amlm5900.c | 2 +- arch/arm/mach-s3c2410/mach-bast.c | 2 +- arch/arm/mach-s3c2410/mach-h1940.c | 7 +- arch/arm/mach-s3c2410/mach-n30.c | 2 +- arch/arm/mach-s3c2410/mach-otom.c | 2 +- arch/arm/mach-s3c2410/mach-qt2410.c | 2 +- arch/arm/mach-s3c2410/mach-smdk2410.c | 2 +- arch/arm/mach-s3c2410/mach-tct_hammer.c | 2 +- arch/arm/mach-s3c2410/mach-vr1000.c | 2 +- arch/arm/mach-s3c2410/usb-simtec.c | 4 +- arch/arm/mach-s3c2412/clock.c | 52 +- arch/arm/mach-s3c2412/dma.c | 2 +- arch/arm/mach-s3c2412/mach-jive.c | 2 +- arch/arm/mach-s3c2412/mach-smdk2413.c | 3 +- arch/arm/mach-s3c2412/mach-vstms.c | 2 +- arch/arm/mach-s3c2440/Kconfig | 74 +- arch/arm/mach-s3c2440/Makefile | 11 + arch/arm/mach-s3c2440/clock.c | 6 +- arch/arm/mach-s3c2440/dma.c | 2 +- arch/arm/mach-s3c2440/dsc.c | 2 +- .../include/mach/gta02.h | 0 arch/arm/mach-s3c2440/mach-anubis.c | 2 +- arch/arm/mach-s3c2440/mach-at2440evb.c | 7 +- .../{mach-s3c2442 => mach-s3c2440}/mach-gta02.c | 7 +- arch/arm/mach-s3c2440/mach-mini2440.c | 8 +- arch/arm/mach-s3c2440/mach-nexcoder.c | 4 +- arch/arm/mach-s3c2440/mach-rx3715.c | 2 +- arch/arm/mach-s3c2440/mach-smdk2440.c | 4 +- .../s3c2440-pll-12000000.c | 2 +- .../s3c2440-pll-16934400.c | 2 +- arch/arm/mach-s3c2440/s3c2440.c | 2 +- .../clock.c => mach-s3c2440/s3c2442.c} | 22 +- .../{plat-s3c24xx => mach-s3c2440}/s3c244x-clock.c | 4 +- .../{plat-s3c24xx => mach-s3c2440}/s3c244x-irq.c | 0 arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c244x.c | 3 +- arch/arm/mach-s3c2442/Kconfig | 37 - arch/arm/mach-s3c2442/Makefile | 18 - arch/arm/mach-s3c2442/s3c2442.c | 34 - arch/arm/mach-s3c2443/Kconfig | 1 + arch/arm/mach-s3c2443/clock.c | 842 +- arch/arm/mach-s3c2443/dma.c | 2 +- arch/arm/mach-s3c2443/mach-smdk2443.c | 10 +- .../{plat-s3c => mach-s3c24a0}/include/mach/io.h | 4 +- arch/arm/mach-s3c6400/Kconfig | 30 - arch/arm/mach-s3c6400/Makefile | 23 - arch/arm/mach-s3c6400/include/mach/dma.h | 70 - arch/arm/mach-s3c6400/include/mach/gpio-core.h | 21 - arch/arm/mach-s3c6400/include/mach/irqs.h | 16 - arch/arm/mach-s3c6400/include/mach/regs-clock.h | 16 - arch/arm/mach-s3c6410/Kconfig | 109 - arch/arm/mach-s3c6410/Makefile | 26 - arch/arm/mach-s3c6410/setup-sdhci.c | 68 - arch/arm/mach-s3c64xx/Kconfig | 180 + arch/arm/{plat-s3c64xx => mach-s3c64xx}/Makefile | 48 +- .../{mach-s3c6400 => mach-s3c64xx}/Makefile.boot | 0 arch/arm/mach-s3c64xx/clock.c | 809 ++ arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpu.c | 19 +- arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpufreq.c | 0 arch/arm/mach-s3c64xx/dev-adc.c | 46 + arch/arm/mach-s3c64xx/dev-audio.c | 335 + arch/arm/mach-s3c64xx/dev-rtc.c | 43 + arch/arm/mach-s3c64xx/dev-spi.c | 182 + arch/arm/{plat-s3c64xx => mach-s3c64xx}/dev-uart.c | 29 - arch/arm/{plat-s3c64xx => mach-s3c64xx}/dma.c | 3 +- arch/arm/mach-s3c64xx/gpiolib.c | 288 + .../include/mach/debug-macro.S | 2 +- .../dma-plat.h => mach-s3c64xx/include/mach/dma.h} | 79 +- arch/arm/mach-s3c64xx/include/mach/entry-macro.S | 18 + .../include/mach}/gpio-bank-a.h | 2 +- .../include/mach}/gpio-bank-b.h | 2 +- .../include/mach}/gpio-bank-c.h | 2 +- .../include/mach}/gpio-bank-d.h | 2 +- .../include/mach}/gpio-bank-e.h | 2 +- .../include/mach}/gpio-bank-f.h | 2 +- .../include/mach}/gpio-bank-g.h | 2 +- .../include/mach}/gpio-bank-h.h | 2 +- .../include/mach}/gpio-bank-i.h | 2 +- .../include/mach}/gpio-bank-j.h | 2 +- .../include/mach}/gpio-bank-n.h | 2 +- .../include/mach}/gpio-bank-o.h | 2 +- .../include/mach}/gpio-bank-p.h | 2 +- .../include/mach}/gpio-bank-q.h | 2 +- .../include/mach/gpio.h | 6 +- .../include/mach/hardware.h | 0 .../{plat-s3c => mach-s3c64xx}/include/mach/io.h | 4 +- .../plat => mach-s3c64xx/include/mach}/irqs.h | 24 +- .../include/mach/map.h | 22 +- .../include/mach/memory.h | 0 .../plat => mach-s3c64xx/include/mach}/pll.h | 0 .../plat => mach-s3c64xx/include/mach}/pm-core.h | 4 +- .../include/mach/pwm-clock.h | 0 arch/arm/mach-s3c64xx/include/mach/regs-clock.h | 156 + .../include/mach/regs-fb.h | 0 .../include/mach}/regs-gpio-memport.h | 0 .../plat => mach-s3c64xx/include/mach}/regs-gpio.h | 0 .../include/mach/regs-irq.h | 0 .../include/mach}/regs-modem.h | 0 arch/arm/mach-s3c64xx/include/mach/regs-srom.h | 59 + .../plat => mach-s3c64xx/include/mach}/regs-sys.h | 0 .../include/mach}/regs-syscon-power.h | 0 .../plat => mach-s3c64xx/include/mach}/s3c6400.h | 6 +- .../plat => mach-s3c64xx/include/mach}/s3c6410.h | 2 +- arch/arm/mach-s3c64xx/include/mach/spi-clocks.h | 18 + .../include/mach/system.h | 0 .../include/mach/tick.h | 2 +- .../include/mach/timex.h | 6 +- .../include/mach/uncompress.h | 0 .../include/mach/vmalloc.h | 6 +- arch/arm/{plat-s3c64xx => mach-s3c64xx}/irq-eint.c | 2 +- arch/arm/{plat-s3c64xx => mach-s3c64xx}/irq-pm.c | 2 +- arch/arm/mach-s3c64xx/irq.c | 69 + .../{mach-s3c6410 => mach-s3c64xx}/mach-anw6410.c | 8 +- arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-hmt.c | 4 +- arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-ncp.c | 4 +- .../{mach-s3c6400 => mach-s3c64xx}/mach-smdk6400.c | 4 +- .../{mach-s3c6410 => mach-s3c64xx}/mach-smdk6410.c | 337 +- arch/arm/{plat-s3c64xx => mach-s3c64xx}/pm.c | 12 +- arch/arm/{mach-s3c6400 => mach-s3c64xx}/s3c6400.c | 11 +- .../{mach-s3c6410/cpu.c => mach-s3c64xx/s3c6410.c} | 24 +- .../setup-fb-24bpp.c | 0 .../{plat-s3c64xx => mach-s3c64xx}/setup-i2c0.c | 2 +- .../{plat-s3c64xx => mach-s3c64xx}/setup-i2c1.c | 2 +- .../setup-sdhci-gpio.c | 0 .../{mach-s3c6400 => mach-s3c64xx}/setup-sdhci.c | 15 +- arch/arm/{plat-s3c64xx => mach-s3c64xx}/sleep.S | 6 +- arch/arm/mach-s5p6440/Kconfig | 21 + arch/arm/mach-s5p6440/Makefile | 19 + arch/arm/mach-s5p6440/Makefile.boot | 2 + arch/arm/mach-s5p6440/clock.c | 698 ++ arch/arm/mach-s5p6440/cpu.c | 114 + arch/arm/mach-s5p6440/gpio.c | 322 + .../include/mach/debug-macro.S | 12 +- arch/arm/mach-s5p6440/include/mach/entry-macro.S | 16 + arch/arm/mach-s5p6440/include/mach/gpio.h | 80 + arch/arm/mach-s5p6440/include/mach/hardware.h | 18 + .../{plat-s3c => mach-s5p6440}/include/mach/io.h | 4 +- arch/arm/mach-s5p6440/include/mach/irqs.h | 111 + arch/arm/mach-s5p6440/include/mach/map.h | 68 + arch/arm/mach-s5p6440/include/mach/memory.h | 19 + .../include/mach/pwm-clock.h | 26 +- arch/arm/mach-s5p6440/include/mach/regs-clock.h | 130 + arch/arm/mach-s5p6440/include/mach/regs-gpio.h | 54 + .../include/mach/regs-irq.h | 13 +- arch/arm/mach-s5p6440/include/mach/system.h | 26 + arch/arm/mach-s5p6440/include/mach/tick.h | 24 + .../include/mach/timex.h | 6 +- .../include/mach/uncompress.h | 12 +- .../include/mach/vmalloc.h | 11 +- arch/arm/mach-s5p6440/init.c | 52 + arch/arm/mach-s5p6440/mach-smdk6440.c | 111 + arch/arm/mach-s5p6442/Kconfig | 24 + arch/arm/mach-s5p6442/Makefile | 19 + arch/arm/mach-s5p6442/Makefile.boot | 2 + arch/arm/mach-s5p6442/clock.c | 396 + arch/arm/mach-s5p6442/cpu.c | 121 + .../include/mach/debug-macro.S | 23 +- arch/arm/mach-s5p6442/include/mach/entry-macro.S | 48 + arch/arm/mach-s5p6442/include/mach/gpio.h | 123 + arch/arm/mach-s5p6442/include/mach/hardware.h | 18 + .../{plat-s3c => mach-s5p6442}/include/mach/io.h | 7 +- arch/arm/mach-s5p6442/include/mach/irqs.h | 86 + arch/arm/mach-s5p6442/include/mach/map.h | 58 + arch/arm/mach-s5p6442/include/mach/memory.h | 19 + .../include/mach/pwm-clock.h | 33 +- arch/arm/mach-s5p6442/include/mach/regs-clock.h | 103 + .../include/mach/regs-irq.h | 13 +- arch/arm/mach-s5p6442/include/mach/system.h | 26 + arch/arm/mach-s5p6442/include/mach/tick.h | 26 + .../include/mach/timex.h | 8 +- .../include/mach/uncompress.h | 12 +- .../include/mach/vmalloc.h | 11 +- arch/arm/mach-s5p6442/init.c | 44 + arch/arm/mach-s5p6442/mach-smdk6442.c | 91 + arch/arm/mach-s5pc100/include/mach/gpio-core.h | 21 - .../{plat-s3c => mach-s5pc100}/include/mach/io.h | 4 +- arch/arm/mach-s5pc100/include/mach/tick.h | 2 +- .../include/mach/timex.h | 6 +- .../include/mach/vmalloc.h | 9 +- arch/arm/mach-s5pc100/setup-sdhci.c | 4 +- arch/arm/mach-s5pv210/Kconfig | 40 + arch/arm/mach-s5pv210/Makefile | 20 + arch/arm/mach-s5pv210/Makefile.boot | 2 + arch/arm/mach-s5pv210/clock.c | 454 + arch/arm/mach-s5pv210/cpu.c | 126 + .../include/mach/debug-macro.S | 15 +- arch/arm/mach-s5pv210/include/mach/entry-macro.S | 54 + arch/arm/mach-s5pv210/include/mach/gpio.h | 129 + arch/arm/mach-s5pv210/include/mach/hardware.h | 18 + arch/arm/mach-s5pv210/include/mach/io.h | 26 + arch/arm/mach-s5pv210/include/mach/irqs.h | 146 + arch/arm/mach-s5pv210/include/mach/map.h | 65 + arch/arm/mach-s5pv210/include/mach/memory.h | 23 + .../include/mach/pwm-clock.h | 33 +- arch/arm/mach-s5pv210/include/mach/regs-clock.h | 169 + .../include/mach/regs-irq.h | 13 +- arch/arm/mach-s5pv210/include/mach/system.h | 26 + arch/arm/mach-s5pv210/include/mach/tick.h | 26 + .../include/mach/timex.h | 15 +- .../include/mach/uncompress.h | 12 +- arch/arm/mach-s5pv210/include/mach/vmalloc.h | 22 + arch/arm/mach-s5pv210/init.c | 44 + arch/arm/mach-s5pv210/mach-smdkc110.c | 98 + arch/arm/mach-s5pv210/mach-smdkv210.c | 98 + arch/arm/mach-sa1100/badge4.c | 5 + arch/arm/mach-sa1100/collie.c | 4 + arch/arm/mach-sa1100/include/mach/collie.h | 7 - arch/arm/mach-sa1100/include/mach/irqs.h | 91 +- arch/arm/mach-sa1100/jornada720.c | 5 + arch/arm/mach-sa1100/neponset.c | 5 + arch/arm/mach-sa1100/time.c | 8 +- arch/arm/mach-shmobile/Kconfig | 84 + arch/arm/mach-shmobile/Makefile | 22 + arch/arm/mach-shmobile/Makefile.boot | 9 + arch/arm/mach-shmobile/board-ap4evb.c | 301 + arch/arm/mach-shmobile/board-g3evm.c | 211 + arch/arm/mach-shmobile/board-g4evm.c | 211 + arch/arm/mach-shmobile/clock-sh7367.c | 96 + arch/arm/mach-shmobile/console.c | 31 + arch/arm/mach-shmobile/include/mach/clkdev.h | 7 + arch/arm/mach-shmobile/include/mach/common.h | 23 + arch/arm/mach-shmobile/include/mach/dma.h | 1 + arch/arm/mach-shmobile/include/mach/entry-macro.S | 39 + arch/arm/mach-shmobile/include/mach/gpio.h | 48 + arch/arm/mach-shmobile/include/mach/hardware.h | 7 + arch/arm/mach-shmobile/include/mach/io.h | 9 + arch/arm/mach-shmobile/include/mach/irqs.h | 10 + arch/arm/mach-shmobile/include/mach/memory.h | 7 + arch/arm/mach-shmobile/include/mach/sh7367.h | 332 + arch/arm/mach-shmobile/include/mach/sh7372.h | 434 + arch/arm/mach-shmobile/include/mach/sh7377.h | 360 + arch/arm/mach-shmobile/include/mach/system.h | 14 + arch/arm/mach-shmobile/include/mach/timex.h | 6 + arch/arm/mach-shmobile/include/mach/uncompress.h | 21 + arch/arm/mach-shmobile/include/mach/vmalloc.h | 6 + arch/arm/mach-shmobile/intc-sh7367.c | 270 + arch/arm/mach-shmobile/intc-sh7372.c | 369 + arch/arm/mach-shmobile/intc-sh7377.c | 350 + arch/arm/mach-shmobile/pfc-sh7367.c | 1801 +++ arch/arm/mach-shmobile/pfc-sh7372.c | 1637 +++ arch/arm/mach-shmobile/pfc-sh7377.c | 1767 +++ arch/arm/mach-shmobile/setup-sh7367.c | 198 + arch/arm/mach-shmobile/setup-sh7372.c | 199 + arch/arm/mach-shmobile/setup-sh7377.c | 215 + arch/arm/mach-shmobile/timer.c | 46 + arch/arm/mach-u300/core.c | 4 +- arch/arm/mach-u300/include/mach/debug-macro.S | 2 +- arch/arm/mach-ux500/include/mach/hardware.h | 8 +- arch/arm/mach-w90x900/cpu.h | 1 + arch/arm/mach-w90x900/dev.c | 42 + arch/arm/mach-w90x900/include/mach/fb.h | 83 + arch/arm/mach-w90x900/include/mach/regs-ldm.h | 253 + arch/arm/mach-w90x900/mach-nuc950evb.c | 47 + arch/arm/mach-w90x900/nuc950.c | 4 + arch/arm/plat-mxc/Kconfig | 30 +- arch/arm/plat-mxc/Makefile | 8 +- arch/arm/plat-mxc/audmux-v1.c | 14 +- arch/arm/plat-mxc/audmux-v2.c | 9 +- arch/arm/plat-mxc/clock.c | 1 + arch/arm/plat-mxc/dma-mx1-mx2.c | 207 +- arch/arm/plat-mxc/ehci.c | 122 +- arch/arm/plat-mxc/gpio.c | 30 +- arch/arm/plat-mxc/include/mach/board-kzmarm11.h | 18 +- arch/arm/plat-mxc/include/mach/board-mx31ads.h | 2 +- arch/arm/plat-mxc/include/mach/board-mx31moboard.h | 2 + arch/arm/plat-mxc/include/mach/clock.h | 7 - arch/arm/plat-mxc/include/mach/common.h | 5 + arch/arm/plat-mxc/include/mach/debug-macro.S | 12 +- arch/arm/plat-mxc/include/mach/entry-macro.S | 34 +- arch/arm/plat-mxc/include/mach/hardware.h | 9 + arch/arm/plat-mxc/include/mach/iomux-mx1.h | 313 +- arch/arm/plat-mxc/include/mach/iomux-mx21.h | 210 +- arch/arm/plat-mxc/include/mach/iomux-mx25.h | 24 +- arch/arm/plat-mxc/include/mach/iomux-mx27.h | 372 +- arch/arm/plat-mxc/include/mach/iomux-mx2x.h | 425 +- arch/arm/plat-mxc/include/mach/iomux-mx3.h | 76 +- arch/arm/plat-mxc/include/mach/iomux-mx35.h | 2 +- arch/arm/plat-mxc/include/mach/iomux-mx51.h | 326 + arch/arm/plat-mxc/include/mach/iomux-v1.h | 103 + arch/arm/plat-mxc/include/mach/iomux-v3.h | 8 +- arch/arm/plat-mxc/include/mach/iomux.h | 128 +- arch/arm/plat-mxc/include/mach/irqs.h | 20 +- arch/arm/plat-mxc/include/mach/memory.h | 54 +- arch/arm/plat-mxc/include/mach/mtd-xip.h | 34 - arch/arm/plat-mxc/include/mach/mx1.h | 395 +- arch/arm/plat-mxc/include/mach/mx21.h | 13 +- arch/arm/plat-mxc/include/mach/mx25.h | 36 +- arch/arm/plat-mxc/include/mach/mx27.h | 32 +- arch/arm/plat-mxc/include/mach/mx2x.h | 8 +- arch/arm/plat-mxc/include/mach/mx31.h | 33 + arch/arm/plat-mxc/include/mach/mx35.h | 13 + arch/arm/plat-mxc/include/mach/mx3x.h | 8 +- arch/arm/plat-mxc/include/mach/mx51.h | 454 + arch/arm/plat-mxc/include/mach/mxc.h | 20 +- arch/arm/plat-mxc/include/mach/mxc91231.h | 58 +- arch/arm/plat-mxc/include/mach/mxc_ehci.h | 4 + arch/arm/plat-mxc/include/mach/ssi.h | 18 + arch/arm/plat-mxc/include/mach/timex.h | 2 + arch/arm/plat-mxc/include/mach/uncompress.h | 3 - arch/arm/plat-mxc/iomux-mx1-mx2.c | 157 - arch/arm/plat-mxc/iomux-v1.c | 238 + arch/arm/plat-mxc/time.c | 41 +- arch/arm/plat-mxc/tzic.c | 172 + arch/arm/plat-nomadik/timer.c | 9 +- arch/arm/plat-s3c/Kconfig | 215 - arch/arm/plat-s3c/Makefile | 45 - arch/arm/plat-s3c/dev-usb.c | 50 - arch/arm/plat-s3c24xx/Kconfig | 60 +- arch/arm/plat-s3c24xx/Makefile | 8 - arch/arm/plat-s3c24xx/clock-dclk.c | 22 +- arch/arm/plat-s3c24xx/cpu.c | 4 +- arch/arm/plat-s3c24xx/devs.c | 59 +- arch/arm/plat-s3c24xx/dma.c | 2 +- arch/arm/plat-s3c24xx/gpiolib.c | 2 +- .../include/plat/audio-simtec.h | 2 +- arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h | 2 +- arch/arm/plat-s3c24xx/include/plat/mci.h | 9 + arch/arm/plat-s3c24xx/include/plat/s3c2440.h | 17 - arch/arm/plat-s3c24xx/{ => include/plat}/s3c244x.h | 14 +- arch/arm/plat-s3c64xx/Kconfig | 71 - arch/arm/plat-s3c64xx/clock.c | 300 - arch/arm/plat-s3c64xx/dev-audio.c | 167 - arch/arm/plat-s3c64xx/gpiolib.c | 446 - arch/arm/plat-s3c64xx/include/plat/regs-clock.h | 225 - arch/arm/plat-s3c64xx/irq.c | 256 - arch/arm/plat-s3c64xx/s3c6400-clock.c | 758 -- arch/arm/plat-s3c64xx/s3c6400-init.c | 29 - arch/arm/plat-s5p/Kconfig | 25 + arch/arm/plat-s5p/Makefile | 19 + arch/arm/plat-s5p/clock.c | 149 + arch/arm/plat-s5p/cpu.c | 113 + arch/arm/plat-s5p/dev-uart.c | 139 + arch/arm/plat-s5p/include/plat/irqs.h | 90 + arch/arm/plat-s5p/include/plat/map-s5p.h | 34 + arch/arm/plat-s5p/include/plat/pll.h | 83 + arch/arm/plat-s5p/include/plat/s5p-clock.h | 40 + arch/arm/plat-s5p/include/plat/s5p6440.h | 37 + arch/arm/plat-s5p/include/plat/s5p6442.h | 33 + arch/arm/plat-s5p/include/plat/s5pv210.h | 33 + arch/arm/plat-s5p/irq.c | 72 + arch/arm/plat-s5p/setup-i2c0.c | 25 + arch/arm/plat-s5pc1xx/Kconfig | 3 + arch/arm/plat-s5pc1xx/clock.c | 31 +- arch/arm/plat-s5pc1xx/dev-uart.c | 29 - arch/arm/plat-s5pc1xx/gpio-config.c | 2 +- arch/arm/plat-s5pc1xx/gpiolib.c | 2 +- arch/arm/plat-s5pc1xx/include/plat/irqs.h | 19 +- arch/arm/plat-s5pc1xx/include/plat/regs-clock.h | 119 +- arch/arm/plat-s5pc1xx/irq.c | 202 +- arch/arm/plat-s5pc1xx/s5pc100-clock.c | 770 +- arch/arm/plat-samsung/Kconfig | 229 + arch/arm/plat-samsung/Makefile | 45 + arch/arm/{plat-s3c24xx => plat-samsung}/adc.c | 55 +- arch/arm/plat-samsung/clock-clksrc.c | 212 + arch/arm/{plat-s3c => plat-samsung}/clock.c | 75 +- arch/arm/{plat-s3c => plat-samsung}/dev-fb.c | 0 arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc.c | 0 arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc1.c | 0 arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc2.c | 0 arch/arm/{plat-s3c => plat-samsung}/dev-i2c0.c | 0 arch/arm/{plat-s3c => plat-samsung}/dev-i2c1.c | 0 arch/arm/{plat-s3c => plat-samsung}/dev-nand.c | 0 arch/arm/plat-samsung/dev-uart.c | 44 + .../arm/{plat-s3c => plat-samsung}/dev-usb-hsotg.c | 7 + arch/arm/plat-samsung/dev-usb.c | 69 + arch/arm/{plat-s3c => plat-samsung}/dma.c | 4 +- arch/arm/{plat-s3c => plat-samsung}/gpio-config.c | 2 +- arch/arm/{plat-s3c => plat-samsung}/gpio.c | 2 +- arch/arm/plat-samsung/gpiolib.c | 199 + .../{plat-s3c => plat-samsung}/include/plat/adc.h | 4 +- .../include/plat/audio.h | 10 +- arch/arm/plat-samsung/include/plat/clock-clksrc.h | 83 + .../include/plat/clock.h | 36 +- .../include/plat/cpu-freq.h | 2 +- .../{plat-s3c => plat-samsung}/include/plat/cpu.h | 5 +- .../include/plat/debug-macro.S | 14 +- .../{plat-s3c => plat-samsung}/include/plat/devs.h | 11 +- .../include/plat/dma-core.h | 0 .../include/plat/dma-s3c24xx.h} | 4 +- .../{plat-s3c => plat-samsung}/include/plat/dma.h | 2 +- .../{plat-s3c => plat-samsung}/include/plat/fb.h | 2 +- .../include/plat/gpio-cfg-helpers.h | 2 +- .../include/plat/gpio-cfg.h | 0 .../include/plat/gpio-core.h | 30 + .../include/plat/hwmon.h | 0 .../include/plat/iic-core.h | 0 .../{plat-s3c => plat-samsung}/include/plat/iic.h | 0 arch/arm/plat-samsung/include/plat/irq-uart.h | 20 + .../include/plat/irq-vic-timer.h} | 12 +- .../include/plat/map-base.h | 0 .../{plat-s3c => plat-samsung}/include/plat/nand.h | 2 +- .../{plat-s3c => plat-samsung}/include/plat/pm.h | 6 +- .../include/plat/regs-ac97.h | 0 .../include/plat/regs-adc.h | 4 + .../include/plat/regs-fb-v4.h | 2 +- .../include/plat/regs-fb.h | 2 +- .../include/plat/regs-iic.h | 0 .../include/plat/regs-irqtype.h | 0 .../include/plat/regs-nand.h | 0 .../include/plat/regs-rtc.h | 0 .../include/plat/regs-s3c2412-iis.h | 0 .../include/plat/regs-sdhci.h | 0 .../include/plat/regs-serial.h | 32 +- .../include/plat/regs-timer.h | 0 .../include/plat/regs-usb-hsotg-phy.h | 2 +- .../include/plat/regs-usb-hsotg.h | 0 .../include/plat/regs-watchdog.h | 0 arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 67 + .../include/plat/sdhci.h | 43 +- .../include/plat/udc-hs.h | 4 +- .../include/plat/uncompress.h | 2 +- .../include/plat/usb-control.h | 4 +- .../include/plat/watchdog-reset.h | 0 arch/arm/{plat-s3c => plat-samsung}/init.c | 0 arch/arm/plat-samsung/irq-uart.c | 143 + arch/arm/plat-samsung/irq-vic-timer.c | 86 + arch/arm/{plat-s3c => plat-samsung}/pm-check.c | 8 +- arch/arm/{plat-s3c => plat-samsung}/pm-gpio.c | 2 +- arch/arm/{plat-s3c => plat-samsung}/pm.c | 8 +- arch/arm/{plat-s3c => plat-samsung}/pwm-clock.c | 112 +- arch/arm/{plat-s3c => plat-samsung}/pwm.c | 0 arch/arm/{plat-s3c => plat-samsung}/time.c | 2 +- arch/avr32/include/asm/ptrace.h | 2 + arch/avr32/kernel/ptrace.c | 53 +- arch/blackfin/include/asm/dma-mapping.h | 36 - arch/blackfin/include/asm/nand.h | 4 +- arch/cris/arch-v10/kernel/entry.S | 2 +- arch/cris/arch-v10/kernel/ptrace.c | 51 - arch/cris/arch-v10/lib/old_checksum.c | 2 +- arch/cris/arch-v32/kernel/entry.S | 2 +- arch/cris/arch-v32/kernel/ptrace.c | 109 +- arch/cris/arch-v32/mm/tlb.c | 2 +- arch/cris/include/arch-v32/arch/ptrace.h | 1 + arch/cris/include/asm/pci.h | 8 - arch/cris/include/asm/unistd.h | 2 + arch/cris/kernel/sys_cris.c | 96 - arch/frv/include/asm/dma-mapping.h | 41 +- arch/frv/include/asm/pci.h | 8 - arch/frv/include/asm/ptrace.h | 2 - arch/frv/include/asm/unistd.h | 1 + arch/frv/kernel/sys_frv.c | 89 - arch/frv/mb93090-mb00/pci-dma-nommu.c | 30 - arch/frv/mb93090-mb00/pci-dma.c | 30 - arch/h8300/include/asm/io.h | 2 +- arch/h8300/include/asm/ptrace.h | 2 + arch/h8300/include/asm/unistd.h | 3 + arch/h8300/kernel/ptrace.c | 82 +- arch/h8300/kernel/sys_h8300.c | 138 - arch/h8300/kernel/syscalls.S | 4 +- arch/h8300/platform/h8300h/ptrace_h8300h.c | 6 +- arch/h8300/platform/h8s/ptrace_h8s.c | 4 +- arch/ia64/Kconfig | 3 + arch/ia64/include/asm/compat.h | 3 +- arch/ia64/include/asm/pci.h | 14 - arch/ia64/include/asm/ptrace.h | 4 - arch/ia64/sn/kernel/setup.c | 2 +- arch/m32r/include/asm/ptrace.h | 2 + arch/m32r/include/asm/unistd.h | 1 + arch/m32r/kernel/ptrace.c | 97 +- arch/m32r/kernel/sys_m32r.c | 92 - arch/m68k/atari/atakeyb.c | 2 +- arch/m68k/include/asm/fbio.h | 2 +- arch/m68k/include/asm/io_no.h | 2 +- arch/m68k/include/asm/ptrace.h | 8 - arch/m68k/include/asm/unistd.h | 3 + arch/m68k/kernel/entry.S | 4 +- arch/m68k/kernel/sys_m68k.c | 131 - arch/m68knommu/kernel/ptrace.c | 74 +- arch/m68knommu/kernel/sys_m68k.c | 136 - arch/m68knommu/kernel/syscalltable.S | 4 +- arch/microblaze/kernel/ptrace.c | 64 +- arch/mips/Kconfig | 4 +- arch/mips/include/asm/compat.h | 3 +- arch/mips/include/asm/pci.h | 22 - arch/mips/include/asm/unistd.h | 2 + arch/mips/kernel/linux32.c | 16 - arch/mips/kernel/ptrace.c | 30 - arch/mips/kernel/scall64-n32.S | 2 +- arch/mips/kernel/scall64-o32.S | 2 +- arch/mips/kernel/syscall.c | 130 - arch/mn10300/include/asm/dma-mapping.h | 65 +- arch/mn10300/include/asm/ptrace.h | 2 - arch/mn10300/include/asm/unistd.h | 2 + arch/mn10300/kernel/entry.S | 2 +- arch/mn10300/kernel/sys_mn10300.c | 106 - arch/parisc/Kconfig | 3 + arch/parisc/include/asm/compat.h | 3 +- arch/parisc/include/asm/pci.h | 14 - arch/parisc/include/asm/ptrace.h | 5 - arch/parisc/kernel/sys_parisc.c | 15 - arch/parisc/kernel/syscall_table.S | 2 +- arch/powerpc/Kconfig | 3 + arch/powerpc/boot/dts/gef_ppc9a.dts | 4 +- arch/powerpc/boot/dts/gef_sbc310.dts | 4 +- arch/powerpc/boot/dts/gef_sbc610.dts | 4 +- arch/powerpc/boot/dts/kmeter1.dts | 2 +- arch/powerpc/include/asm/compat.h | 3 +- arch/powerpc/include/asm/dma-mapping.h | 3 - arch/powerpc/include/asm/paca.h | 18 +- arch/powerpc/include/asm/pci.h | 32 - arch/powerpc/include/asm/perf_event.h | 109 +- arch/powerpc/include/asm/perf_event_fsl_emb.h | 50 + arch/powerpc/include/asm/perf_event_server.h | 110 + arch/powerpc/include/asm/ptrace.h | 7 - arch/powerpc/include/asm/reg_booke.h | 4 +- arch/powerpc/include/asm/reg_fsl_emb.h | 2 +- arch/powerpc/include/asm/syscalls.h | 4 - arch/powerpc/include/asm/systbl.h | 2 +- arch/powerpc/include/asm/unistd.h | 2 + arch/powerpc/kernel/Makefile | 7 +- arch/powerpc/kernel/cputable.c | 2 +- arch/powerpc/kernel/e500-pmu.c | 129 + arch/powerpc/kernel/head_64.S | 17 +- arch/powerpc/kernel/legacy_serial.c | 2 +- arch/powerpc/kernel/paca.c | 93 +- arch/powerpc/kernel/pci-common.c | 15 - arch/powerpc/kernel/perf_event.c | 8 +- arch/powerpc/kernel/perf_event_fsl_emb.c | 654 + arch/powerpc/kernel/prom.c | 3 + arch/powerpc/kernel/ptrace.c | 12 +- arch/powerpc/kernel/setup-common.c | 3 + arch/powerpc/kernel/setup_64.c | 12 +- arch/powerpc/kernel/syscalls.c | 164 - arch/powerpc/mm/init_32.c | 2 +- arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 10 +- arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 34 +- arch/powerpc/platforms/86xx/Kconfig | 12 +- arch/powerpc/platforms/86xx/gef_gpio.c | 10 +- arch/powerpc/platforms/86xx/gef_pic.c | 20 +- arch/powerpc/platforms/86xx/gef_ppc9a.c | 12 +- arch/powerpc/platforms/86xx/gef_sbc310.c | 12 +- arch/powerpc/platforms/86xx/gef_sbc610.c | 12 +- arch/powerpc/platforms/Kconfig.cputype | 10 + arch/powerpc/platforms/iseries/exception.S | 25 +- arch/powerpc/platforms/pseries/hotplug-cpu.c | 42 +- arch/powerpc/platforms/pseries/offline_states.h | 23 +- arch/powerpc/platforms/pseries/plpar_wrappers.h | 4 +- arch/powerpc/platforms/pseries/xics.c | 7 +- arch/powerpc/sysdev/cpm2_pic.h | 2 +- arch/powerpc/sysdev/qe_lib/qe_ic.c | 10 +- arch/s390/crypto/sha_common.c | 2 +- arch/s390/include/asm/cio.h | 2 +- arch/s390/include/asm/compat.h | 3 +- arch/s390/include/asm/ptrace.h | 3 - arch/s390/include/asm/unistd.h | 1 + arch/s390/kernel/compat_wrapper.S | 2 +- arch/s390/kernel/entry.h | 10 +- arch/s390/kernel/sclp.S | 2 +- arch/s390/kernel/sys_s390.c | 43 +- arch/s390/kernel/syscalls.S | 6 +- arch/score/include/asm/ptrace.h | 3 +- arch/sh/Kconfig | 3 + arch/sh/include/asm/pci.h | 19 - arch/sh/include/asm/ptrace.h | 2 - arch/sh/include/asm/syscalls.h | 5 - arch/sh/include/asm/unistd_32.h | 2 + arch/sh/include/asm/unistd_64.h | 2 + arch/sh/kernel/cpu/clock.c | 2 +- arch/sh/kernel/sys_sh.c | 115 - arch/sparc/Kconfig | 3 + arch/sparc/include/asm/compat.h | 3 +- arch/sparc/include/asm/dma-mapping.h | 14 +- arch/sparc/include/asm/fbio.h | 2 +- arch/sparc/include/asm/pci_32.h | 14 - arch/sparc/include/asm/pci_64.h | 14 - arch/sparc/include/asm/unistd.h | 4 +- arch/sparc/kernel/iommu.c | 10 - arch/sparc/kernel/ioport.c | 11 - arch/sparc/kernel/perf_event.c | 4 +- arch/sparc/kernel/sys_sparc_32.c | 113 - arch/sparc/kernel/sys_sparc_64.c | 13 +- arch/sparc/kernel/systbls.h | 5 +- arch/sparc/kernel/systbls_64.S | 6 +- arch/um/include/asm/dma-mapping.h | 8 - arch/um/include/asm/ptrace-generic.h | 2 + arch/um/kernel/ptrace.c | 70 +- arch/um/kernel/syscall.c | 45 - arch/um/sys-i386/shared/sysdep/syscalls.h | 2 - arch/um/sys-i386/sys_call_table.S | 2 +- arch/um/sys-i386/syscalls.c | 137 - arch/um/sys-x86_64/syscall_table.c | 5 - arch/um/sys-x86_64/syscalls.c | 14 - arch/x86/Kconfig | 7 +- arch/x86/crypto/twofish-i586-asm_32.S | 10 +- arch/x86/crypto/twofish-x86_64-asm_64.S | 20 +- arch/x86/ia32/ia32entry.S | 6 +- arch/x86/ia32/sys_ia32.c | 76 +- arch/x86/include/asm/compat.h | 3 +- arch/x86/include/asm/hw_breakpoint.h | 1 - arch/x86/include/asm/pci.h | 28 - arch/x86/include/asm/perf_event.h | 16 +- arch/x86/include/asm/ptrace.h | 7 - arch/x86/include/asm/sys_ia32.h | 11 +- arch/x86/include/asm/syscalls.h | 15 - arch/x86/include/asm/unistd_32.h | 4 + arch/x86/include/asm/unistd_64.h | 3 +- arch/x86/kernel/aperture_64.c | 1 - arch/x86/kernel/apic/apic_flat_64.c | 2 +- arch/x86/kernel/apic/x2apic_uv_x.c | 4 +- arch/x86/kernel/cpu/intel.c | 3 +- arch/x86/kernel/cpu/mcheck/mce.c | 15 +- arch/x86/kernel/cpu/mcheck/mce_intel.c | 4 +- arch/x86/kernel/cpu/perf_event.c | 39 +- arch/x86/kernel/cpu/perf_event_intel.c | 37 +- arch/x86/kernel/cpu/perf_event_p6.c | 8 +- arch/x86/kernel/cpu/perfctr-watchdog.c | 2 +- arch/x86/kernel/dumpstack_64.c | 10 +- arch/x86/kernel/head_64.S | 2 +- arch/x86/kernel/hw_breakpoint.c | 12 - arch/x86/kernel/k8.c | 14 + arch/x86/kernel/pci-calgary_64.c | 2 +- arch/x86/kernel/pci-dma.c | 2 +- arch/x86/kernel/pci-gart_64.c | 2 +- arch/x86/kernel/process.c | 2 +- arch/x86/kernel/ptrace.c | 2 +- arch/x86/kernel/sys_i386_32.c | 185 - arch/x86/kernel/sys_x86_64.c | 12 - arch/x86/kernel/syscall_table_32.S | 4 +- arch/x86/kernel/tsc.c | 2 +- arch/x86/kernel/vmiclock_32.c | 2 +- arch/x86/mm/pageattr.c | 25 +- arch/x86/oprofile/op_model_amd.c | 23 +- arch/x86/oprofile/op_model_ppro.c | 6 +- arch/x86/xen/smp.c | 2 +- arch/xtensa/include/asm/pci.h | 8 - arch/xtensa/include/asm/ptrace.h | 1 + arch/xtensa/kernel/entry.S | 4 +- arch/xtensa/kernel/ptrace.c | 56 +- block/Kconfig | 2 +- block/Kconfig.iosched | 2 +- block/blk-cgroup.c | 53 +- block/blk-cgroup.h | 10 +- block/bsg.c | 2 +- crypto/Kconfig | 4 +- drivers/Makefile | 1 + drivers/acpi/dock.c | 2 +- drivers/acpi/proc.c | 2 +- drivers/ata/libata-core.c | 2 +- drivers/ata/libata-sff.c | 2 +- drivers/ata/pata_acpi.c | 2 +- drivers/ata/pata_hpt3x3.c | 2 +- drivers/ata/pata_pcmcia.c | 2 +- drivers/block/drbd/drbd_int.h | 4 +- drivers/block/drbd/drbd_req.h | 2 +- drivers/block/floppy.c | 1493 ++-- drivers/char/ChangeLog | 775 -- drivers/char/agp/Kconfig | 2 +- drivers/char/agp/intel-agp.c | 2 +- drivers/char/applicom.c | 2 +- drivers/char/hvc_iseries.c | 2 +- drivers/char/hw_random/n2-drv.c | 2 +- drivers/char/ip2/i2hw.h | 2 +- drivers/char/ipmi/ipmi_si_intf.c | 71 +- drivers/char/mem.c | 195 +- drivers/char/mmtimer.c | 2 +- drivers/char/n_tty.c | 17 + drivers/char/pty.c | 2 +- drivers/char/random.c | 2 +- drivers/char/serial167.c | 2 +- drivers/char/tty_audit.c | 1 - drivers/char/tty_io.c | 2 +- drivers/char/vt.c | 6 +- drivers/crypto/hifn_795x.c | 2 +- drivers/dma/coh901318_lli.h | 2 +- drivers/edac/e752x_edac.c | 117 +- drivers/edac/mpc85xx_edac.c | 163 +- drivers/edac/mpc85xx_edac.h | 3 + drivers/gpu/drm/nouveau/nouveau_bios.c | 2 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +- drivers/gpu/drm/radeon/radeon_state.c | 2 +- drivers/gpu/drm/via/via_irq.c | 4 +- drivers/hid/hid-input.c | 24 +- drivers/i2c/Kconfig | 9 - drivers/i2c/Makefile | 2 +- drivers/i2c/algos/i2c-algo-bit.c | 9 + drivers/i2c/algos/i2c-algo-pcf.c | 2 +- drivers/i2c/busses/i2c-i801.c | 6 +- drivers/i2c/busses/i2c-powermac.c | 25 +- drivers/i2c/busses/i2c-pxa.c | 2 +- drivers/i2c/busses/i2c-xiic.c | 1 + drivers/i2c/chips/Kconfig | 19 - drivers/i2c/chips/Makefile | 18 - drivers/i2c/i2c-smbus.c | 5 +- drivers/ieee1394/pcilynx.c | 2 +- drivers/infiniband/core/mad.c | 3 + drivers/infiniband/hw/cxgb3/iwch.c | 2 + drivers/infiniband/hw/ehca/ehca_qes.h | 4 +- drivers/infiniband/hw/ehca/ehca_reqs.c | 2 +- drivers/infiniband/hw/nes/nes_hw.c | 8 + drivers/infiniband/hw/nes/nes_hw.h | 1 + drivers/infiniband/hw/nes/nes_nic.c | 30 +- drivers/infiniband/hw/nes/nes_verbs.c | 1 + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 10 +- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 9 +- drivers/input/evdev.c | 2 +- drivers/input/input.c | 38 +- drivers/input/joystick/gamecon.c | 2 +- drivers/input/keyboard/bf54x-keys.c | 2 +- drivers/input/keyboard/locomokbd.c | 32 +- drivers/input/misc/Kconfig | 11 + drivers/input/misc/Makefile | 1 + drivers/input/misc/ati_remote2.c | 14 +- drivers/input/misc/twl4030-vibra.c | 297 + drivers/input/misc/winbond-cir.c | 12 +- drivers/input/misc/wm831x-on.c | 9 +- drivers/input/misc/yealink.h | 2 +- drivers/input/mouse/alps.c | 57 +- drivers/input/mouse/appletouch.c | 6 +- drivers/input/mousedev.c | 6 - drivers/input/serio/i8042-x86ia64io.h | 10 + drivers/input/serio/i8042.c | 26 +- drivers/input/serio/serio_raw.c | 11 +- drivers/input/sparse-keymap.c | 6 +- drivers/input/tablet/aiptek.c | 2 +- drivers/input/tablet/wacom_sys.c | 4 +- drivers/input/tablet/wacom_wac.c | 165 +- drivers/input/tablet/wacom_wac.h | 1 - drivers/input/touchscreen/Kconfig | 9 +- drivers/input/touchscreen/ad7877.c | 2 +- drivers/input/touchscreen/ads7846.c | 20 + drivers/isdn/hardware/mISDN/mISDNisar.c | 4 +- drivers/isdn/i4l/isdn_common.c | 2 +- drivers/isdn/mISDN/dsp_core.c | 4 +- drivers/isdn/mISDN/l1oip_core.c | 4 +- drivers/isdn/sc/hardware.h | 2 +- drivers/macintosh/therm_pm72.c | 30 +- drivers/macintosh/therm_pm72.h | 2 +- drivers/media/IR/ir-keytable.c | 4 +- drivers/media/dvb/dvb-core/dvb_frontend.h | 8 +- drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 4 +- drivers/media/video/bt8xx/bttv-cards.c | 4 +- drivers/media/video/gspca/ov519.c | 2 +- drivers/media/video/pwc/philips.txt | 2 +- drivers/media/video/sn9c102/sn9c102_sensor.h | 2 +- drivers/media/video/tea6420.c | 2 +- drivers/message/i2o/iop.c | 2 +- drivers/mfd/Kconfig | 9 +- drivers/mfd/sm501.c | 12 +- drivers/misc/Kconfig | 10 + drivers/misc/Makefile | 1 + drivers/misc/eeprom/at24.c | 1 + drivers/misc/sgi-gru/grutables.h | 15 +- drivers/{i2c/chips => misc}/tsl2550.c | 4 +- drivers/mmc/card/sdio_uart.c | 2 +- drivers/mmc/core/core.c | 1 + drivers/mmc/core/sdio_ops.c | 36 +- drivers/mmc/core/sdio_ops.h | 1 + drivers/mmc/host/msm_sdcc.c | 4 +- drivers/mmc/host/mxcmmc.c | 4 +- drivers/mtd/chips/jedec_probe.c | 2 +- drivers/mtd/maps/pismo.c | 2 +- drivers/mtd/maps/plat-ram.c | 2 +- drivers/mtd/nand/Kconfig | 2 +- drivers/mtd/nand/bcm_umi_nand.c | 4 +- drivers/mtd/nand/mxc_nand.c | 2 +- drivers/net/Kconfig | 2 +- drivers/net/arm/ks8695net.c | 2 +- drivers/net/atlx/atl2.h | 2 +- drivers/net/benet/be.h | 5 - drivers/net/benet/be_cmds.c | 6 - drivers/net/benet/be_hw.h | 5 +- drivers/net/benet/be_main.c | 25 +- drivers/net/can/bfin_can.c | 3 +- drivers/net/can/usb/ems_usb.c | 4 +- drivers/net/cassini.c | 2 +- drivers/net/chelsio/sge.c | 2 +- drivers/net/cpmac.c | 14 +- drivers/net/cs89x0.c | 2 +- drivers/net/cxgb3/cxgb3_main.c | 1 + drivers/net/cxgb3/sge.c | 4 +- drivers/net/davinci_emac.c | 4 +- drivers/net/e1000e/82571.c | 2 +- drivers/net/e1000e/defines.h | 2 + drivers/net/e1000e/ich8lan.c | 10 + drivers/net/e1000e/lib.c | 2 +- drivers/net/gianfar.c | 5 +- drivers/net/igb/igb_main.c | 2 +- drivers/net/irda/irda-usb.c | 4 + drivers/net/irda/sa1100_ir.c | 2 +- drivers/net/ks8851.c | 2 +- drivers/net/qlcnic/qlcnic.h | 13 +- drivers/net/qlcnic/qlcnic_ethtool.c | 17 + drivers/net/qlcnic/qlcnic_hw.c | 32 +- drivers/net/qlcnic/qlcnic_init.c | 156 +- drivers/net/qlcnic/qlcnic_main.c | 5 + drivers/net/qlge/qlge_ethtool.c | 2 +- drivers/net/qlge/qlge_main.c | 2 +- drivers/net/r8169.c | 4 +- drivers/net/s2io.c | 6 +- drivers/net/sfc/regs.h | 2 +- drivers/net/skfp/ess.c | 2 +- drivers/net/sky2.c | 2 +- drivers/net/smc91x.h | 42 + drivers/net/smsc9420.c | 2 +- drivers/net/spider_net.c | 4 +- drivers/net/sungem.c | 2 +- drivers/net/tehuti.c | 2 +- drivers/net/tg3.c | 4 +- drivers/net/tokenring/tms380tr.c | 4 +- drivers/net/tulip/eeprom.c | 54 +- drivers/net/tun.c | 2 +- drivers/net/typhoon.c | 12 +- drivers/net/ucc_geth.c | 2 +- drivers/net/usb/asix.c | 30 +- drivers/net/usb/pegasus.h | 6 +- drivers/net/wan/cosa.c | 10 +- drivers/net/wan/hdlc_cisco.c | 8 +- drivers/net/wan/hdlc_x25.c | 4 +- drivers/net/wimax/i2400m/fw.c | 2 +- drivers/net/wimax/i2400m/i2400m.h | 2 +- drivers/net/wimax/i2400m/sdio.c | 4 +- drivers/net/wimax/i2400m/usb.c | 4 +- drivers/net/wireless/airo.c | 3 +- drivers/net/wireless/ath/ar9170/ar9170.h | 1 + drivers/net/wireless/ath/ar9170/main.c | 12 +- drivers/net/wireless/ath/ar9170/usb.c | 170 +- drivers/net/wireless/ath/ath5k/eeprom.c | 4 +- drivers/net/wireless/ath/ath5k/phy.c | 41 +- drivers/net/wireless/ath/ath5k/reg.h | 1 + drivers/net/wireless/ath/ath5k/reset.c | 22 +- drivers/net/wireless/ath/ath9k/rc.c | 6 +- drivers/net/wireless/ath/ath9k/xmit.c | 4 +- drivers/net/wireless/ipw2x00/ipw2200.c | 19 +- drivers/net/wireless/ipw2x00/libipw.h | 2 +- drivers/net/wireless/ipw2x00/libipw_module.c | 37 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 6 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 159 +- drivers/net/wireless/iwlwifi/iwl-dev.h | 2 + drivers/net/wireless/iwlwifi/iwl-scan.c | 49 +- drivers/net/wireless/iwmc3200wifi/lmac.h | 2 +- drivers/net/wireless/rndis_wlan.c | 66 +- drivers/net/wireless/rt2x00/rt2500usb.c | 4 +- drivers/net/wireless/rt2x00/rt2800pci.c | 2 +- drivers/net/wireless/rt2x00/rt2800usb.c | 4 +- drivers/net/wireless/rt2x00/rt2x00debug.c | 2 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 2 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 2 +- drivers/net/wireless/rt2x00/rt2x00soc.c | 1 + drivers/net/wireless/rt2x00/rt2x00soc.h | 2 - drivers/net/wireless/rt2x00/rt61pci.c | 2 +- drivers/net/wireless/rt2x00/rt73usb.c | 8 +- drivers/net/wireless/zd1211rw/zd_mac.c | 12 +- drivers/parport/ChangeLog | 583 - drivers/pci/pci.c | 31 - drivers/pcmcia/sa1111_generic.c | 25 +- drivers/platform/x86/dell-wmi.c | 16 +- drivers/platform/x86/hp-wmi.c | 15 +- drivers/platform/x86/panasonic-laptop.c | 15 +- drivers/platform/x86/thinkpad_acpi.c | 4 +- drivers/platform/x86/topstar-laptop.c | 13 +- drivers/platform/x86/toshiba_acpi.c | 17 +- drivers/pps/Kconfig | 2 + drivers/pps/Makefile | 1 + drivers/pps/clients/Kconfig | 25 + drivers/pps/clients/Makefile | 10 + drivers/pps/clients/pps-ktimer.c | 123 + drivers/pps/clients/pps-ldisc.c | 154 + drivers/rtc/hctosys.c | 59 +- drivers/rtc/rtc-sysfs.c | 5 +- drivers/s390/char/raw3270.c | 2 +- drivers/s390/char/sclp.c | 2 +- drivers/s390/net/qeth_core.h | 3 +- drivers/s390/net/qeth_core_main.c | 5 +- drivers/s390/net/qeth_core_sys.c | 3 + drivers/s390/net/qeth_l2_main.c | 16 +- drivers/s390/net/qeth_l3_main.c | 82 +- drivers/scsi/a100u2w.c | 2 +- drivers/scsi/initio.c | 2 +- drivers/scsi/libfc/fc_fcp.c | 4 +- drivers/scsi/lpfc/lpfc_els.c | 4 +- drivers/scsi/lpfc/lpfc_scsi.c | 4 +- drivers/scsi/pcmcia/nsp_cs.h | 2 +- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- drivers/scsi/pm8001/pm8001_sas.c | 2 +- drivers/scsi/pmcraid.h | 2 +- drivers/scsi/qlogicpti.c | 2 +- drivers/scsi/sd.c | 2 +- drivers/scsi/ses.c | 4 +- drivers/serial/8250.c | 16 + drivers/serial/Kconfig | 31 +- drivers/serial/Makefile | 1 + drivers/serial/amba-pl010.c | 15 + drivers/serial/imx.c | 2 +- drivers/serial/s3c2412.c | 1 + drivers/serial/s5pv210.c | 154 + drivers/serial/samsung.c | 8 +- drivers/serial/samsung.h | 19 +- drivers/serial/sh-sci.h | 22 +- drivers/sh/intc.c | 10 +- drivers/spi/spi_s3c24xx.c | 2 +- drivers/usb/gadget/fsl_mx3_udc.c | 31 +- drivers/usb/gadget/pxa25x_udc.c | 4 + drivers/usb/gadget/s3c-hsotg.c | 2 +- drivers/usb/musb/davinci.c | 2 +- drivers/usb/musb/musb_regs.h | 2 +- drivers/usb/serial/cypress_m8.c | 2 +- drivers/usb/serial/opticon.c | 2 +- drivers/usb/serial/symbolserial.c | 2 +- drivers/usb/wusbcore/wusbhc.h | 2 +- drivers/uwb/i1480/i1480-est.c | 4 +- drivers/uwb/uwbd.c | 2 +- drivers/video/68328fb.c | 2 +- drivers/video/Kconfig | 39 +- drivers/video/Makefile | 2 + drivers/video/asiliantfb.c | 4 +- drivers/video/bf54x-lq043fb.c | 30 - drivers/video/bfin-lq035q1-fb.c | 1 - drivers/video/bfin-t350mcqb-fb.c | 29 - drivers/video/broadsheetfb.c | 738 ++- drivers/video/mb862xx/mb862xxfb.c | 13 - drivers/video/mbx/mbxfb.c | 2 +- drivers/video/modedb.c | 8 +- drivers/video/nuc900fb.c | 779 ++ drivers/video/nuc900fb.h | 55 + drivers/video/omap/lcdc.c | 2 +- drivers/video/pm2fb.c | 2 +- drivers/video/s1d13xxxfb.c | 4 +- drivers/video/sis/sis_main.c | 3 - drivers/video/sm501fb.c | 2 +- drivers/video/sstfb.c | 2 +- drivers/video/sunxvr1000.c | 228 + drivers/video/via/Makefile | 2 +- drivers/video/via/chip.h | 11 +- drivers/video/via/dvi.c | 233 +- drivers/video/via/dvi.h | 7 +- drivers/video/via/global.c | 5 - drivers/video/via/global.h | 3 - drivers/video/via/hw.c | 330 +- drivers/video/via/hw.h | 17 +- drivers/video/via/iface.c | 78 - drivers/video/via/iface.h | 38 - drivers/video/via/lcd.c | 640 +- drivers/video/via/share.h | 56 - drivers/video/via/via_utility.c | 12 - drivers/video/via/via_utility.h | 1 - drivers/video/via/viafbdev.c | 518 +- drivers/video/via/viafbdev.h | 6 - drivers/video/via/viamode.c | 180 +- drivers/video/via/viamode.h | 8 +- drivers/w1/masters/ds2482.c | 2 +- drivers/w1/masters/mxc_w1.c | 4 +- drivers/w1/w1.c | 4 +- drivers/zorro/zorro.ids | 2 +- firmware/bnx2x-e1-5.2.7.0.fw.ihex |10178 ---------------- firmware/bnx2x-e1h-5.2.7.0.fw.ihex |12847 -------------------- fs/9p/v9fs.h | 6 +- fs/9p/vfs_dir.c | 11 +- fs/9p/vfs_file.c | 4 +- fs/affs/bitmap.c | 2 +- fs/anon_inodes.c | 1 + fs/binfmt_elf_fdpic.c | 2 +- fs/bio.c | 7 +- fs/buffer.c | 15 +- fs/cifs/asn1.c | 2 +- fs/cifs/cifs_dfs_ref.c | 2 +- fs/cifs/cifssmb.c | 2 +- fs/compat.c | 18 + fs/dlm/member.c | 2 +- fs/ext3/super.c | 2 +- fs/ext4/mballoc.c | 2 +- fs/ext4/super.c | 2 +- fs/fat/inode.c | 2 +- fs/fat/namei_vfat.c | 27 +- fs/fuse/inode.c | 2 +- fs/gfs2/Kconfig | 1 - fs/gfs2/file.c | 2 +- fs/gfs2/incore.h | 2 +- fs/gfs2/log.c | 3 +- fs/gfs2/ops_fstype.c | 2 +- fs/jbd/transaction.c | 2 +- fs/locks.c | 2 +- fs/mpage.c | 2 +- fs/namei.c | 2 +- fs/nfsd/nfs4xdr.c | 2 +- fs/nilfs2/alloc.h | 2 +- fs/nilfs2/dat.c | 2 +- fs/nilfs2/dir.c | 2 +- fs/nilfs2/gcinode.c | 4 +- fs/nilfs2/page.c | 4 +- fs/nilfs2/segbuf.c | 10 +- fs/nilfs2/segment.c | 8 +- fs/nilfs2/segment.h | 4 +- fs/nilfs2/sufile.c | 2 +- fs/nilfs2/super.c | 4 +- fs/nilfs2/the_nilfs.c | 2 +- fs/ntfs/ChangeLog | 1702 --- fs/ocfs2/cluster/tcp.c | 4 +- fs/ocfs2/dlmglue.c | 2 +- fs/ocfs2/extent_map.c | 2 +- fs/qnx4/inode.c | 3 +- fs/reiserfs/bitmap.c | 2 +- fs/select.c | 17 + fs/udf/balloc.c | 49 +- fs/udf/inode.c | 36 +- fs/ufs/super.c | 3 + fs/ufs/ufs_fs.h | 15 +- include/asm-generic/pci-dma-compat.h | 15 +- include/linux/acct.h | 3 +- include/linux/cgroup.h | 53 +- include/linux/compat.h | 3 + include/linux/coredump.h | 10 +- include/linux/cred.h | 2 +- include/linux/decompress/mm.h | 14 +- include/linux/dm9000.h | 2 +- include/linux/dma-mapping.h | 24 + include/linux/ethtool.h | 24 +- include/linux/hil.h | 16 +- include/linux/hw_breakpoint.h | 8 +- include/linux/i2c-algo-bit.h | 2 + include/linux/i2c-xiic.h | 43 + include/linux/init_task.h | 8 - include/linux/input.h | 20 +- include/linux/iocontext.h | 2 +- include/linux/ipc_namespace.h | 5 - include/linux/ipmi_smi.h | 1 - include/linux/kmod.h | 1 + include/linux/lockdep.h | 4 + include/linux/lru_cache.h | 2 +- include/linux/memcontrol.h | 6 - include/linux/mm.h | 8 + include/linux/mm_types.h | 2 +- include/linux/mmzone.h | 2 +- include/linux/module.h | 1 + include/linux/msdos_fs.h | 3 +- include/linux/nodemask.h | 2 +- include/linux/page_cgroup.h | 2 + include/linux/pci-dma.h | 11 + include/linux/pci.h | 3 +- include/linux/perf_event.h | 27 +- include/linux/poll.h | 2 + include/linux/ptrace.h | 5 + include/linux/rbtree.h | 8 +- include/linux/rcupdate.h | 49 +- include/linux/reboot.h | 1 + include/linux/rfkill.h | 2 +- include/linux/rtc.h | 6 + include/linux/rtmutex.h | 2 + include/linux/rwlock.h | 20 +- include/linux/sched.h | 8 +- include/linux/serial_core.h | 11 +- include/linux/signal.h | 2 + include/linux/snmp.h | 2 + include/linux/spi/ads7846.h | 3 +- include/linux/spinlock.h | 13 +- include/linux/swap.h | 9 + include/linux/syscalls.h | 11 + include/linux/taskstats_kern.h | 7 - include/linux/tty.h | 1 + include/linux/tty_ldisc.h | 8 + include/linux/virtio.h | 1 + include/linux/virtio_9p.h | 12 + include/math-emu/op-common.h | 2 +- include/media/davinci/vpfe_capture.h | 2 +- include/net/9p/client.h | 4 +- include/net/ip6_route.h | 18 + include/net/ip6_tunnel.h | 1 - include/net/irda/irttp.h | 2 +- include/net/mac80211.h | 3 +- include/net/net_namespace.h | 5 - include/net/sock.h | 17 +- include/net/tcp.h | 2 +- include/net/xfrm.h | 3 +- include/scsi/sg.h | 3 + include/trace/ftrace.h | 4 +- include/video/broadsheetfb.h | 23 +- init/Kconfig | 1 + ipc/Makefile | 2 +- ipc/mqueue.c | 2 +- ipc/shm.c | 3 +- ipc/syscall.c | 99 + kernel/acct.c | 10 - kernel/audit.c | 2 +- kernel/cgroup.c | 693 +- kernel/exit.c | 2 +- kernel/fork.c | 47 +- kernel/hw_breakpoint.c | 11 +- kernel/irq/chip.c | 2 +- kernel/irq/devres.c | 4 +- kernel/ksysfs.c | 2 +- kernel/lockdep.c | 1 + kernel/nsproxy.c | 13 +- kernel/params.c | 6 +- kernel/perf_event.c | 36 +- kernel/pid.c | 4 +- kernel/pid_namespace.c | 7 +- kernel/rcutree.h | 21 +- kernel/rcutree_plugin.h | 8 +- kernel/sched.c | 4 +- kernel/sched_cpupri.c | 2 +- kernel/sched_fair.c | 2 +- kernel/sched_rt.c | 7 +- kernel/sys.c | 67 + kernel/sys_ni.c | 1 + kernel/sysctl.c | 37 +- kernel/time/clocksource.c | 4 + kernel/trace/ftrace.c | 30 +- kernel/trace/ring_buffer.c | 16 +- kernel/trace/trace.c | 49 +- kernel/trace/trace.h | 5 +- kernel/trace/trace_clock.c | 1 + kernel/trace/trace_event_profile.c | 4 +- kernel/trace/trace_functions_graph.c | 27 +- lib/Kconfig.debug | 8 + lib/zlib_inflate/inffast.c | 72 +- mm/highmem.c | 2 +- mm/memcontrol.c | 1386 ++- mm/memory.c | 11 +- mm/memory_hotplug.c | 6 +- mm/mempolicy.c | 2 + mm/mmap.c | 24 + mm/nommu.c | 24 + mm/oom_kill.c | 10 +- mm/page_alloc.c | 85 +- mm/page_cgroup.c | 34 +- mm/slub.c | 2 +- mm/swapfile.c | 31 + net/9p/client.c | 16 +- net/9p/trans_virtio.c | 64 +- net/bluetooth/hci_sysfs.c | 41 +- net/bridge/Kconfig | 1 + net/bridge/br_multicast.c | 19 +- net/core/dev_mcast.c | 5 +- net/core/ethtool.c | 103 +- net/core/neighbour.c | 2 + net/core/sock.c | 19 +- net/dccp/minisocks.c | 2 +- net/ipv4/ip_gre.c | 7 +- net/ipv4/ipconfig.c | 57 +- net/ipv4/proc.c | 2 + net/ipv4/route.c | 50 +- net/ipv4/tcp_ipv4.c | 15 +- net/ipv4/tcp_minisocks.c | 2 +- net/ipv4/tcp_output.c | 18 +- net/ipv4/tcp_timer.c | 2 +- net/ipv4/udp.c | 6 +- net/ipv4/xfrm4_policy.c | 5 +- net/ipv6/addrconf.c | 104 +- net/ipv6/fib6_rules.c | 11 +- net/ipv6/route.c | 11 +- net/ipv6/tcp_ipv6.c | 7 +- net/ipv6/udp.c | 28 +- net/ipv6/xfrm6_policy.c | 3 +- net/llc/llc_c_ac.c | 2 +- net/llc/llc_conn.c | 3 +- net/mac80211/debugfs_netdev.c | 10 +- net/mac80211/mesh_plink.c | 2 +- net/mac80211/mlme.c | 32 +- net/mac80211/rate.h | 5 +- net/mac80211/sta_info.c | 1 + net/netfilter/nf_conntrack_sip.c | 4 +- net/netfilter/xt_hashlimit.c | 2 +- net/packet/af_packet.c | 6 +- net/rfkill/input.c | 8 + net/sctp/input.c | 42 +- net/sctp/sm_sideeffect.c | 2 +- net/sctp/socket.c | 3 + net/sunrpc/xprtrdma/transport.c | 7 +- net/sunrpc/xprtsock.c | 9 +- net/tipc/bearer.c | 37 +- net/tipc/bearer.h | 2 +- net/tipc/link.c | 9 + net/tipc/net.c | 25 +- net/tipc/socket.c | 6 +- net/tipc/subscr.c | 57 +- net/tipc/subscr.h | 2 - net/x25/x25_dev.c | 2 +- net/xfrm/xfrm_policy.c | 7 +- samples/hw_breakpoint/data_breakpoint.c | 6 +- scripts/gfp-translate | 2 +- scripts/kernel-doc | 2 +- security/selinux/avc.c | 6 +- sound/arm/pxa2xx-ac97-lib.c | 68 +- sound/isa/opti9xx/opti92x-ad1848.c | 3 +- sound/pci/hda/hda_intel.c | 1 + sound/pci/hda/patch_realtek.c | 8 +- sound/pci/rme9652/hdspm.c | 2 +- sound/soc/codecs/wm8990.c | 2 +- sound/soc/pxa/pxa-ssp.c | 93 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 4 +- tools/perf/Documentation/perf-lock.txt | 29 + tools/perf/builtin-lock.c | 148 +- tools/perf/builtin-trace.c | 4 +- tools/perf/command-list.txt | 1 + tools/perf/perf-archive.sh | 3 +- tools/perf/perf.c | 2 +- tools/perf/perf.h | 4 +- tools/perf/util/hist.c | 2 +- tools/perf/util/probe-event.c | 2 +- 1468 files changed, 58576 insertions(+), 46885 deletions(-) create mode 100644 Documentation/arm/Samsung/Overview.txt create mode 100755 Documentation/arm/Samsung/clksrc-change-registers.awk create mode 100644 Documentation/cgroups/cgroup_event_listener.c create mode 100644 Documentation/filesystems/Makefile create mode 100644 Documentation/filesystems/dnotify_test.c create mode 100644 Documentation/laptops/Makefile create mode 100644 Documentation/laptops/dslm.c create mode 100644 Documentation/timers/Makefile create mode 100644 Documentation/timers/hpet_example.c create mode 100644 Documentation/vm/hugepage-mmap.c create mode 100644 Documentation/vm/hugepage-shm.c delete mode 100644 Documentation/voyager.txt create mode 100644 arch/arm/configs/ap4evb_defconfig create mode 100644 arch/arm/configs/g3evm_defconfig create mode 100644 arch/arm/configs/g4evm_defconfig create mode 100644 arch/arm/configs/imote2_defconfig create mode 100644 arch/arm/configs/mmp2_defconfig delete mode 100644 arch/arm/configs/mx1ads_defconfig create mode 100644 arch/arm/configs/mx51_defconfig create mode 100644 arch/arm/configs/raumfeld_defconfig create mode 100644 arch/arm/configs/s5p6440_defconfig create mode 100644 arch/arm/configs/s5p6442_defconfig create mode 100644 arch/arm/configs/s5pc110_defconfig create mode 100644 arch/arm/configs/s5pv210_defconfig rename arch/arm/{mach-s3c6400/include/mach/entry-macro.S => include/asm/entry-macro-vic2.S} (50%) create mode 100644 arch/arm/mach-kirkwood/openrd-setup.c delete mode 100644 arch/arm/mach-kirkwood/openrd_base-setup.c create mode 100644 arch/arm/mach-mmp/avengers_lite.c create mode 100644 arch/arm/mach-mmp/flint.c create mode 100644 arch/arm/mach-mmp/include/mach/mfp-mmp2.h create mode 100644 arch/arm/mach-mmp/include/mach/mmp2.h create mode 100644 arch/arm/mach-mmp/irq-mmp2.c rename arch/arm/mach-mmp/{irq.c => irq-pxa168.c} (100%) create mode 100644 arch/arm/mach-mmp/jasper.c create mode 100644 arch/arm/mach-mmp/mmp2.c create mode 100644 arch/arm/mach-mv78xx0/buffalo-wxl-setup.c create mode 100644 arch/arm/mach-mv78xx0/mpp.c create mode 100644 arch/arm/mach-mv78xx0/mpp.h rename arch/arm/mach-mx1/{mx1ads.c => mach-mx1ads.c} (95%) rename arch/arm/mach-mx1/{scb9328.c => mach-scb9328.c} (98%) delete mode 100644 arch/arm/mach-mx2/crm_regs.h rename arch/arm/mach-mx2/{eukrea_cpuimx27.c => mach-cpuimx27.c} (91%) rename arch/arm/mach-mx2/{mx27lite.c => mach-imx27lite.c} (93%) rename arch/arm/mach-mx2/{mx21ads.c => mach-mx21ads.c} (94%) rename arch/arm/mach-mx2/{mx27pdk.c => mach-mx27_3ds.c} (93%) rename arch/arm/mach-mx2/{mx27ads.c => mach-mx27ads.c} (96%) rename arch/arm/mach-mx2/{mxt_td60.c => mach-mxt_td60.c} (96%) create mode 100644 arch/arm/mach-mx2/mach-pca100.c rename arch/arm/mach-mx2/{pcm038.c => mach-pcm038.c} (89%) copy arch/arm/mach-mx2/{generic.c => mm-imx21.c} (66%) rename arch/arm/mach-mx2/{generic.c => mm-imx27.c} (67%) delete mode 100644 arch/arm/mach-mx2/pca100.c rename arch/arm/mach-mx25/{mx25pdk.c => mach-mx25pdk.c} (68%) rename arch/arm/mach-mx3/{clock.c => clock-imx31.c} (99%) rename arch/arm/mach-mx3/{iomux.c => iomux-imx31.c} (98%) rename arch/arm/mach-mx3/{armadillo5x0.c => mach-armadillo5x0.c} (97%) rename arch/arm/mach-mx3/{kzmarm11.c => mach-kzm_arm11_01.c} (89%) rename arch/arm/mach-mx3/{mx31pdk.c => mach-mx31_3ds.c} (96%) rename arch/arm/mach-mx3/{mx31ads.c => mach-mx31ads.c} (94%) rename arch/arm/mach-mx3/{mx31lilly.c => mach-mx31lilly.c} (96%) rename arch/arm/mach-mx3/{mx31lite.c => mach-mx31lite.c} (95%) rename arch/arm/mach-mx3/{mx31moboard.c => mach-mx31moboard.c} (93%) rename arch/arm/mach-mx3/{mx35pdk.c => mach-mx35pdk.c} (95%) rename arch/arm/mach-mx3/{pcm037.c => mach-pcm037.c} (82%) rename arch/arm/mach-mx3/{pcm037_eet.c => mach-pcm037_eet.c} (100%) create mode 100644 arch/arm/mach-mx3/mach-pcm043.c rename arch/arm/mach-mx3/{qong.c => mach-qong.c} (93%) create mode 100644 arch/arm/mach-mx3/mx31moboard-smartbot.c delete mode 100644 arch/arm/mach-mx3/pcm043.c create mode 100644 arch/arm/mach-mx5/Kconfig create mode 100644 arch/arm/mach-mx5/Makefile create mode 100644 arch/arm/mach-mx5/Makefile.boot create mode 100644 arch/arm/mach-mx5/board-mx51_babbage.c create mode 100644 arch/arm/mach-mx5/clock-mx51.c create mode 100644 arch/arm/mach-mx5/cpu.c create mode 100644 arch/arm/mach-mx5/crm_regs.h create mode 100644 arch/arm/mach-mx5/devices.c create mode 100644 arch/arm/mach-mx5/devices.h create mode 100644 arch/arm/mach-mx5/mm.c mode change 100755 => 100644 arch/arm/mach-omap2/board-3630sdp.c mode change 100755 => 100644 arch/arm/mach-omap2/board-zoom-peripherals.c create mode 100644 arch/arm/mach-orion5x/ls_hgl-setup.c create mode 100644 arch/arm/mach-pxa/capc7117.c create mode 100644 arch/arm/mach-pxa/icontrol.c create mode 100644 arch/arm/mach-pxa/include/mach/mxm8x10.h create mode 100644 arch/arm/mach-pxa/mxm8x10.c create mode 100644 arch/arm/mach-pxa/raumfeld.c rename arch/arm/mach-s3c2410/include/mach/{gpio-core.h => gpio-track.h} (96%) rename arch/arm/{plat-s3c24xx/include/plat => mach-s3c2410/include/mach}/pm-core.h (97%) copy arch/arm/{plat-s3c => mach-s3c2410}/include/mach/timex.h (99%) copy arch/arm/{plat-s3c => mach-s3c2410}/include/mach/vmalloc.h (85%) rename arch/arm/{mach-s3c2442 => mach-s3c2440}/include/mach/gta02.h (100%) rename arch/arm/{mach-s3c2442 => mach-s3c2440}/mach-gta02.c (99%) rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c2440-pll-12000000.c (98%) rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c2440-pll-16934400.c (99%) rename arch/arm/{mach-s3c2442/clock.c => mach-s3c2440/s3c2442.c} (90%) rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c244x-clock.c (97%) rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c244x-irq.c (100%) rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c244x.c (98%) delete mode 100644 arch/arm/mach-s3c2442/Kconfig delete mode 100644 arch/arm/mach-s3c2442/Makefile delete mode 100644 arch/arm/mach-s3c2442/s3c2442.c copy arch/arm/{plat-s3c => mach-s3c24a0}/include/mach/io.h (72%) delete mode 100644 arch/arm/mach-s3c6400/Kconfig delete mode 100644 arch/arm/mach-s3c6400/Makefile delete mode 100644 arch/arm/mach-s3c6400/include/mach/dma.h delete mode 100644 arch/arm/mach-s3c6400/include/mach/gpio-core.h delete mode 100644 arch/arm/mach-s3c6400/include/mach/irqs.h delete mode 100644 arch/arm/mach-s3c6400/include/mach/regs-clock.h delete mode 100644 arch/arm/mach-s3c6410/Kconfig delete mode 100644 arch/arm/mach-s3c6410/Makefile delete mode 100644 arch/arm/mach-s3c6410/setup-sdhci.c create mode 100644 arch/arm/mach-s3c64xx/Kconfig rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/Makefile (52%) rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/Makefile.boot (100%) create mode 100644 arch/arm/mach-s3c64xx/clock.c rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpu.c (89%) rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpufreq.c (100%) create mode 100644 arch/arm/mach-s3c64xx/dev-adc.c create mode 100644 arch/arm/mach-s3c64xx/dev-audio.c create mode 100644 arch/arm/mach-s3c64xx/dev-rtc.c create mode 100644 arch/arm/mach-s3c64xx/dev-spi.c rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/dev-uart.c (85%) rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/dma.c (99%) create mode 100644 arch/arm/mach-s3c64xx/gpiolib.c copy arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/debug-macro.S (97%) rename arch/arm/{plat-s3c64xx/include/plat/dma-plat.h => mach-s3c64xx/include/mach/dma.h} (53%) create mode 100644 arch/arm/mach-s3c64xx/include/mach/entry-macro.S rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-a.h (96%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-b.h (97%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-c.h (96%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-d.h (96%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-e.h (96%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-f.h (97%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-g.h (95%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-h.h (97%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-i.h (96%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-j.h (95%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-n.h (96%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-o.h (97%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-p.h (97%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-q.h (96%) rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/gpio.h (96%) rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/hardware.h (100%) copy arch/arm/{plat-s3c => mach-s3c64xx}/include/mach/io.h (72%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/irqs.h (93%) rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/map.h (81%) rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/memory.h (100%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/pll.h (100%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/pm-core.h (97%) copy arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/pwm-clock.h (100%) create mode 100644 arch/arm/mach-s3c64xx/include/mach/regs-clock.h rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/regs-fb.h (100%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-gpio-memport.h (100%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-gpio.h (100%) copy arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/regs-irq.h (100%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-modem.h (100%) create mode 100644 arch/arm/mach-s3c64xx/include/mach/regs-srom.h rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-sys.h (100%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-syscon-power.h (100%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/s3c6400.h (87%) rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/s3c6410.h (93%) create mode 100644 arch/arm/mach-s3c64xx/include/mach/spi-clocks.h rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/system.h (100%) rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/tick.h (93%) copy arch/arm/{plat-s3c => mach-s3c64xx}/include/mach/timex.h (89%) copy arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/uncompress.h (100%) copy arch/arm/{plat-s3c => mach-s3c64xx}/include/mach/vmalloc.h (80%) rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/irq-eint.c (99%) rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/irq-pm.c (99%) create mode 100644 arch/arm/mach-s3c64xx/irq.c rename arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-anw6410.c (97%) rename arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-hmt.c (99%) rename arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-ncp.c (97%) rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/mach-smdk6400.c (97%) rename arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-smdk6410.c (62%) rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/pm.c (95%) rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/s3c6400.c (87%) rename arch/arm/{mach-s3c6410/cpu.c => mach-s3c64xx/s3c6410.c} (81%) rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/setup-fb-24bpp.c (100%) rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/setup-i2c0.c (96%) rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/setup-i2c1.c (96%) rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/setup-sdhci-gpio.c (100%) rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/setup-sdhci.c (78%) rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/sleep.S (97%) create mode 100644 arch/arm/mach-s5p6440/Kconfig create mode 100644 arch/arm/mach-s5p6440/Makefile create mode 100644 arch/arm/mach-s5p6440/Makefile.boot create mode 100644 arch/arm/mach-s5p6440/clock.c create mode 100644 arch/arm/mach-s5p6440/cpu.c create mode 100644 arch/arm/mach-s5p6440/gpio.c copy arch/arm/{mach-s3c6400 => mach-s5p6440}/include/mach/debug-macro.S (77%) create mode 100644 arch/arm/mach-s5p6440/include/mach/entry-macro.S create mode 100644 arch/arm/mach-s5p6440/include/mach/gpio.h create mode 100644 arch/arm/mach-s5p6440/include/mach/hardware.h copy arch/arm/{plat-s3c => mach-s5p6440}/include/mach/io.h (72%) create mode 100644 arch/arm/mach-s5p6440/include/mach/irqs.h create mode 100644 arch/arm/mach-s5p6440/include/mach/map.h create mode 100644 arch/arm/mach-s5p6440/include/mach/memory.h copy arch/arm/{mach-s3c6400 => mach-s5p6440}/include/mach/pwm-clock.h (65%) create mode 100644 arch/arm/mach-s5p6440/include/mach/regs-clock.h create mode 100644 arch/arm/mach-s5p6440/include/mach/regs-gpio.h copy arch/arm/{mach-s3c6400 => mach-s5p6440}/include/mach/regs-irq.h (52%) create mode 100644 arch/arm/mach-s5p6440/include/mach/system.h create mode 100644 arch/arm/mach-s5p6440/include/mach/tick.h copy arch/arm/{plat-s3c => mach-s5p6440}/include/mach/timex.h (89%) copy arch/arm/{mach-s3c6400 => mach-s5p6440}/include/mach/uncompress.h (61%) copy arch/arm/{plat-s3c => mach-s5p6440}/include/mach/vmalloc.h (51%) create mode 100644 arch/arm/mach-s5p6440/init.c create mode 100644 arch/arm/mach-s5p6440/mach-smdk6440.c create mode 100644 arch/arm/mach-s5p6442/Kconfig create mode 100644 arch/arm/mach-s5p6442/Makefile create mode 100644 arch/arm/mach-s5p6442/Makefile.boot create mode 100644 arch/arm/mach-s5p6442/clock.c create mode 100644 arch/arm/mach-s5p6442/cpu.c copy arch/arm/{mach-s3c6400 => mach-s5p6442}/include/mach/debug-macro.S (55%) create mode 100644 arch/arm/mach-s5p6442/include/mach/entry-macro.S create mode 100644 arch/arm/mach-s5p6442/include/mach/gpio.h create mode 100644 arch/arm/mach-s5p6442/include/mach/hardware.h copy arch/arm/{plat-s3c => mach-s5p6442}/include/mach/io.h (54%) create mode 100644 arch/arm/mach-s5p6442/include/mach/irqs.h create mode 100644 arch/arm/mach-s5p6442/include/mach/map.h create mode 100644 arch/arm/mach-s5p6442/include/mach/memory.h copy arch/arm/{mach-s3c6400 => mach-s5p6442}/include/mach/pwm-clock.h (60%) create mode 100644 arch/arm/mach-s5p6442/include/mach/regs-clock.h copy arch/arm/{mach-s3c6400 => mach-s5p6442}/include/mach/regs-irq.h (52%) create mode 100644 arch/arm/mach-s5p6442/include/mach/system.h create mode 100644 arch/arm/mach-s5p6442/include/mach/tick.h copy arch/arm/{plat-s3c => mach-s5p6442}/include/mach/timex.h (83%) copy arch/arm/{mach-s3c6400 => mach-s5p6442}/include/mach/uncompress.h (61%) copy arch/arm/{plat-s3c => mach-s5p6442}/include/mach/vmalloc.h (51%) create mode 100644 arch/arm/mach-s5p6442/init.c create mode 100644 arch/arm/mach-s5p6442/mach-smdk6442.c delete mode 100644 arch/arm/mach-s5pc100/include/mach/gpio-core.h rename arch/arm/{plat-s3c => mach-s5pc100}/include/mach/io.h (72%) copy arch/arm/{plat-s3c => mach-s5pc100}/include/mach/timex.h (89%) rename arch/arm/{plat-s3c => mach-s5pc100}/include/mach/vmalloc.h (57%) create mode 100644 arch/arm/mach-s5pv210/Kconfig create mode 100644 arch/arm/mach-s5pv210/Makefile create mode 100644 arch/arm/mach-s5pv210/Makefile.boot create mode 100644 arch/arm/mach-s5pv210/clock.c create mode 100644 arch/arm/mach-s5pv210/cpu.c rename arch/arm/{mach-s3c6400 => mach-s5pv210}/include/mach/debug-macro.S (75%) create mode 100644 arch/arm/mach-s5pv210/include/mach/entry-macro.S create mode 100644 arch/arm/mach-s5pv210/include/mach/gpio.h create mode 100644 arch/arm/mach-s5pv210/include/mach/hardware.h create mode 100644 arch/arm/mach-s5pv210/include/mach/io.h create mode 100644 arch/arm/mach-s5pv210/include/mach/irqs.h create mode 100644 arch/arm/mach-s5pv210/include/mach/map.h create mode 100644 arch/arm/mach-s5pv210/include/mach/memory.h rename arch/arm/{mach-s3c6400 => mach-s5pv210}/include/mach/pwm-clock.h (59%) create mode 100644 arch/arm/mach-s5pv210/include/mach/regs-clock.h rename arch/arm/{mach-s3c6400 => mach-s5pv210}/include/mach/regs-irq.h (52%) create mode 100644 arch/arm/mach-s5pv210/include/mach/system.h create mode 100644 arch/arm/mach-s5pv210/include/mach/tick.h rename arch/arm/{plat-s3c => mach-s5pv210}/include/mach/timex.h (66%) rename arch/arm/{mach-s3c6400 => mach-s5pv210}/include/mach/uncompress.h (61%) create mode 100644 arch/arm/mach-s5pv210/include/mach/vmalloc.h create mode 100644 arch/arm/mach-s5pv210/init.c create mode 100644 arch/arm/mach-s5pv210/mach-smdkc110.c create mode 100644 arch/arm/mach-s5pv210/mach-smdkv210.c create mode 100644 arch/arm/mach-shmobile/Kconfig create mode 100644 arch/arm/mach-shmobile/Makefile create mode 100644 arch/arm/mach-shmobile/Makefile.boot create mode 100644 arch/arm/mach-shmobile/board-ap4evb.c create mode 100644 arch/arm/mach-shmobile/board-g3evm.c create mode 100644 arch/arm/mach-shmobile/board-g4evm.c create mode 100644 arch/arm/mach-shmobile/clock-sh7367.c create mode 100644 arch/arm/mach-shmobile/console.c create mode 100644 arch/arm/mach-shmobile/include/mach/clkdev.h create mode 100644 arch/arm/mach-shmobile/include/mach/common.h create mode 100644 arch/arm/mach-shmobile/include/mach/dma.h create mode 100644 arch/arm/mach-shmobile/include/mach/entry-macro.S create mode 100644 arch/arm/mach-shmobile/include/mach/gpio.h create mode 100644 arch/arm/mach-shmobile/include/mach/hardware.h create mode 100644 arch/arm/mach-shmobile/include/mach/io.h create mode 100644 arch/arm/mach-shmobile/include/mach/irqs.h create mode 100644 arch/arm/mach-shmobile/include/mach/memory.h create mode 100644 arch/arm/mach-shmobile/include/mach/sh7367.h create mode 100644 arch/arm/mach-shmobile/include/mach/sh7372.h create mode 100644 arch/arm/mach-shmobile/include/mach/sh7377.h create mode 100644 arch/arm/mach-shmobile/include/mach/system.h create mode 100644 arch/arm/mach-shmobile/include/mach/timex.h create mode 100644 arch/arm/mach-shmobile/include/mach/uncompress.h create mode 100644 arch/arm/mach-shmobile/include/mach/vmalloc.h create mode 100644 arch/arm/mach-shmobile/intc-sh7367.c create mode 100644 arch/arm/mach-shmobile/intc-sh7372.c create mode 100644 arch/arm/mach-shmobile/intc-sh7377.c create mode 100644 arch/arm/mach-shmobile/pfc-sh7367.c create mode 100644 arch/arm/mach-shmobile/pfc-sh7372.c create mode 100644 arch/arm/mach-shmobile/pfc-sh7377.c create mode 100644 arch/arm/mach-shmobile/setup-sh7367.c create mode 100644 arch/arm/mach-shmobile/setup-sh7372.c create mode 100644 arch/arm/mach-shmobile/setup-sh7377.c create mode 100644 arch/arm/mach-shmobile/timer.c create mode 100644 arch/arm/mach-w90x900/include/mach/fb.h create mode 100644 arch/arm/mach-w90x900/include/mach/regs-ldm.h create mode 100644 arch/arm/plat-mxc/include/mach/iomux-mx51.h create mode 100644 arch/arm/plat-mxc/include/mach/iomux-v1.h delete mode 100644 arch/arm/plat-mxc/include/mach/mtd-xip.h create mode 100644 arch/arm/plat-mxc/include/mach/mx51.h create mode 100644 arch/arm/plat-mxc/include/mach/ssi.h delete mode 100644 arch/arm/plat-mxc/iomux-mx1-mx2.c create mode 100644 arch/arm/plat-mxc/iomux-v1.c create mode 100644 arch/arm/plat-mxc/tzic.c delete mode 100644 arch/arm/plat-s3c/Kconfig delete mode 100644 arch/arm/plat-s3c/Makefile delete mode 100644 arch/arm/plat-s3c/dev-usb.c rename arch/arm/{plat-s3c => plat-s3c24xx}/include/plat/audio-simtec.h (95%) delete mode 100644 arch/arm/plat-s3c24xx/include/plat/s3c2440.h rename arch/arm/plat-s3c24xx/{ => include/plat}/s3c244x.h (72%) delete mode 100644 arch/arm/plat-s3c64xx/Kconfig delete mode 100644 arch/arm/plat-s3c64xx/clock.c delete mode 100644 arch/arm/plat-s3c64xx/dev-audio.c delete mode 100644 arch/arm/plat-s3c64xx/gpiolib.c delete mode 100644 arch/arm/plat-s3c64xx/include/plat/regs-clock.h delete mode 100644 arch/arm/plat-s3c64xx/irq.c delete mode 100644 arch/arm/plat-s3c64xx/s3c6400-clock.c delete mode 100644 arch/arm/plat-s3c64xx/s3c6400-init.c create mode 100644 arch/arm/plat-s5p/Kconfig create mode 100644 arch/arm/plat-s5p/Makefile create mode 100644 arch/arm/plat-s5p/clock.c create mode 100644 arch/arm/plat-s5p/cpu.c create mode 100644 arch/arm/plat-s5p/dev-uart.c create mode 100644 arch/arm/plat-s5p/include/plat/irqs.h create mode 100644 arch/arm/plat-s5p/include/plat/map-s5p.h create mode 100644 arch/arm/plat-s5p/include/plat/pll.h create mode 100644 arch/arm/plat-s5p/include/plat/s5p-clock.h create mode 100644 arch/arm/plat-s5p/include/plat/s5p6440.h create mode 100644 arch/arm/plat-s5p/include/plat/s5p6442.h create mode 100644 arch/arm/plat-s5p/include/plat/s5pv210.h create mode 100644 arch/arm/plat-s5p/irq.c create mode 100644 arch/arm/plat-s5p/setup-i2c0.c rename arch/arm/{plat-s3c24xx => plat-samsung}/adc.c (89%) create mode 100644 arch/arm/plat-samsung/clock-clksrc.c rename arch/arm/{plat-s3c => plat-samsung}/clock.c (78%) rename arch/arm/{plat-s3c => plat-samsung}/dev-fb.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc1.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc2.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/dev-i2c0.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/dev-i2c1.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/dev-nand.c (100%) create mode 100644 arch/arm/plat-samsung/dev-uart.c rename arch/arm/{plat-s3c => plat-samsung}/dev-usb-hsotg.c (85%) create mode 100644 arch/arm/plat-samsung/dev-usb.c rename arch/arm/{plat-s3c => plat-samsung}/dma.c (96%) rename arch/arm/{plat-s3c => plat-samsung}/gpio-config.c (99%) rename arch/arm/{plat-s3c => plat-samsung}/gpio.c (99%) create mode 100644 arch/arm/plat-samsung/gpiolib.c rename arch/arm/{plat-s3c => plat-samsung}/include/plat/adc.h (92%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/audio.h (64%) create mode 100644 arch/arm/plat-samsung/include/plat/clock-clksrc.h rename arch/arm/{plat-s3c => plat-samsung}/include/plat/clock.h (72%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/cpu-freq.h (98%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/cpu.h (91%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/debug-macro.S (81%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/devs.h (87%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/dma-core.h (100%) rename arch/arm/{plat-s3c24xx/include/plat/dma-plat.h => plat-samsung/include/plat/dma-s3c24xx.h} (95%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/dma.h (98%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/fb.h (98%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/gpio-cfg-helpers.h (98%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/gpio-cfg.h (100%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/gpio-core.h (76%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/hwmon.h (100%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/iic-core.h (100%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/iic.h (100%) create mode 100644 arch/arm/plat-samsung/include/plat/irq-uart.h rename arch/arm/{plat-s3c24xx/include/plat/s3c2442.h => plat-samsung/include/plat/irq-vic-timer.h} (50%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/map-base.h (100%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/nand.h (97%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/pm.h (97%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-ac97.h (100%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-adc.h (90%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-fb-v4.h (99%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-fb.h (99%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-iic.h (100%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-irqtype.h (100%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-nand.h (100%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-rtc.h (100%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-s3c2412-iis.h (100%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-sdhci.h (100%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-serial.h (88%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-timer.h (100%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-usb-hsotg-phy.h (96%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-usb-hsotg.h (100%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-watchdog.h (100%) create mode 100644 arch/arm/plat-samsung/include/plat/s3c64xx-spi.h rename arch/arm/{plat-s3c => plat-samsung}/include/plat/sdhci.h (87%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/udc-hs.h (93%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/uncompress.h (98%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/usb-control.h (89%) rename arch/arm/{plat-s3c => plat-samsung}/include/plat/watchdog-reset.h (100%) rename arch/arm/{plat-s3c => plat-samsung}/init.c (100%) create mode 100644 arch/arm/plat-samsung/irq-uart.c create mode 100644 arch/arm/plat-samsung/irq-vic-timer.c rename arch/arm/{plat-s3c => plat-samsung}/pm-check.c (95%) rename arch/arm/{plat-s3c => plat-samsung}/pm-gpio.c (99%) rename arch/arm/{plat-s3c => plat-samsung}/pm.c (98%) rename arch/arm/{plat-s3c => plat-samsung}/pwm-clock.c (82%) rename arch/arm/{plat-s3c => plat-samsung}/pwm.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/time.c (99%) create mode 100644 arch/powerpc/include/asm/perf_event_fsl_emb.h create mode 100644 arch/powerpc/include/asm/perf_event_server.h create mode 100644 arch/powerpc/kernel/e500-pmu.c create mode 100644 arch/powerpc/kernel/perf_event_fsl_emb.c delete mode 100644 drivers/char/ChangeLog delete mode 100644 drivers/i2c/chips/Kconfig delete mode 100644 drivers/i2c/chips/Makefile create mode 100644 drivers/input/misc/twl4030-vibra.c rename drivers/{i2c/chips => misc}/tsl2550.c (99%) mode change 100755 => 100644 drivers/mtd/chips/cfi_util.c mode change 100755 => 100644 drivers/mtd/inftlcore.c delete mode 100644 drivers/parport/ChangeLog create mode 100644 drivers/pps/clients/Kconfig create mode 100644 drivers/pps/clients/Makefile create mode 100644 drivers/pps/clients/pps-ktimer.c create mode 100644 drivers/pps/clients/pps-ldisc.c create mode 100644 drivers/serial/s5pv210.c create mode 100644 drivers/video/nuc900fb.c create mode 100644 drivers/video/nuc900fb.h create mode 100644 drivers/video/sunxvr1000.c delete mode 100644 drivers/video/via/iface.c delete mode 100644 drivers/video/via/iface.h delete mode 100644 firmware/bnx2x-e1-5.2.7.0.fw.ihex delete mode 100644 firmware/bnx2x-e1h-5.2.7.0.fw.ihex delete mode 100644 fs/ntfs/ChangeLog create mode 100644 include/linux/i2c-xiic.h create mode 100644 include/linux/pci-dma.h create mode 100644 ipc/syscall.c create mode 100644 tools/perf/Documentation/perf-lock.txt Merging fixes/fixes $ git merge fixes/fixes Updating bca14dd..f4ac656f Fast-forward drivers/block/pktcdvd.c | 17 ++++++++++++++--- fs/compat_ioctl.c | 3 --- 2 files changed, 14 insertions(+), 6 deletions(-) Merging arm-current/master $ git merge arm-current/master Auto-merging arch/arm/kernel/perf_event.c Merge made by recursive. arch/arm/boot/compressed/misc.c | 1 + arch/arm/include/asm/elf.h | 1 + arch/arm/include/asm/pgtable-nommu.h | 1 + arch/arm/kernel/perf_event.c | 5 ++- arch/arm/kernel/smp.c | 4 ++- arch/arm/mach-at91/board-sam9g20ek.c | 10 ++++--- arch/arm/plat-samsung/include/plat/uncompress.h | 2 - drivers/video/amba-clcd.c | 31 ++++++++++++++++----- include/linux/amba/clcd.h | 33 ++++++++++++----------- 9 files changed, 56 insertions(+), 32 deletions(-) Merging m68k-current/for-linus $ git merge m68k-current/for-linus Merge made by recursive. arch/m68k/include/asm/sigcontext.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master Already up-to-date. Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Already up-to-date. Merging net-current/master $ git merge net-current/master Already up-to-date. $ git am -3 ../patches/0001-ar9170-fix-for-driver-core-ABI-change.patch Applying: ar9170: fix for driver-core ABI change $ git reset HEAD^ Unstaged changes after reset: M drivers/net/wireless/ath/ar9170/usb.c $ git add . $ git commit -v -a --amend [master e71f6fd] Merge remote branch 'm68k-current/for-linus' Merging sound-current/for-linus $ git merge sound-current/for-linus Already up-to-date. Merging pci-current/for-linus $ git merge pci-current/for-linus Already up-to-date. Merging wireless-current/master $ git merge wireless-current/master Already up-to-date. Merging kbuild-current/for-linus $ git merge kbuild-current/for-linus Already up-to-date. Merging quilt/driver-core.current $ git merge quilt/driver-core.current Already up-to-date. Merging quilt/tty.current $ git merge quilt/tty.current Already up-to-date. Merging quilt/usb.current $ git merge quilt/usb.current Already up-to-date. Merging quilt/staging.current $ git merge quilt/staging.current Already up-to-date. Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Already up-to-date. Merging input-current/for-linus $ git merge input-current/for-linus Already up-to-date. Merging md-current/for-linus $ git merge md-current/for-linus Merge made by recursive. drivers/md/bitmap.c | 37 ++++++++++++++++++++++++++++++++----- drivers/md/bitmap.h | 1 + drivers/md/faulty.c | 6 +++--- drivers/md/md.h | 3 --- drivers/md/multipath.c | 2 +- drivers/md/raid1.c | 8 ++++---- drivers/md/raid10.c | 8 ++++---- drivers/md/raid5.c | 10 +++++----- 8 files changed, 50 insertions(+), 25 deletions(-) Merging audit-current/for-linus $ git merge audit-current/for-linus Already up-to-date. Merging crypto-current/master $ git merge crypto-current/master Already up-to-date. Merging ide-curent/master $ git merge ide-curent/master Already up-to-date. Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging arm/devel $ git merge arm/devel Auto-merging arch/arm/Kconfig Removing arch/arm/common/icst307.c Removing arch/arm/common/icst525.c Removing arch/arm/include/asm/hardware/icst307.h Removing arch/arm/include/asm/hardware/icst525.h Removing arch/arm/mach-integrator/common.h Removing arch/arm/mach-realview/clock.c Removing arch/arm/mach-realview/clock.h Removing arch/arm/mach-versatile/clock.c Removing arch/arm/mach-versatile/clock.h Merge made by recursive. arch/arm/Kconfig | 40 +++- arch/arm/Makefile | 2 + arch/arm/common/Kconfig | 5 +- arch/arm/common/Makefile | 3 +- arch/arm/common/icst.c | 100 ++++++ arch/arm/common/icst307.c | 161 ---------- arch/arm/common/icst525.c | 160 ---------- arch/arm/include/asm/hardware/arm_timer.h | 39 ++- arch/arm/include/asm/hardware/icst.h | 59 ++++ arch/arm/include/asm/hardware/icst307.h | 38 --- arch/arm/include/asm/hardware/icst525.h | 36 --- arch/arm/mach-integrator/Kconfig | 1 + arch/arm/mach-integrator/Makefile | 2 +- arch/arm/mach-integrator/common.h | 2 - arch/arm/mach-integrator/core.c | 127 +-------- arch/arm/mach-integrator/cpu.c | 53 ++-- arch/arm/mach-integrator/impd1.c | 43 ++-- arch/arm/mach-integrator/include/mach/clkdev.h | 7 +- .../arm/mach-integrator/include/mach/entry-macro.S | 1 + arch/arm/mach-integrator/include/mach/hardware.h | 17 +- arch/arm/mach-integrator/include/mach/platform.h | 54 +--- arch/arm/mach-integrator/integrator_ap.c | 166 ++++++++++- arch/arm/mach-integrator/integrator_cp.c | 88 ++++--- arch/arm/mach-integrator/leds.c | 1 + arch/arm/mach-integrator/pci_v3.c | 7 +- arch/arm/mach-realview/Makefile | 2 +- arch/arm/mach-realview/clock.c | 64 ---- arch/arm/mach-realview/clock.h | 19 -- arch/arm/mach-realview/core.c | 194 ++---------- arch/arm/mach-realview/include/mach/clkdev.h | 9 + arch/arm/mach-realview/include/mach/irqs-pb1176.h | 1 + arch/arm/mach-realview/include/mach/irqs-pba8.h | 8 +- arch/arm/mach-realview/include/mach/irqs-pbx.h | 14 +- arch/arm/mach-realview/include/mach/platform.h | 20 -- arch/arm/mach-realview/realview_eb.c | 2 - arch/arm/mach-realview/realview_pb1176.c | 2 - arch/arm/mach-realview/realview_pb11mp.c | 2 - arch/arm/mach-realview/realview_pba8.c | 2 - arch/arm/mach-versatile/Makefile | 2 +- arch/arm/mach-versatile/clock.c | 65 ---- arch/arm/mach-versatile/clock.h | 20 -- arch/arm/mach-versatile/core.c | 194 ++---------- arch/arm/mach-versatile/include/mach/clkdev.h | 9 + arch/arm/mach-versatile/include/mach/entry-macro.S | 1 + arch/arm/mach-versatile/include/mach/hardware.h | 3 +- arch/arm/mach-versatile/include/mach/platform.h | 26 +-- arch/arm/mach-vexpress/Kconfig | 9 + arch/arm/mach-vexpress/Makefile | 8 + arch/arm/mach-vexpress/Makefile.boot | 3 + arch/arm/mach-vexpress/core.h | 26 ++ arch/arm/mach-vexpress/ct-ca9x4.c | 215 +++++++++++++ arch/arm/mach-vexpress/headsmp.S | 39 +++ arch/arm/mach-vexpress/include/mach/clkdev.h | 15 + arch/arm/mach-vexpress/include/mach/ct-ca9x4.h | 43 +++ arch/arm/mach-vexpress/include/mach/debug-macro.S | 23 ++ arch/arm/mach-vexpress/include/mach/entry-macro.S | 67 ++++ arch/arm/mach-vexpress/include/mach/hardware.h | 1 + arch/arm/mach-vexpress/include/mach/io.h | 28 ++ arch/arm/mach-vexpress/include/mach/irqs.h | 4 + arch/arm/mach-vexpress/include/mach/memory.h | 25 ++ arch/arm/mach-vexpress/include/mach/motherboard.h | 121 ++++++++ arch/arm/mach-vexpress/include/mach/smp.h | 21 ++ arch/arm/mach-vexpress/include/mach/system.h | 37 +++ arch/arm/mach-vexpress/include/mach/timex.h | 23 ++ arch/arm/mach-vexpress/include/mach/uncompress.h | 52 ++++ arch/arm/mach-vexpress/include/mach/vmalloc.h | 21 ++ arch/arm/mach-vexpress/localtimer.c | 26 ++ arch/arm/mach-vexpress/platsmp.c | 190 ++++++++++++ arch/arm/mach-vexpress/v2m.c | 319 ++++++++++++++++++++ arch/arm/mm/Kconfig | 3 +- arch/arm/plat-versatile/Makefile | 4 + .../{mach-integrator => plat-versatile}/clock.c | 43 ++- arch/arm/plat-versatile/include/plat/clock.h | 15 + arch/arm/plat-versatile/include/plat/timer-sp.h | 2 + arch/arm/plat-versatile/sched-clock.c | 53 ++++ arch/arm/plat-versatile/timer-sp.c | 156 ++++++++++ drivers/i2c/busses/Kconfig | 2 +- 77 files changed, 2182 insertions(+), 1283 deletions(-) create mode 100644 arch/arm/common/icst.c delete mode 100644 arch/arm/common/icst307.c delete mode 100644 arch/arm/common/icst525.c create mode 100644 arch/arm/include/asm/hardware/icst.h delete mode 100644 arch/arm/include/asm/hardware/icst307.h delete mode 100644 arch/arm/include/asm/hardware/icst525.h delete mode 100644 arch/arm/mach-integrator/common.h delete mode 100644 arch/arm/mach-realview/clock.c delete mode 100644 arch/arm/mach-realview/clock.h delete mode 100644 arch/arm/mach-versatile/clock.c delete mode 100644 arch/arm/mach-versatile/clock.h create mode 100644 arch/arm/mach-vexpress/Kconfig create mode 100644 arch/arm/mach-vexpress/Makefile create mode 100644 arch/arm/mach-vexpress/Makefile.boot create mode 100644 arch/arm/mach-vexpress/core.h create mode 100644 arch/arm/mach-vexpress/ct-ca9x4.c create mode 100644 arch/arm/mach-vexpress/headsmp.S create mode 100644 arch/arm/mach-vexpress/include/mach/clkdev.h create mode 100644 arch/arm/mach-vexpress/include/mach/ct-ca9x4.h create mode 100644 arch/arm/mach-vexpress/include/mach/debug-macro.S create mode 100644 arch/arm/mach-vexpress/include/mach/entry-macro.S create mode 100644 arch/arm/mach-vexpress/include/mach/hardware.h create mode 100644 arch/arm/mach-vexpress/include/mach/io.h create mode 100644 arch/arm/mach-vexpress/include/mach/irqs.h create mode 100644 arch/arm/mach-vexpress/include/mach/memory.h create mode 100644 arch/arm/mach-vexpress/include/mach/motherboard.h create mode 100644 arch/arm/mach-vexpress/include/mach/smp.h create mode 100644 arch/arm/mach-vexpress/include/mach/system.h create mode 100644 arch/arm/mach-vexpress/include/mach/timex.h create mode 100644 arch/arm/mach-vexpress/include/mach/uncompress.h create mode 100644 arch/arm/mach-vexpress/include/mach/vmalloc.h create mode 100644 arch/arm/mach-vexpress/localtimer.c create mode 100644 arch/arm/mach-vexpress/platsmp.c create mode 100644 arch/arm/mach-vexpress/v2m.c create mode 100644 arch/arm/plat-versatile/Makefile rename arch/arm/{mach-integrator => plat-versatile}/clock.c (59%) create mode 100644 arch/arm/plat-versatile/include/plat/clock.h create mode 100644 arch/arm/plat-versatile/include/plat/timer-sp.h create mode 100644 arch/arm/plat-versatile/sched-clock.c create mode 100644 arch/arm/plat-versatile/timer-sp.c Merging davinci/davinci-next $ git merge davinci/davinci-next Already up-to-date. Merging i.MX/for-next $ git merge i.MX/for-next Already up-to-date. Merging msm/for-next $ git merge msm/for-next Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 1 + arch/arm/mach-msm/Makefile | 3 +- arch/arm/mach-msm/acpuclock-arm11.c | 526 ++++++++++++++++++++ arch/arm/mach-msm/acpuclock.h | 32 ++ arch/arm/mach-msm/board-halibut.c | 15 + arch/arm/mach-msm/board-mahimahi.c | 87 ++++ arch/arm/mach-msm/board-msm7x27.c | 179 +++++++ arch/arm/mach-msm/board-msm7x30.c | 196 ++++++++ arch/arm/mach-msm/board-qsd8x50.c | 176 +++++++ arch/arm/mach-msm/board-sapphire.c | 118 +++++ arch/arm/mach-msm/{board-dream.c => board-trout.c} | 4 +- arch/arm/mach-msm/{board-dream.h => board-trout.h} | 0 arch/arm/mach-msm/dma.c | 23 +- arch/arm/mach-msm/include/mach/board.h | 11 + arch/arm/mach-msm/include/mach/vreg.h | 2 +- arch/arm/mach-msm/irq.c | 4 +- arch/arm/mach-msm/proc_comm.h | 102 ++++- arch/arm/mach-msm/vreg.c | 154 +++++-- 18 files changed, 1580 insertions(+), 53 deletions(-) create mode 100644 arch/arm/mach-msm/acpuclock-arm11.c create mode 100644 arch/arm/mach-msm/acpuclock.h create mode 100644 arch/arm/mach-msm/board-mahimahi.c create mode 100644 arch/arm/mach-msm/board-msm7x27.c create mode 100644 arch/arm/mach-msm/board-msm7x30.c create mode 100644 arch/arm/mach-msm/board-qsd8x50.c create mode 100644 arch/arm/mach-msm/board-sapphire.c rename arch/arm/mach-msm/{board-dream.c => board-trout.c} (97%) rename arch/arm/mach-msm/{board-dream.h => board-trout.h} (100%) Merging omap/for-next $ git merge omap/for-next Auto-merging arch/arm/mach-omap2/board-3630sdp.c Merge made by recursive. arch/arm/configs/cm_t35_defconfig | 2 +- arch/arm/configs/n770_defconfig | 1 + arch/arm/configs/n8x0_defconfig | 160 ++++++++++++++++++++++++--- arch/arm/configs/omap3_beagle_defconfig | 1 + arch/arm/configs/omap3_defconfig | 2 +- arch/arm/configs/omap3_evm_defconfig | 1 + arch/arm/configs/omap3_touchbook_defconfig | 2 +- arch/arm/configs/omap_3430sdp_defconfig | 1 + arch/arm/configs/omap_3630sdp_defconfig | 2 +- arch/arm/configs/omap_h2_1610_defconfig | 1 + arch/arm/configs/omap_zoom2_defconfig | 1 + arch/arm/configs/omap_zoom3_defconfig | 2 +- arch/arm/configs/rx51_defconfig | 1 + arch/arm/mach-omap2/Makefile | 3 + arch/arm/mach-omap2/board-3430sdp.c | 2 +- arch/arm/mach-omap2/board-3630sdp.c | 2 +- arch/arm/mach-omap2/board-4430sdp.c | 26 +----- arch/arm/mach-omap2/board-am3517evm.c | 2 +- arch/arm/mach-omap2/board-cm-t35.c | 2 +- arch/arm/mach-omap2/board-devkit8000.c | 2 +- arch/arm/mach-omap2/board-igep0020.c | 56 +++++++---- arch/arm/mach-omap2/board-n8x0.c | 98 +++++++++++++++++ arch/arm/mach-omap2/board-omap3beagle.c | 2 +- arch/arm/mach-omap2/board-omap3evm.c | 2 +- arch/arm/mach-omap2/board-omap3pandora.c | 12 ++- arch/arm/mach-omap2/board-omap3touchbook.c | 12 +- arch/arm/mach-omap2/board-overo.c | 2 +- arch/arm/mach-omap2/board-zoom3.c | 2 +- arch/arm/mach-omap2/clock2420_data.c | 1 + arch/arm/mach-omap2/io.c | 21 ++-- arch/arm/mach-omap2/mailbox.c | 12 +- arch/arm/mach-omap2/omap44xx-smc.S | 32 ++++++ arch/arm/mach-omap2/prcm.c | 4 +- arch/arm/mach-omap2/serial.c | 15 ++- arch/arm/mach-omap2/usb-ehci.c | 6 +- arch/arm/plat-omap/gpio.c | 10 +- arch/arm/plat-omap/include/plat/blizzard.h | 2 +- arch/arm/plat-omap/include/plat/cpu.h | 8 +- arch/arm/plat-omap/include/plat/prcm.h | 2 +- arch/arm/plat-omap/include/plat/system.h | 6 +- arch/arm/plat-omap/include/plat/usb.h | 2 +- arch/arm/plat-omap/mcbsp.c | 12 +-- 42 files changed, 403 insertions(+), 132 deletions(-) create mode 100644 arch/arm/mach-omap2/omap44xx-smc.S Merging pxa/for-next $ git merge pxa/for-next Already up-to-date. Merging samsung/next-samsung $ git merge samsung/next-samsung Already up-to-date. Merging avr32/avr32-arch $ git merge avr32/avr32-arch Already up-to-date. Merging blackfin/for-linus $ git merge blackfin/for-linus Auto-merging arch/blackfin/include/asm/dma-mapping.h Merge made by recursive. arch/blackfin/Kconfig | 81 +- arch/blackfin/Kconfig.debug | 12 +- arch/blackfin/Makefile | 7 +- arch/blackfin/boot/Makefile | 23 +- arch/blackfin/configs/BF518F-EZBRD_defconfig | 270 +++-- arch/blackfin/configs/BF526-EZBRD_defconfig | 336 +++-- arch/blackfin/configs/BF527-EZKIT-V2_defconfig | 1811 +++++++++++++++++++++++ arch/blackfin/configs/BF527-EZKIT_defconfig | 344 +++-- arch/blackfin/configs/BF533-EZKIT_defconfig | 250 ++-- arch/blackfin/configs/BF533-STAMP_defconfig | 295 +++-- arch/blackfin/configs/BF537-STAMP_defconfig | 332 +++-- arch/blackfin/configs/BF538-EZKIT_defconfig | 291 +++-- arch/blackfin/configs/BF548-EZKIT_defconfig | 108 +- arch/blackfin/configs/BF561-ACVILON_defconfig | 15 +- arch/blackfin/configs/BF561-EZKIT_defconfig | 82 +- arch/blackfin/configs/H8606_defconfig | 7 - arch/blackfin/configs/PNAV-10_defconfig | 295 +++-- arch/blackfin/configs/TCM-BF518_defconfig | 1375 +++++++++++++++++ arch/blackfin/include/asm/bfin-lq035q1.h | 12 + arch/blackfin/include/asm/bfin_can.h | 725 +++++++++ arch/blackfin/include/asm/bfin_sport.h | 227 ++-- arch/blackfin/include/asm/bfin_watchdog.h | 30 + arch/blackfin/include/asm/bitops.h | 74 +- arch/blackfin/include/asm/context.S | 22 + arch/blackfin/include/asm/cpu.h | 2 - arch/blackfin/include/asm/def_LPBlackfin.h | 58 +- arch/blackfin/include/asm/delay.h | 16 +- arch/blackfin/include/asm/dma-mapping.h | 15 +- arch/blackfin/include/asm/dma.h | 4 + arch/blackfin/include/asm/dpmc.h | 4 +- arch/blackfin/include/asm/elf.h | 8 +- arch/blackfin/include/asm/ftrace.h | 53 + arch/blackfin/include/asm/gpio.h | 17 +- arch/blackfin/include/asm/irq.h | 7 + arch/blackfin/include/asm/mmu_context.h | 14 +- arch/blackfin/include/asm/nmi.h | 12 + arch/blackfin/include/asm/page.h | 3 + arch/blackfin/include/asm/ptrace.h | 25 + arch/blackfin/include/asm/sections.h | 3 + arch/blackfin/include/asm/smp.h | 15 + arch/blackfin/include/asm/syscall.h | 96 ++ arch/blackfin/include/asm/thread_info.h | 25 +- arch/blackfin/include/asm/time.h | 13 +- arch/blackfin/kernel/Makefile | 1 + arch/blackfin/kernel/bfin_dma_5xx.c | 10 +- arch/blackfin/kernel/bfin_gpio.c | 20 +- arch/blackfin/kernel/cplb-mpu/cplbinit.c | 9 + arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 54 +- arch/blackfin/kernel/cplb-nompu/cplbinit.c | 9 + arch/blackfin/kernel/dma-mapping.c | 2 +- arch/blackfin/kernel/entry.S | 8 +- arch/blackfin/kernel/ftrace-entry.S | 23 +- arch/blackfin/kernel/ftrace.c | 6 +- arch/blackfin/kernel/init_task.c | 2 +- arch/blackfin/kernel/kgdb.c | 10 +- arch/blackfin/kernel/nmi.c | 299 ++++ arch/blackfin/kernel/process.c | 7 - arch/blackfin/kernel/ptrace.c | 360 ++--- arch/blackfin/kernel/setup.c | 34 +- arch/blackfin/kernel/signal.c | 24 +- arch/blackfin/kernel/time-ts.c | 205 ++-- arch/blackfin/kernel/traps.c | 32 +- arch/blackfin/kernel/vmlinux.lds.S | 70 +- arch/blackfin/mach-bf518/boards/Kconfig | 5 + arch/blackfin/mach-bf518/boards/Makefile | 1 + arch/blackfin/mach-bf518/boards/ezbrd.c | 178 +++- arch/blackfin/mach-bf518/boards/tcm-bf518.c | 753 ++++++++++ arch/blackfin/mach-bf518/include/mach/irq.h | 12 +- arch/blackfin/mach-bf518/include/mach/mem_map.h | 2 +- arch/blackfin/mach-bf527/boards/Kconfig | 5 + arch/blackfin/mach-bf527/boards/Makefile | 1 + arch/blackfin/mach-bf527/boards/cm_bf527.c | 245 +++- arch/blackfin/mach-bf527/boards/ezbrd.c | 199 +++- arch/blackfin/mach-bf527/boards/ezkit.c | 431 +++++-- arch/blackfin/mach-bf527/include/mach/irq.h | 12 +- arch/blackfin/mach-bf533/boards/H8606.c | 66 +- arch/blackfin/mach-bf533/boards/blackstamp.c | 134 ++- arch/blackfin/mach-bf533/boards/cm_bf533.c | 138 ++- arch/blackfin/mach-bf533/boards/ezkit.c | 102 ++- arch/blackfin/mach-bf533/boards/ip0x.c | 63 +- arch/blackfin/mach-bf533/boards/stamp.c | 174 ++- arch/blackfin/mach-bf533/include/mach/irq.h | 3 +- arch/blackfin/mach-bf537/boards/cm_bf537e.c | 116 ++- arch/blackfin/mach-bf537/boards/cm_bf537u.c | 187 +++- arch/blackfin/mach-bf537/boards/minotaur.c | 183 +++- arch/blackfin/mach-bf537/boards/pnav10.c | 169 ++- arch/blackfin/mach-bf537/boards/stamp.c | 684 ++++++++- arch/blackfin/mach-bf537/boards/tcm_bf537.c | 187 +++- arch/blackfin/mach-bf537/include/mach/irq.h | 12 +- arch/blackfin/mach-bf538/boards/ezkit.c | 346 ++++- arch/blackfin/mach-bf538/include/mach/irq.h | 3 +- arch/blackfin/mach-bf548/boards/cm_bf548.c | 399 +++++- arch/blackfin/mach-bf548/boards/ezkit.c | 443 ++++++- arch/blackfin/mach-bf548/include/mach/irq.h | 3 +- arch/blackfin/mach-bf561/Makefile | 1 + arch/blackfin/mach-bf561/boards/acvilon.c | 2 +- arch/blackfin/mach-bf561/boards/cm_bf561.c | 66 +- arch/blackfin/mach-bf561/boards/ezkit.c | 70 +- arch/blackfin/mach-bf561/boards/tepla.c | 68 + arch/blackfin/mach-bf561/hotplug.c | 32 + arch/blackfin/mach-bf561/include/mach/irq.h | 3 +- arch/blackfin/mach-bf561/include/mach/smp.h | 2 + arch/blackfin/mach-bf561/secondary.S | 50 +- arch/blackfin/mach-bf561/smp.c | 44 +- arch/blackfin/mach-common/cpufreq.c | 168 ++- arch/blackfin/mach-common/entry.S | 81 +- arch/blackfin/mach-common/head.S | 16 +- arch/blackfin/mach-common/interrupt.S | 35 +- arch/blackfin/mach-common/ints-priority.c | 208 +++- arch/blackfin/mach-common/smp.c | 87 +- arch/blackfin/mm/isram-driver.c | 6 +- arch/blackfin/mm/sram-alloc.c | 27 +- 112 files changed, 12548 insertions(+), 2273 deletions(-) create mode 100644 arch/blackfin/configs/BF527-EZKIT-V2_defconfig create mode 100644 arch/blackfin/configs/TCM-BF518_defconfig create mode 100644 arch/blackfin/include/asm/bfin_can.h create mode 100644 arch/blackfin/include/asm/bfin_watchdog.h create mode 100644 arch/blackfin/include/asm/nmi.h create mode 100644 arch/blackfin/include/asm/syscall.h create mode 100644 arch/blackfin/kernel/nmi.c create mode 100644 arch/blackfin/mach-bf518/boards/tcm-bf518.c create mode 100644 arch/blackfin/mach-bf561/hotplug.c Merging cris/for-next $ git merge cris/for-next Already up-to-date. Merging ia64/test $ git merge ia64/test Already uptodate! Merge made by recursive. Merging m68k/for-next $ git merge m68k/for-next Already up-to-date. Merging m68knommu/for-next $ git merge m68knommu/for-next Auto-merging arch/m68knommu/kernel/ptrace.c Auto-merging arch/m68knommu/kernel/sys_m68k.c Auto-merging arch/m68knommu/kernel/syscalltable.S Auto-merging fs/binfmt_flat.c Merge made by recursive. arch/m68k/include/asm/m520xsim.h | 4 + arch/m68k/include/asm/m523xsim.h | 8 + arch/m68k/include/asm/m5249sim.h | 6 +- arch/m68k/include/asm/m527xsim.h | 10 ++ arch/m68k/include/asm/m528xsim.h | 67 +--------- arch/m68k/include/asm/m532xsim.h | 1 + arch/m68k/include/asm/mcfqspi.h | 64 +++++++++ arch/m68knommu/Kconfig | 4 + arch/m68knommu/Makefile | 2 +- arch/m68knommu/kernel/entry.S | 2 +- arch/m68knommu/platform/520x/config.c | 149 +++++++++++++++++++++ arch/m68knommu/platform/523x/config.c | 170 ++++++++++++++++++++++++ arch/m68knommu/platform/5249/config.c | 167 +++++++++++++++++++++++ arch/m68knommu/platform/5272/intc.c | 39 +++++- arch/m68knommu/platform/527x/config.c | 182 ++++++++++++++++++++++++++ arch/m68knommu/platform/528x/config.c | 137 +++++++++++++++++++ arch/m68knommu/platform/532x/config.c | 124 +++++++++++++++++ arch/m68knommu/platform/68328/ints.c | 8 +- arch/m68knommu/platform/68360/ints.c | 8 +- arch/m68knommu/platform/coldfire/intc-2.c | 76 ++++++++++- arch/m68knommu/platform/coldfire/intc-simr.c | 68 +++++++++- arch/m68knommu/platform/coldfire/intc.c | 59 ++++++++- fs/binfmt_flat.c | 2 +- 23 files changed, 1252 insertions(+), 105 deletions(-) create mode 100644 arch/m68k/include/asm/mcfqspi.h Merging microblaze/next $ git merge microblaze/next Merge made by recursive. arch/microblaze/Kconfig | 64 +- arch/microblaze/Makefile | 3 +- arch/microblaze/include/asm/device.h | 4 + arch/microblaze/include/asm/dma-mapping.h | 154 +++- arch/microblaze/include/asm/io.h | 31 +- arch/microblaze/include/asm/irq.h | 37 +- arch/microblaze/include/asm/page.h | 12 +- arch/microblaze/include/asm/pci-bridge.h | 195 ++++ arch/microblaze/include/asm/pci.h | 178 ++++- arch/microblaze/include/asm/pgalloc.h | 2 +- arch/microblaze/include/asm/pgtable.h | 40 +- arch/microblaze/include/asm/prom.h | 15 + arch/microblaze/include/asm/system.h | 3 + arch/microblaze/include/asm/tlbflush.h | 2 +- arch/microblaze/kernel/Makefile | 2 +- arch/microblaze/kernel/asm-offsets.c | 1 + arch/microblaze/kernel/cpu/cache.c | 211 +++- arch/microblaze/kernel/dma.c | 156 +++ arch/microblaze/kernel/entry.S | 116 +- arch/microblaze/kernel/head.S | 13 +- arch/microblaze/kernel/irq.c | 15 + arch/microblaze/kernel/setup.c | 45 +- arch/microblaze/kernel/traps.c | 10 +- arch/microblaze/mm/Makefile | 2 +- arch/microblaze/mm/consistent.c | 246 +++++ arch/microblaze/mm/init.c | 39 +- arch/microblaze/mm/pgtable.c | 2 +- arch/microblaze/pci/Makefile | 6 + arch/microblaze/pci/indirect_pci.c | 163 +++ arch/microblaze/pci/iomap.c | 39 + arch/microblaze/pci/pci-common.c | 1642 +++++++++++++++++++++++++++++ arch/microblaze/pci/pci_32.c | 430 ++++++++ arch/microblaze/pci/xilinx_pci.c | 168 +++ arch/powerpc/sysdev/xilinx_pci.c | 4 +- drivers/pci/Makefile | 1 + 35 files changed, 3848 insertions(+), 203 deletions(-) create mode 100644 arch/microblaze/kernel/dma.c create mode 100644 arch/microblaze/mm/consistent.c create mode 100644 arch/microblaze/pci/Makefile create mode 100644 arch/microblaze/pci/indirect_pci.c create mode 100644 arch/microblaze/pci/iomap.c create mode 100644 arch/microblaze/pci/pci-common.c create mode 100644 arch/microblaze/pci/pci_32.c create mode 100644 arch/microblaze/pci/xilinx_pci.c Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Resolved 'arch/mips/alchemy/common/platform.c' using previous resolution. Resolved 'arch/mips/alchemy/common/setup.c' using previous resolution. Resolved 'arch/mips/alchemy/devboards/db1200/platform.c' using previous resolution. Resolved 'arch/mips/alchemy/devboards/db1x00/board_setup.c' using previous resolution. Resolved 'arch/mips/alchemy/devboards/pb1100/platform.c' using previous resolution. Resolved 'arch/mips/alchemy/devboards/pb1200/platform.c' using previous resolution. Resolved 'arch/mips/alchemy/devboards/platform.c' using previous resolution. Resolved 'arch/mips/alchemy/devboards/platform.h' using previous resolution. Resolved 'arch/mips/alchemy/xxs1500/platform.c' using previous resolution. Resolved 'arch/mips/cavium-octeon/octeon-irq.c' using previous resolution. Resolved 'arch/mips/configs/db1200_defconfig' using previous resolution. Resolved 'arch/mips/include/asm/mach-au1x00/au1000.h' using previous resolution. Resolved 'drivers/i2c/busses/Kconfig' using previous resolution. Resolved 'drivers/i2c/busses/Makefile' using previous resolution. Resolved 'drivers/pcmcia/au1000_generic.h' using previous resolution. Resolved 'drivers/pcmcia/db1xxx_ss.c' using previous resolution. Resolved 'drivers/pcmcia/xxs1500_ss.c' using previous resolution. Renaming arch/mips/mm/uasm.h->arch/mips/include/asm/uasm.h Auto-merging arch/mips/include/asm/uasm.h Auto-merging arch/mips/Kconfig Auto-merging arch/mips/Makefile Auto-merging arch/mips/alchemy/common/platform.c CONFLICT (content): Merge conflict in arch/mips/alchemy/common/platform.c Auto-merging arch/mips/alchemy/common/setup.c CONFLICT (content): Merge conflict in arch/mips/alchemy/common/setup.c Auto-merging arch/mips/alchemy/devboards/db1200/platform.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/db1200/platform.c Auto-merging arch/mips/alchemy/devboards/db1x00/board_setup.c CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/db1x00/board_setup.c Auto-merging arch/mips/alchemy/devboards/db1x00/platform.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/db1x00/platform.c Auto-merging arch/mips/alchemy/devboards/pb1100/platform.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/pb1100/platform.c Auto-merging arch/mips/alchemy/devboards/pb1200/platform.c CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/pb1200/platform.c Auto-merging arch/mips/alchemy/devboards/pb1500/platform.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/pb1500/platform.c Auto-merging arch/mips/alchemy/devboards/pb1550/platform.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/pb1550/platform.c Auto-merging arch/mips/alchemy/devboards/platform.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/platform.c Auto-merging arch/mips/alchemy/devboards/platform.h CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/platform.h Auto-merging arch/mips/alchemy/xxs1500/platform.c CONFLICT (add/add): Merge conflict in arch/mips/alchemy/xxs1500/platform.c Auto-merging arch/mips/cavium-octeon/octeon-irq.c CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/octeon-irq.c Auto-merging arch/mips/configs/db1200_defconfig CONFLICT (content): Merge conflict in arch/mips/configs/db1200_defconfig Auto-merging arch/mips/include/asm/mach-au1x00/au1000.h CONFLICT (content): Merge conflict in arch/mips/include/asm/mach-au1x00/au1000.h Auto-merging arch/mips/include/asm/pgtable.h Auto-merging arch/mips/kernel/linux32.c Auto-merging arch/mips/mm/init.c Auto-merging drivers/i2c/busses/Kconfig CONFLICT (content): Merge conflict in drivers/i2c/busses/Kconfig Auto-merging drivers/i2c/busses/Makefile CONFLICT (content): Merge conflict in drivers/i2c/busses/Makefile Auto-merging drivers/ide/au1xxx-ide.c Auto-merging drivers/mtd/maps/Kconfig Auto-merging drivers/mtd/maps/Makefile Auto-merging drivers/net/au1000_eth.c Auto-merging drivers/net/cpmac.c Auto-merging drivers/pcmcia/Kconfig Auto-merging drivers/pcmcia/Makefile Auto-merging drivers/pcmcia/au1000_generic.h CONFLICT (content): Merge conflict in drivers/pcmcia/au1000_generic.h Auto-merging drivers/pcmcia/db1xxx_ss.c CONFLICT (add/add): Merge conflict in drivers/pcmcia/db1xxx_ss.c Auto-merging drivers/pcmcia/xxs1500_ss.c CONFLICT (add/add): Merge conflict in drivers/pcmcia/xxs1500_ss.c Auto-merging drivers/serial/8250.c Auto-merging drivers/staging/octeon/ethernet.c CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of drivers/staging/sm7xx/smtc2d.c left in tree. CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.h deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of drivers/staging/sm7xx/smtc2d.h left in tree. Auto-merging drivers/staging/sm7xx/smtcfb.c Auto-merging drivers/watchdog/ar7_wdt.c Automatic merge failed; fix conflicts and then commit the result. $ git rm -f drivers/staging/sm7xx/smtc2d.c drivers/staging/sm7xx/smtc2d.h arch/mips/alchemy/common/platform.c: needs merge arch/mips/alchemy/common/setup.c: needs merge arch/mips/alchemy/devboards/db1200/platform.c: needs merge arch/mips/alchemy/devboards/db1x00/board_setup.c: needs merge arch/mips/alchemy/devboards/db1x00/platform.c: needs merge arch/mips/alchemy/devboards/pb1100/platform.c: needs merge arch/mips/alchemy/devboards/pb1200/platform.c: needs merge arch/mips/alchemy/devboards/pb1500/platform.c: needs merge arch/mips/alchemy/devboards/pb1550/platform.c: needs merge arch/mips/alchemy/devboards/platform.c: needs merge arch/mips/alchemy/devboards/platform.h: needs merge arch/mips/alchemy/xxs1500/platform.c: needs merge arch/mips/cavium-octeon/octeon-irq.c: needs merge arch/mips/configs/db1200_defconfig: needs merge arch/mips/include/asm/mach-au1x00/au1000.h: needs merge drivers/i2c/busses/Kconfig: needs merge drivers/i2c/busses/Makefile: needs merge drivers/pcmcia/au1000_generic.h: needs merge drivers/pcmcia/db1xxx_ss.c: needs merge drivers/pcmcia/xxs1500_ss.c: needs merge drivers/staging/sm7xx/smtc2d.c: needs merge drivers/staging/sm7xx/smtc2d.h: needs merge rm 'drivers/staging/sm7xx/smtc2d.c' rm 'drivers/staging/sm7xx/smtc2d.h' $ git commit -v -a Recorded resolution for 'arch/mips/alchemy/devboards/db1x00/platform.c'. Recorded resolution for 'arch/mips/alchemy/devboards/pb1500/platform.c'. Recorded resolution for 'arch/mips/alchemy/devboards/pb1550/platform.c'. [master 6a1e37c] Merge remote branch 'mips/mips-for-linux-next' $ git diff -M --stat --summary HEAD^.. Merging parisc/next $ git merge parisc/next Already up-to-date. Merging powerpc/next $ git merge powerpc/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging 52xx-and-virtex/next $ git merge 52xx-and-virtex/next Already up-to-date. Merging galak/next $ git merge galak/next Already up-to-date. Merging s390/features $ git merge s390/features Merge made by recursive. arch/s390/include/asm/lowcore.h | 48 ++++++++++++++++++-------------------- arch/s390/include/asm/system.h | 1 + arch/s390/kernel/asm-offsets.c | 1 - arch/s390/kernel/entry.S | 33 ++++---------------------- arch/s390/kernel/entry64.S | 28 ++++------------------ arch/s390/kernel/head.S | 4 +- arch/s390/kernel/processor.c | 37 +++++++++++++++++++---------- arch/s390/kernel/setup.c | 25 ++++---------------- arch/s390/kernel/smp.c | 6 ++-- arch/s390/kernel/traps.c | 40 +++++++++----------------------- arch/s390/mm/fault.c | 14 +++++------ arch/s390/mm/maccess.c | 26 +++++++++++++++++++++ drivers/s390/char/Kconfig | 3 +- drivers/s390/char/vmcp.c | 38 ++++++------------------------ drivers/s390/char/zcore.c | 31 +----------------------- drivers/s390/cio/css.c | 7 ++++- 16 files changed, 127 insertions(+), 215 deletions(-) Merging sh/master $ git merge sh/master Auto-merging drivers/sh/intc.c Merge made by recursive. arch/sh/include/asm/mmu.h | 7 +++++++ arch/sh/mm/uncached.c | 9 +++++++++ drivers/sh/intc.c | 31 ++++++++++++++++++++++++++++++- include/linux/serial_sci.h | 4 ++++ 4 files changed, 50 insertions(+), 1 deletions(-) Merging genesis/master $ git merge genesis/master Already up-to-date. Merging sparc/master $ git merge sparc/master Already up-to-date. Merging xtensa/master $ git merge xtensa/master Auto-merging arch/xtensa/Kconfig Merge made by recursive. Merging ceph/for-next $ git merge ceph/for-next Resolved 'fs/gfs2/super.c' using previous resolution. Resolved 'fs/nfs/inode.c' using previous resolution. Resolved 'fs/ufs/inode.c' using previous resolution. Resolved 'fs/xfs/linux-2.6/xfs_super.c' using previous resolution. Auto-merging Documentation/ioctl/ioctl-number.txt Auto-merging MAINTAINERS Auto-merging fs/Kconfig Auto-merging fs/Makefile Auto-merging fs/affs/affs.h Auto-merging fs/bfs/inode.c Auto-merging fs/btrfs/ctree.h Auto-merging fs/btrfs/inode.c Auto-merging fs/exofs/exofs.h Auto-merging fs/exofs/inode.c Auto-merging fs/ext2/inode.c Auto-merging fs/ext3/inode.c Auto-merging fs/ext4/ext4.h Auto-merging fs/ext4/inode.c Auto-merging fs/fat/inode.c Auto-merging fs/gfs2/super.c CONFLICT (content): Merge conflict in fs/gfs2/super.c Auto-merging fs/jfs/inode.c Auto-merging fs/jfs/jfs_inode.h Auto-merging fs/nfs/inode.c CONFLICT (content): Merge conflict in fs/nfs/inode.c Auto-merging fs/reiserfs/inode.c Auto-merging fs/udf/inode.c Auto-merging fs/ufs/inode.c CONFLICT (content): Merge conflict in fs/ufs/inode.c Auto-merging fs/ufs/ufs.h Auto-merging fs/xfs/linux-2.6/xfs_super.c CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c Auto-merging include/linux/ext3_fs.h Auto-merging include/linux/fs.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 36eecb2] Merge remote branch 'ceph/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/filesystems/ceph.txt | 139 ++ Documentation/ioctl/ioctl-number.txt | 1 + MAINTAINERS | 9 + fs/Kconfig | 1 + fs/Makefile | 1 + fs/ceph/Kconfig | 27 + fs/ceph/Makefile | 39 + fs/ceph/README | 20 + fs/ceph/addr.c | 1188 +++++++++++++ fs/ceph/armor.c | 99 ++ fs/ceph/auth.c | 257 +++ fs/ceph/auth.h | 84 + fs/ceph/auth_none.c | 121 ++ fs/ceph/auth_none.h | 28 + fs/ceph/auth_x.c | 656 ++++++++ fs/ceph/auth_x.h | 49 + fs/ceph/auth_x_protocol.h | 90 + fs/ceph/buffer.c | 78 + fs/ceph/buffer.h | 39 + fs/ceph/caps.c | 2927 ++++++++++++++++++++++++++++++++ fs/ceph/ceph_debug.h | 37 + fs/ceph/ceph_frag.c | 21 + fs/ceph/ceph_frag.h | 109 ++ fs/ceph/ceph_fs.c | 74 + fs/ceph/ceph_fs.h | 650 ++++++++ fs/ceph/ceph_hash.c | 118 ++ fs/ceph/ceph_hash.h | 13 + fs/ceph/ceph_strings.c | 176 ++ fs/ceph/crush/crush.c | 151 ++ fs/ceph/crush/crush.h | 180 ++ fs/ceph/crush/hash.c | 149 ++ fs/ceph/crush/hash.h | 17 + fs/ceph/crush/mapper.c | 596 +++++++ fs/ceph/crush/mapper.h | 20 + fs/ceph/crypto.c | 408 +++++ fs/ceph/crypto.h | 48 + fs/ceph/debugfs.c | 483 ++++++ fs/ceph/decode.h | 194 +++ fs/ceph/dir.c | 1220 ++++++++++++++ fs/ceph/export.c | 223 +++ fs/ceph/file.c | 937 +++++++++++ fs/ceph/inode.c | 1750 ++++++++++++++++++++ fs/ceph/ioctl.c | 160 ++ fs/ceph/ioctl.h | 40 + fs/ceph/mds_client.c | 3021 ++++++++++++++++++++++++++++++++++ fs/ceph/mds_client.h | 335 ++++ fs/ceph/mdsmap.c | 174 ++ fs/ceph/mdsmap.h | 54 + fs/ceph/messenger.c | 2240 +++++++++++++++++++++++++ fs/ceph/messenger.h | 254 +++ fs/ceph/mon_client.c | 834 ++++++++++ fs/ceph/mon_client.h | 119 ++ fs/ceph/msgpool.c | 186 +++ fs/ceph/msgpool.h | 27 + fs/ceph/msgr.h | 158 ++ fs/ceph/osd_client.c | 1537 +++++++++++++++++ fs/ceph/osd_client.h | 166 ++ fs/ceph/osdmap.c | 1019 ++++++++++++ fs/ceph/osdmap.h | 125 ++ fs/ceph/pagelist.c | 54 + fs/ceph/pagelist.h | 54 + fs/ceph/rados.h | 374 +++++ fs/ceph/snap.c | 904 ++++++++++ fs/ceph/super.c | 1030 ++++++++++++ fs/ceph/super.h | 901 ++++++++++ fs/ceph/types.h | 29 + fs/ceph/xattr.c | 844 ++++++++++ 67 files changed, 28066 insertions(+), 0 deletions(-) create mode 100644 Documentation/filesystems/ceph.txt create mode 100644 fs/ceph/Kconfig create mode 100644 fs/ceph/Makefile create mode 100644 fs/ceph/README create mode 100644 fs/ceph/addr.c create mode 100644 fs/ceph/armor.c create mode 100644 fs/ceph/auth.c create mode 100644 fs/ceph/auth.h create mode 100644 fs/ceph/auth_none.c create mode 100644 fs/ceph/auth_none.h create mode 100644 fs/ceph/auth_x.c create mode 100644 fs/ceph/auth_x.h create mode 100644 fs/ceph/auth_x_protocol.h create mode 100644 fs/ceph/buffer.c create mode 100644 fs/ceph/buffer.h create mode 100644 fs/ceph/caps.c create mode 100644 fs/ceph/ceph_debug.h create mode 100644 fs/ceph/ceph_frag.c create mode 100644 fs/ceph/ceph_frag.h create mode 100644 fs/ceph/ceph_fs.c create mode 100644 fs/ceph/ceph_fs.h create mode 100644 fs/ceph/ceph_hash.c create mode 100644 fs/ceph/ceph_hash.h create mode 100644 fs/ceph/ceph_strings.c create mode 100644 fs/ceph/crush/crush.c create mode 100644 fs/ceph/crush/crush.h create mode 100644 fs/ceph/crush/hash.c create mode 100644 fs/ceph/crush/hash.h create mode 100644 fs/ceph/crush/mapper.c create mode 100644 fs/ceph/crush/mapper.h create mode 100644 fs/ceph/crypto.c create mode 100644 fs/ceph/crypto.h create mode 100644 fs/ceph/debugfs.c create mode 100644 fs/ceph/decode.h create mode 100644 fs/ceph/dir.c create mode 100644 fs/ceph/export.c create mode 100644 fs/ceph/file.c create mode 100644 fs/ceph/inode.c create mode 100644 fs/ceph/ioctl.c create mode 100644 fs/ceph/ioctl.h create mode 100644 fs/ceph/mds_client.c create mode 100644 fs/ceph/mds_client.h create mode 100644 fs/ceph/mdsmap.c create mode 100644 fs/ceph/mdsmap.h create mode 100644 fs/ceph/messenger.c create mode 100644 fs/ceph/messenger.h create mode 100644 fs/ceph/mon_client.c create mode 100644 fs/ceph/mon_client.h create mode 100644 fs/ceph/msgpool.c create mode 100644 fs/ceph/msgpool.h create mode 100644 fs/ceph/msgr.h create mode 100644 fs/ceph/osd_client.c create mode 100644 fs/ceph/osd_client.h create mode 100644 fs/ceph/osdmap.c create mode 100644 fs/ceph/osdmap.h create mode 100644 fs/ceph/pagelist.c create mode 100644 fs/ceph/pagelist.h create mode 100644 fs/ceph/rados.h create mode 100644 fs/ceph/snap.c create mode 100644 fs/ceph/super.c create mode 100644 fs/ceph/super.h create mode 100644 fs/ceph/types.h create mode 100644 fs/ceph/xattr.c Merging cifs/master $ git merge cifs/master Auto-merging fs/cifs/cifssmb.c Merge made by recursive. fs/cifs/cifsfs.c | 3 +- fs/cifs/cifsfs.h | 3 +- fs/cifs/cifsglob.h | 1 + fs/cifs/cifsproto.h | 6 + fs/cifs/cifssmb.c | 133 +++++++++++++++++++++++ fs/cifs/dir.c | 2 +- fs/cifs/file.c | 7 +- fs/cifs/inode.c | 297 +++++++++++++++++++++++++++++++------------------- 8 files changed, 332 insertions(+), 120 deletions(-) Merging configfs/linux-next $ git merge configfs/linux-next Already up-to-date. Merging ecryptfs/next $ git merge ecryptfs/next Already up-to-date. Merging ext3/for_next $ git merge ext3/for_next Already up-to-date. Merging ext4/next $ git merge ext4/next Already up-to-date. Merging fatfs/master $ git merge fatfs/master Already up-to-date. Merging fuse/for-next $ git merge fuse/for-next Already up-to-date. Merging gfs2/master $ git merge gfs2/master Merge made by recursive. Merging jfs/next $ git merge jfs/next Merge made by recursive. fs/jfs/jfs_dmap.c | 16 ++++++++-------- fs/jfs/jfs_dmap.h | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) Merging logfs/master $ git merge logfs/master Already up-to-date. Merging nfs/linux-next $ git merge nfs/linux-next Auto-merging net/sunrpc/xprtsock.c Merge made by recursive. fs/nfs/callback_xdr.c | 1 + fs/nfs/nfs4proc.c | 1 + net/sunrpc/xprtsock.c | 8 ++------ 3 files changed, 4 insertions(+), 6 deletions(-) Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merging fs/nfsd/nfs4state.c Auto-merging fs/nfsd/nfs4xdr.c Merge made by recursive. fs/nfsd/nfs4callback.c | 2 +- fs/nfsd/nfs4state.c | 58 +++++++++++-------------------------------- fs/nfsd/nfs4xdr.c | 2 +- fs/nfsd/nfsctl.c | 64 +++++++++++++++++++++++++++++++++++------------ fs/nfsd/nfsd.h | 6 ++-- 5 files changed, 67 insertions(+), 65 deletions(-) Merging nilfs2/for-next $ git merge nilfs2/for-next Already up-to-date. Merging ocfs2/linux-next $ git merge ocfs2/linux-next Already up-to-date. Merging squashfs/master $ git merge squashfs/master Already up-to-date. Merging udf/for_next $ git merge udf/for_next Already up-to-date. Merging v9fs/for-next $ git merge v9fs/for-next Already up-to-date. Merging ubifs/linux-next $ git merge ubifs/linux-next Already up-to-date. Merging xfs/master $ git merge xfs/master Already up-to-date. Merging reiserfs-bkl/reiserfs/kill-bkl $ git merge reiserfs-bkl/reiserfs/kill-bkl Already up-to-date. Merging vfs/for-next $ git merge vfs/for-next Resolved 'fs/namei.c' using previous resolution. Resolved 'fs/nfsd/nfs4xdr.c' using previous resolution. Resolved 'security/tomoyo/realpath.c' using previous resolution. Auto-merging drivers/infiniband/core/uverbs.h Auto-merging drivers/infiniband/core/uverbs_main.c Auto-merging drivers/usb/gadget/f_mass_storage.c Auto-merging drivers/usb/gadget/file_storage.c Auto-merging fs/autofs4/inode.c Auto-merging fs/cifs/file.c Auto-merging fs/dcache.c Auto-merging fs/ext4/file.c Auto-merging fs/gfs2/super.c Auto-merging fs/locks.c Auto-merging fs/namei.c CONFLICT (content): Merge conflict in fs/namei.c Auto-merging fs/namespace.c Auto-merging fs/nfs/inode.c Auto-merging fs/nfs/nfs4proc.c Auto-merging fs/nfsd/nfs4xdr.c CONFLICT (content): Merge conflict in fs/nfsd/nfs4xdr.c Auto-merging fs/nfsd/vfs.c Auto-merging fs/nilfs2/dir.c Auto-merging fs/open.c Auto-merging fs/proc/base.c Auto-merging fs/proc/generic.c Auto-merging fs/udf/balloc.c Auto-merging fs/udf/inode.c Auto-merging fs/udf/namei.c Auto-merging include/linux/fs.h Auto-merging include/linux/mount.h Auto-merging mm/filemap.c Auto-merging net/sunrpc/rpc_pipe.c Auto-merging security/smack/smack_lsm.c Auto-merging security/tomoyo/realpath.c CONFLICT (content): Merge conflict in security/tomoyo/realpath.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 8262a21] Merge remote branch 'vfs/for-next' $ git diff -M --stat --summary HEAD^.. drivers/infiniband/core/uverbs_main.c | 1 + fs/namei.c | 63 +++++++++++++++++---------------- 2 files changed, 33 insertions(+), 31 deletions(-) Merging pci/linux-next $ git merge pci/linux-next Already up-to-date. Merging hid/for-next $ git merge hid/for-next Already up-to-date. Merging quilt/i2c $ git merge quilt/i2c Renaming drivers/i2c/chips/tsl2550.c->drivers/misc/tsl2550.c Auto-merging drivers/misc/tsl2550.c Auto-merging drivers/i2c/busses/i2c-i801.c Auto-merging drivers/misc/eeprom/at24.c Merge made by recursive. Documentation/i2c/busses/i2c-i801 | 8 ++++- drivers/acpi/scan.c | 38 +++++++++++++++++++++++ drivers/i2c/busses/i2c-i801.c | 39 ++++++++++++++++-------- drivers/i2c/busses/i2c-parport.c | 2 +- drivers/i2c/busses/i2c-scmi.c | 32 +++++++++++++++----- drivers/i2c/busses/i2c-stub.c | 9 +++-- drivers/i2c/busses/scx200_acb.c | 2 +- drivers/i2c/i2c-dev.c | 6 ++-- drivers/misc/eeprom/at24.c | 59 ++++++++++++++++++++++++++++++------- include/acpi/acpi_drivers.h | 2 + 10 files changed, 155 insertions(+), 42 deletions(-) Merging bjdooks-i2c/next-i2c $ git merge bjdooks-i2c/next-i2c Already up-to-date. Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. drivers/acpi/osl.c | 9 +++++++++ drivers/hwmon/asus_atk0110.c | 7 +++++++ drivers/hwmon/coretemp.c | 2 +- drivers/hwmon/w83793.c | 2 +- include/linux/acpi.h | 2 ++ 5 files changed, 20 insertions(+), 2 deletions(-) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Already up-to-date. Merging v4l-dvb/master $ git merge v4l-dvb/master Merge made by recursive. drivers/media/common/tuners/tuner-xc2028.c | 25 +- drivers/media/common/tuners/tuner-xc2028.h | 2 + drivers/media/dvb/bt8xx/dst.c | 2 - drivers/media/dvb/dvb-core/dvb_demux.c | 11 +- drivers/media/dvb/dvb-usb/af9015.c | 13 +- drivers/media/dvb/dvb-usb/az6027.c | 53 +- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 8 +- drivers/media/dvb/firewire/firedtv-avc.c | 2 +- drivers/media/dvb/frontends/atbm8830_priv.h | 2 +- drivers/media/dvb/frontends/au8522_decoder.c | 7 + drivers/media/dvb/frontends/au8522_dig.c | 26 + drivers/media/dvb/frontends/au8522_priv.h | 5 + drivers/media/dvb/frontends/stv0900_core.c | 16 +- drivers/media/dvb/frontends/stv090x.c | 94 ++- drivers/media/dvb/frontends/stv090x.h | 1 + drivers/media/dvb/frontends/stv6110x.c | 24 +- drivers/media/dvb/frontends/stv6110x.h | 1 + drivers/media/dvb/mantis/mantis_vp1041.c | 10 +- drivers/media/dvb/ngene/ngene-core.c | 52 +- drivers/media/dvb/ttpci/budget.c | 8 + drivers/media/video/cx2341x.c | 14 - drivers/media/video/cx23885/cimax2.c | 12 +- drivers/media/video/cx88/cx88.h | 2 +- drivers/media/video/davinci/isif_regs.h | 2 +- drivers/media/video/em28xx/em28xx-cards.c | 7 +- drivers/media/video/em28xx/em28xx-dvb.c | 1 + drivers/media/video/gspca/cpia1.c | 34 +- drivers/media/video/gspca/gspca.c | 7 +- drivers/media/video/gspca/ov534.c | 563 +++++----- drivers/media/video/gspca/pac207.c | 4 +- drivers/media/video/gspca/sn9c2028.c | 2 +- drivers/media/video/gspca/sn9c20x.c | 6 +- drivers/media/video/gspca/t613.c | 13 +- drivers/media/video/ivtv/ivtv-streams.c | 4 + drivers/media/video/mt9t031.c | 66 +- drivers/media/video/mt9v022.c | 2 +- drivers/media/video/mx3_camera.c | 4 +- drivers/media/video/ov9640.c | 6 +- drivers/media/video/rj54n1cb0c.c | 18 +- drivers/media/video/s2255drv.c | 555 +++++++--- drivers/media/video/saa7134/saa7134-input.c | 1 + drivers/media/video/sh_mobile_ceu_camera.c | 8 +- drivers/media/video/soc_camera.c | 18 +- drivers/media/video/tlg2300/pd-dvb.c | 6 +- drivers/media/video/tlg2300/pd-main.c | 6 +- drivers/media/video/tlg2300/pd-radio.c | 21 +- drivers/media/video/tlg2300/pd-video.c | 18 +- drivers/mfd/Makefile | 2 +- drivers/staging/Kconfig | 2 + drivers/staging/Makefile | 1 + drivers/staging/tm6000/Kconfig | 32 + drivers/staging/tm6000/Makefile | 17 + drivers/staging/tm6000/README | 11 + drivers/staging/tm6000/tm6000-alsa.c | 414 +++++++ drivers/staging/tm6000/tm6000-cards.c | 826 ++++++++++++++ drivers/staging/tm6000/tm6000-core.c | 494 ++++++++ drivers/staging/tm6000/tm6000-dvb.c | 346 ++++++ drivers/staging/tm6000/tm6000-i2c.c | 297 +++++ drivers/staging/tm6000/tm6000-regs.h | 541 +++++++++ drivers/staging/tm6000/tm6000-stds.c | 873 +++++++++++++++ drivers/staging/tm6000/tm6000-usb-isoc.h | 53 + drivers/staging/tm6000/tm6000-video.c | 1550 ++++++++++++++++++++++++++ drivers/staging/tm6000/tm6000.h | 283 +++++ include/linux/videodev2.h | 1 + include/media/soc_camera.h | 12 +- 65 files changed, 6868 insertions(+), 649 deletions(-) create mode 100644 drivers/staging/tm6000/Kconfig create mode 100644 drivers/staging/tm6000/Makefile create mode 100644 drivers/staging/tm6000/README create mode 100644 drivers/staging/tm6000/tm6000-alsa.c create mode 100644 drivers/staging/tm6000/tm6000-cards.c create mode 100644 drivers/staging/tm6000/tm6000-core.c create mode 100644 drivers/staging/tm6000/tm6000-dvb.c create mode 100644 drivers/staging/tm6000/tm6000-i2c.c create mode 100644 drivers/staging/tm6000/tm6000-regs.h create mode 100644 drivers/staging/tm6000/tm6000-stds.c create mode 100644 drivers/staging/tm6000/tm6000-usb-isoc.h create mode 100644 drivers/staging/tm6000/tm6000-video.c create mode 100644 drivers/staging/tm6000/tm6000.h Merging kbuild/for-next $ git merge kbuild/for-next Auto-merging MAINTAINERS Auto-merging Makefile Auto-merging arch/ia64/include/asm/percpu.h Auto-merging arch/ia64/kernel/ivt.S Auto-merging arch/parisc/include/asm/system.h Auto-merging arch/s390/kernel/swsusp_asm64.S Auto-merging arch/x86/kernel/setup_percpu.c Auto-merging arch/x86/kernel/vmlinux.lds.S Auto-merging include/asm-generic/percpu.h Auto-merging include/linux/init_task.h Auto-merging include/linux/percpu-defs.h Auto-merging include/linux/spinlock.h Auto-merging init/Kconfig Auto-merging kernel/module.c Auto-merging scripts/kconfig/Makefile Auto-merging scripts/markup_oops.pl Merge made by recursive. Documentation/kbuild/kbuild.txt | 6 +- Documentation/kbuild/makefiles.txt | 2 +- Documentation/mutex-design.txt | 4 +- MAINTAINERS | 5 +- Makefile | 65 +- arch/frv/kernel/break.S | 4 +- arch/frv/kernel/entry.S | 2 +- arch/frv/kernel/head.S | 2 +- arch/frv/kernel/vmlinux.lds.S | 10 +- arch/frv/mm/tlb-miss.S | 2 +- arch/h8300/boot/compressed/head.S | 2 +- arch/h8300/boot/compressed/vmlinux.lds | 2 +- arch/ia64/include/asm/asmmacro.h | 12 +- arch/ia64/include/asm/cache.h | 2 +- arch/ia64/include/asm/percpu.h | 2 +- arch/ia64/kernel/Makefile.gate | 2 +- arch/ia64/kernel/gate-data.S | 2 +- arch/ia64/kernel/gate.S | 8 +- arch/ia64/kernel/gate.lds.S | 10 +- arch/ia64/kernel/init_task.c | 2 +- arch/ia64/kernel/ivt.S | 2 +- arch/ia64/kernel/minstate.h | 4 +- arch/ia64/kernel/paravirtentry.S | 2 +- arch/ia64/kernel/vmlinux.lds.S | 28 +- arch/ia64/kvm/vmm_ivt.S | 2 +- arch/ia64/scripts/unwcheck.py | 2 +- arch/ia64/xen/gate-data.S | 2 +- arch/ia64/xen/xensetup.S | 2 +- arch/m68knommu/kernel/vmlinux.lds.S | 4 +- arch/m68knommu/platform/68360/head-ram.S | 2 +- arch/m68knommu/platform/68360/head-rom.S | 2 +- arch/mips/lasat/image/head.S | 2 +- arch/mips/lasat/image/romscript.normal | 2 +- arch/parisc/include/asm/cache.h | 2 +- arch/parisc/include/asm/system.h | 2 +- arch/parisc/kernel/head.S | 2 +- arch/parisc/kernel/init_task.c | 6 +- arch/parisc/kernel/vmlinux.lds.S | 12 +- arch/powerpc/Makefile | 5 + arch/powerpc/include/asm/cache.h | 2 +- arch/powerpc/include/asm/page_64.h | 8 - arch/powerpc/kernel/vmlinux.lds.S | 10 +- arch/s390/include/asm/cache.h | 2 +- arch/s390/kernel/swsusp_asm64.S | 2 +- arch/sh/boot/compressed/vmlinux.scr | 2 +- arch/sh/include/asm/cache.h | 2 +- arch/sparc/boot/btfixupprep.c | 2 +- arch/sparc/include/asm/cache.h | 2 +- arch/um/kernel/dyn.lds.S | 2 +- arch/um/kernel/init_task.c | 2 +- arch/um/kernel/uml.lds.S | 2 +- arch/x86/boot/compressed/mkpiggy.c | 2 +- arch/x86/boot/compressed/vmlinux.lds.S | 4 +- arch/x86/include/asm/cache.h | 2 +- arch/x86/kernel/acpi/wakeup_32.S | 2 +- arch/x86/kernel/init_task.c | 2 +- arch/x86/kernel/setup_percpu.c | 2 +- arch/x86/kernel/vmlinux.lds.S | 4 +- include/asm-generic/percpu.h | 10 +- include/asm-generic/vmlinux.lds.h | 38 +- include/linux/cache.h | 2 +- include/linux/init.h | 2 +- include/linux/init_task.h | 2 +- include/linux/linkage.h | 8 +- include/linux/percpu-defs.h | 4 +- include/linux/spinlock.h | 2 +- init/Kconfig | 8 + kernel/module.c | 2 +- scripts/Makefile.build | 2 +- scripts/Makefile.lib | 2 +- scripts/checkincludes.pl | 24 +- scripts/checkstack.pl | 16 +- scripts/checkversion.pl | 23 +- scripts/decodecode | 48 +- scripts/export_report.pl | 37 +- scripts/genksyms/genksyms.c | 4 +- scripts/headers_check.pl | 11 +- scripts/headers_install.pl | 19 +- scripts/kallsyms.c | 6 +- scripts/kconfig/Makefile | 16 +- scripts/kconfig/expr.c | 27 +- scripts/kconfig/expr.h | 5 +- scripts/kconfig/lkc.h | 7 +- scripts/kconfig/lkc_proto.h | 3 +- scripts/kconfig/mconf.c | 14 +- scripts/kconfig/menu.c | 16 +- scripts/kconfig/nconf.c | 1568 ++++++++++++++++++++++++++++++ scripts/kconfig/nconf.gui.c | 617 ++++++++++++ scripts/kconfig/nconf.h | 95 ++ scripts/kconfig/symbol.c | 29 +- scripts/kconfig/util.c | 2 + scripts/kconfig/zconf.tab.c_shipped | 4 +- scripts/kconfig/zconf.y | 4 +- scripts/markup_oops.pl | 54 +- scripts/mkcompile_h | 5 +- scripts/mod/modpost.c | 152 ++-- scripts/namespace.pl | 65 +- scripts/package/builddeb | 2 + scripts/package/mkspec | 2 +- scripts/profile2linkerlist.pl | 8 +- scripts/rt-tester/rt-tester.py | 2 +- scripts/show_delta | 2 +- scripts/tags.sh | 45 +- 103 files changed, 2874 insertions(+), 427 deletions(-) create mode 100644 scripts/kconfig/nconf.c create mode 100644 scripts/kconfig/nconf.gui.c create mode 100644 scripts/kconfig/nconf.h Merging kconfig/for-next $ git merge kconfig/for-next Already uptodate! Merge made by recursive. Merging ide/master $ git merge ide/master Already up-to-date. Merging libata/NEXT $ git merge libata/NEXT Merge made by recursive. drivers/ata/ahci.c | 265 +++++++++++++++++++++++++++++++--------------------- 1 files changed, 159 insertions(+), 106 deletions(-) Merging infiniband/for-next $ git merge infiniband/for-next Already up-to-date. Merging acpi/test $ git merge acpi/test Resolved 'drivers/acpi/processor_core.c' using previous resolution. Resolved 'lib/vsprintf.c' using previous resolution. Auto-merging Documentation/kernel-parameters.txt Auto-merging arch/ia64/include/asm/acpi.h Auto-merging arch/ia64/kernel/acpi.c Auto-merging arch/x86/kernel/acpi/boot.c Auto-merging arch/x86/kernel/reboot.c Auto-merging drivers/acpi/processor_core.c CONFLICT (content): Merge conflict in drivers/acpi/processor_core.c Removing drivers/acpi/processor_pdc.c Auto-merging drivers/platform/x86/Kconfig Auto-merging include/acpi/processor.h Auto-merging lib/vsprintf.c CONFLICT (content): Merge conflict in lib/vsprintf.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 403cfe8] Merge remote branch 'acpi/test' $ git diff -M --stat --summary HEAD^.. Documentation/acpi/apei/einj.txt | 49 ++ Documentation/kernel-parameters.txt | 12 +- arch/ia64/include/asm/acpi.h | 1 - arch/ia64/kernel/acpi.c | 3 + arch/x86/include/asm/acpi.h | 2 - arch/x86/include/asm/emergency-restart.h | 1 + arch/x86/kernel/acpi/boot.c | 113 +--- arch/x86/kernel/reboot.c | 71 ++- arch/x86/lguest/boot.c | 1 - drivers/acpi/Kconfig | 2 + drivers/acpi/Makefile | 7 +- drivers/acpi/acpica/exmutex.c | 3 +- drivers/acpi/apei/Kconfig | 16 + drivers/acpi/apei/Makefile | 4 + drivers/acpi/apei/apei-base.c | 589 ++++++++++++++++ drivers/acpi/apei/apei-internal.h | 97 +++ drivers/acpi/apei/einj.c | 471 +++++++++++++ drivers/acpi/apei/hest.c | 147 ++++ drivers/acpi/atomicio.c | 360 ++++++++++ drivers/acpi/battery.c | 86 ++- drivers/acpi/bus.c | 10 +- drivers/acpi/ec.c | 33 +- drivers/acpi/internal.h | 2 + drivers/acpi/processor_core.c | 1118 +++++------------------------- drivers/acpi/processor_driver.c | 976 ++++++++++++++++++++++++++ drivers/acpi/processor_pdc.c | 209 ------ drivers/acpi/processor_throttling.c | 3 - drivers/acpi/sbs.c | 5 + drivers/acpi/sleep.c | 19 +- drivers/acpi/tables.c | 4 +- drivers/acpi/thermal.c | 36 +- drivers/acpi/utils.c | 45 -- drivers/acpi/video.c | 28 +- drivers/platform/x86/sony-laptop.c | 91 ++-- drivers/pnp/base.h | 3 + drivers/pnp/interface.c | 7 +- drivers/pnp/pnpacpi/rsparser.c | 49 +- drivers/pnp/resource.c | 27 +- drivers/pnp/support.c | 4 +- drivers/power/power_supply_sysfs.c | 1 + include/acpi/apei.h | 13 + include/acpi/atomicio.h | 10 + include/acpi/processor.h | 10 +- include/linux/ioport.h | 18 +- include/linux/power_supply.h | 1 + lib/vsprintf.c | 13 +- 46 files changed, 3302 insertions(+), 1468 deletions(-) create mode 100644 Documentation/acpi/apei/einj.txt create mode 100644 drivers/acpi/apei/Kconfig create mode 100644 drivers/acpi/apei/Makefile create mode 100644 drivers/acpi/apei/apei-base.c create mode 100644 drivers/acpi/apei/apei-internal.h create mode 100644 drivers/acpi/apei/einj.c create mode 100644 drivers/acpi/apei/hest.c create mode 100644 drivers/acpi/atomicio.c create mode 100644 drivers/acpi/processor_driver.c delete mode 100644 drivers/acpi/processor_pdc.c create mode 100644 include/acpi/apei.h create mode 100644 include/acpi/atomicio.h $ git am -3 ../patches/0001-cpufreq-merge-fixup-for-processor_core.c-rename.patch Applying: cpufreq: merge fixup for processor_core.c rename $ git reset HEAD^ Unstaged changes after reset: M drivers/acpi/processor_driver.c $ git add . $ git commit -v -a --amend [master 6242976] Merge remote branch 'acpi/test' Merging ieee1394/for-next $ git merge ieee1394/for-next Already up-to-date. Merging ubi/linux-next $ git merge ubi/linux-next Auto-merging drivers/mtd/ubi/build.c Merge made by recursive. Merging kvm/linux-next $ git merge kvm/linux-next Already up-to-date. Merging dlm/next $ git merge dlm/next Already up-to-date. Merging ibft/master $ git merge ibft/master Already up-to-date. Merging scsi/master $ git merge scsi/master Auto-merging drivers/infiniband/ulp/iser/iscsi_iser.c Removing drivers/scsi/bfa/include/defs/bfa_defs_im_common.h Removing drivers/scsi/bfa/include/defs/bfa_defs_im_team.h Removing drivers/scsi/bfa/include/protocol/pcifw.h Auto-merging drivers/scsi/lpfc/lpfc_els.c Auto-merging drivers/scsi/lpfc/lpfc_scsi.c Auto-merging drivers/scsi/sd.c Merge made by recursive. drivers/infiniband/ulp/iser/iscsi_iser.c | 2 +- drivers/scsi/Kconfig | 6 + drivers/scsi/be2iscsi/be_cmds.c | 7 - drivers/scsi/be2iscsi/be_iscsi.c | 4 +- drivers/scsi/be2iscsi/be_main.c | 201 ++- drivers/scsi/be2iscsi/be_main.h | 11 +- drivers/scsi/be2iscsi/be_mgmt.c | 14 +- drivers/scsi/be2iscsi/be_mgmt.h | 8 +- drivers/scsi/bfa/Makefile | 8 +- drivers/scsi/bfa/bfa_core.c | 19 + drivers/scsi/bfa/bfa_fcport.c | 1709 +++++++++++--------- drivers/scsi/bfa/bfa_fcs.c | 63 +- drivers/scsi/bfa/bfa_fcs_lport.c | 75 +- drivers/scsi/bfa/bfa_fcs_port.c | 11 +- drivers/scsi/bfa/bfa_fcs_uf.c | 8 +- drivers/scsi/bfa/bfa_hw_cb.c | 13 + drivers/scsi/bfa/bfa_hw_ct.c | 9 + drivers/scsi/bfa/bfa_intr.c | 111 +- drivers/scsi/bfa/bfa_ioc.c | 762 +++------ drivers/scsi/bfa/bfa_ioc.h | 57 +- drivers/scsi/bfa/bfa_ioc_cb.c | 274 +++ drivers/scsi/bfa/bfa_ioc_ct.c | 423 +++++ drivers/scsi/bfa/bfa_iocfc.c | 24 +- drivers/scsi/bfa/bfa_iocfc.h | 3 + drivers/scsi/bfa/bfa_ioim.c | 22 +- drivers/scsi/bfa/bfa_itnim.c | 30 +- drivers/scsi/bfa/bfa_lps.c | 134 ++- drivers/scsi/bfa/bfa_module.c | 4 +- drivers/scsi/bfa/bfa_modules_priv.h | 2 +- drivers/scsi/bfa/bfa_port_priv.h | 57 +- drivers/scsi/bfa/bfa_priv.h | 2 +- drivers/scsi/bfa/bfa_rport.c | 26 +- drivers/scsi/bfa/bfa_trcmod_priv.h | 62 +- drivers/scsi/bfa/bfa_tskim.c | 14 +- drivers/scsi/bfa/bfad.c | 208 ++- drivers/scsi/bfa/bfad_attr.c | 76 +- drivers/scsi/bfa/bfad_attr.h | 9 - drivers/scsi/bfa/bfad_drv.h | 35 +- drivers/scsi/bfa/bfad_im.c | 53 +- drivers/scsi/bfa/bfad_im.h | 5 - drivers/scsi/bfa/bfad_intr.c | 11 +- drivers/scsi/bfa/fabric.c | 59 +- drivers/scsi/bfa/fcbuild.h | 6 + drivers/scsi/bfa/fcpim.c | 51 +- drivers/scsi/bfa/fcs_fabric.h | 2 + drivers/scsi/bfa/fcs_fcpim.h | 5 - drivers/scsi/bfa/fcs_lport.h | 7 +- drivers/scsi/bfa/fcs_port.h | 3 +- drivers/scsi/bfa/fcs_rport.h | 3 - drivers/scsi/bfa/fcs_uf.h | 3 +- drivers/scsi/bfa/fcs_vport.h | 8 - drivers/scsi/bfa/fdmi.c | 79 +- drivers/scsi/bfa/include/aen/bfa_aen.h | 50 +- drivers/scsi/bfa/include/bfa.h | 22 + drivers/scsi/bfa/include/bfa_svc.h | 101 +- drivers/scsi/bfa/include/bfa_timer.h | 2 +- drivers/scsi/bfa/include/bfi/bfi.h | 4 +- drivers/scsi/bfa/include/bfi/bfi_cbreg.h | 16 +- drivers/scsi/bfa/include/bfi/bfi_ctreg.h | 26 + drivers/scsi/bfa/include/bfi/bfi_ioc.h | 2 +- drivers/scsi/bfa/include/bfi/bfi_lps.h | 8 + drivers/scsi/bfa/include/bfi/bfi_pport.h | 172 +-- drivers/scsi/bfa/include/cna/bfa_cna_trcmod.h | 4 + drivers/scsi/bfa/include/cs/bfa_log.h | 2 +- drivers/scsi/bfa/include/cs/bfa_plog.h | 9 +- drivers/scsi/bfa/include/cs/bfa_sm.h | 8 + drivers/scsi/bfa/include/defs/bfa_defs_aen.h | 10 + drivers/scsi/bfa/include/defs/bfa_defs_auth.h | 22 + drivers/scsi/bfa/include/defs/bfa_defs_cee.h | 14 +- drivers/scsi/bfa/include/defs/bfa_defs_driver.h | 3 +- drivers/scsi/bfa/include/defs/bfa_defs_ethport.h | 1 + drivers/scsi/bfa/include/defs/bfa_defs_fcport.h | 94 ++ drivers/scsi/bfa/include/defs/bfa_defs_im_common.h | 32 - drivers/scsi/bfa/include/defs/bfa_defs_im_team.h | 72 - drivers/scsi/bfa/include/defs/bfa_defs_ioc.h | 3 +- drivers/scsi/bfa/include/defs/bfa_defs_iocfc.h | 12 +- drivers/scsi/bfa/include/defs/bfa_defs_lport.h | 4 +- drivers/scsi/bfa/include/defs/bfa_defs_mfg.h | 111 ++- drivers/scsi/bfa/include/defs/bfa_defs_port.h | 19 +- drivers/scsi/bfa/include/defs/bfa_defs_pport.h | 151 +- drivers/scsi/bfa/include/defs/bfa_defs_status.h | 17 +- drivers/scsi/bfa/include/fcb/bfa_fcb_fcpim.h | 1 - drivers/scsi/bfa/include/fcs/bfa_fcs.h | 5 +- drivers/scsi/bfa/include/fcs/bfa_fcs_lport.h | 8 - drivers/scsi/bfa/include/log/bfa_log_hal.h | 6 + drivers/scsi/bfa/include/log/bfa_log_linux.h | 16 + drivers/scsi/bfa/include/protocol/fc.h | 5 + drivers/scsi/bfa/include/protocol/pcifw.h | 75 - drivers/scsi/bfa/loop.c | 2 +- drivers/scsi/bfa/lport_api.c | 5 +- drivers/scsi/bfa/ms.c | 29 +- drivers/scsi/bfa/ns.c | 36 +- drivers/scsi/bfa/rport.c | 91 +- drivers/scsi/bfa/rport_api.c | 2 +- drivers/scsi/bfa/rport_ftrs.c | 12 +- drivers/scsi/bfa/scn.c | 10 +- drivers/scsi/bfa/vport.c | 86 +- drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 2 +- drivers/scsi/device_handler/scsi_dh_emc.c | 6 +- drivers/scsi/hpsa.c | 330 ++-- drivers/scsi/hpsa.h | 7 +- drivers/scsi/hpsa_cmd.h | 20 +- drivers/scsi/ibmvscsi/ibmvfc.c | 27 + drivers/scsi/ibmvscsi/ibmvscsi.c | 19 + drivers/scsi/ibmvscsi/ibmvscsi.h | 1 + drivers/scsi/ibmvscsi/iseries_vscsi.c | 6 + drivers/scsi/ibmvscsi/rpa_vscsi.c | 13 + drivers/scsi/ipr.c | 1756 +++++++++++++++----- drivers/scsi/ipr.h | 467 ++++-- drivers/scsi/iscsi_tcp.c | 2 +- drivers/scsi/libiscsi.c | 23 +- drivers/scsi/lpfc/lpfc.h | 10 +- drivers/scsi/lpfc/lpfc_attr.c | 7 +- drivers/scsi/lpfc/lpfc_bsg.c | 332 ++++ drivers/scsi/lpfc/lpfc_bsg.h | 12 + drivers/scsi/lpfc/lpfc_crtn.h | 7 +- drivers/scsi/lpfc/lpfc_els.c | 142 ++- drivers/scsi/lpfc/lpfc_hbadisc.c | 527 +++++-- drivers/scsi/lpfc/lpfc_init.c | 277 +++- drivers/scsi/lpfc/lpfc_logmsg.h | 1 + drivers/scsi/lpfc/lpfc_mbox.c | 8 +- drivers/scsi/lpfc/lpfc_scsi.c | 49 +- drivers/scsi/lpfc/lpfc_sli.c | 413 ++++- drivers/scsi/lpfc/lpfc_sli.h | 1 + drivers/scsi/lpfc/lpfc_sli4.h | 38 +- drivers/scsi/lpfc/lpfc_version.h | 2 +- drivers/scsi/lpfc/lpfc_vport.c | 7 +- drivers/scsi/osd/osd_initiator.c | 4 + drivers/scsi/raid_class.c | 2 + drivers/scsi/scsi_transport_fc.c | 24 +- drivers/scsi/sd.c | 4 +- include/scsi/libiscsi.h | 3 +- 133 files changed, 7204 insertions(+), 3525 deletions(-) create mode 100644 drivers/scsi/bfa/bfa_ioc_cb.c create mode 100644 drivers/scsi/bfa/bfa_ioc_ct.c create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_fcport.h delete mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_im_common.h delete mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_im_team.h delete mode 100644 drivers/scsi/bfa/include/protocol/pcifw.h Merging async_tx/next $ git merge async_tx/next Already up-to-date. Merging net/master $ git merge net/master Already up-to-date. Merging wireless/master $ git merge wireless/master Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. Resolved 'drivers/net/wireless/ath/ath5k/phy.c' using previous resolution. Auto-merging Documentation/feature-removal-schedule.txt CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Auto-merging drivers/net/wireless/ath/ath5k/eeprom.c Auto-merging drivers/net/wireless/ath/ath5k/phy.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath5k/phy.c Auto-merging drivers/net/wireless/ath/ath5k/reg.h Auto-merging drivers/net/wireless/ath/ath5k/reset.c Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.c Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c Auto-merging drivers/net/wireless/iwlwifi/iwl-scan.c Auto-merging drivers/net/wireless/iwmc3200wifi/debugfs.c Auto-merging drivers/net/wireless/iwmc3200wifi/rx.c Auto-merging drivers/net/wireless/rndis_wlan.c Removing drivers/net/wireless/wl12xx/wl1271_spi.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 2c4e65a] Merge remote branch 'wireless/master' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/obsolete/sysfs-class-rfkill | 29 ++ Documentation/ABI/stable/sysfs-class-rfkill | 67 ++++ Documentation/feature-removal-schedule.txt | 18 + Documentation/rfkill.txt | 44 +-- drivers/net/wireless/ath/ath5k/ath5k.h | 237 ++++++-------- drivers/net/wireless/ath/ath5k/attach.c | 5 +- drivers/net/wireless/ath/ath5k/base.c | 150 +++++++-- drivers/net/wireless/ath/ath5k/base.h | 20 + drivers/net/wireless/ath/ath5k/caps.c | 3 - drivers/net/wireless/ath/ath5k/debug.c | 212 +++++++++++ drivers/net/wireless/ath/ath5k/debug.h | 2 + drivers/net/wireless/ath/ath5k/desc.c | 18 +- drivers/net/wireless/ath/ath5k/eeprom.c | 4 +- drivers/net/wireless/ath/ath5k/eeprom.h | 88 ++++-- drivers/net/wireless/ath/ath5k/pcu.c | 43 +-- drivers/net/wireless/ath/ath5k/phy.c | 22 +- drivers/net/wireless/ath/ath5k/qcu.c | 2 + drivers/net/wireless/ath/ath5k/reg.h | 2 +- drivers/net/wireless/ath/ath5k/reset.c | 38 ++- drivers/net/wireless/ath/ath9k/hw.c | 16 +- drivers/net/wireless/ath/ath9k/hw.h | 1 + drivers/net/wireless/ath/ath9k/mac.c | 6 +- drivers/net/wireless/ath/ath9k/rc.c | 8 +- drivers/net/wireless/ath/ath9k/rc.h | 1 - drivers/net/wireless/ath/ath9k/xmit.c | 4 +- drivers/net/wireless/b43/b43.h | 1 + drivers/net/wireless/b43/phy_n.c | 463 +++++++++++++++++++------ drivers/net/wireless/b43/phy_n.h | 21 +- drivers/net/wireless/b43/tables_nphy.h | 9 + drivers/net/wireless/iwlwifi/Makefile | 2 +- drivers/net/wireless/iwlwifi/iwl-1000.c | 1 + drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 2 + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 6 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 42 ++- drivers/net/wireless/iwlwifi/iwl-4965.c | 20 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 40 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 1 + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 305 ++++++++++++++++ drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 13 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 1 - drivers/net/wireless/iwlwifi/iwl-agn.c | 110 +------ drivers/net/wireless/iwlwifi/iwl-agn.h | 74 ++++ drivers/net/wireless/iwlwifi/iwl-core.c | 418 ++-------------------- drivers/net/wireless/iwlwifi/iwl-core.h | 8 - drivers/net/wireless/iwlwifi/iwl-debugfs.c | 82 ++--- drivers/net/wireless/iwlwifi/iwl-dev.h | 90 +++--- drivers/net/wireless/iwlwifi/iwl-helpers.h | 3 + drivers/net/wireless/iwlwifi/iwl-prph.h | 14 +- drivers/net/wireless/iwlwifi/iwl-rx.c | 24 -- drivers/net/wireless/iwlwifi/iwl-scan.c | 9 +- drivers/net/wireless/iwlwifi/iwl-sta.c | 18 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 115 ++++--- drivers/net/wireless/iwlwifi/iwl3945-base.c | 78 ++--- drivers/net/wireless/iwmc3200wifi/Kconfig | 9 +- drivers/net/wireless/iwmc3200wifi/Makefile | 3 + drivers/net/wireless/iwmc3200wifi/cfg80211.c | 17 +- drivers/net/wireless/iwmc3200wifi/commands.c | 14 +- drivers/net/wireless/iwmc3200wifi/commands.h | 1 + drivers/net/wireless/iwmc3200wifi/debugfs.c | 13 +- drivers/net/wireless/iwmc3200wifi/hal.c | 15 +- drivers/net/wireless/iwmc3200wifi/hal.h | 5 +- drivers/net/wireless/iwmc3200wifi/iwm.h | 3 + drivers/net/wireless/iwmc3200wifi/main.c | 9 +- drivers/net/wireless/iwmc3200wifi/rx.c | 76 +++-- drivers/net/wireless/iwmc3200wifi/trace.c | 3 + drivers/net/wireless/iwmc3200wifi/trace.h | 283 +++++++++++++++ drivers/net/wireless/iwmc3200wifi/tx.c | 8 +- drivers/net/wireless/iwmc3200wifi/umac.h | 2 +- drivers/net/wireless/p54/main.c | 1 + drivers/net/wireless/rndis_wlan.c | 364 ++++++++++++++++++- drivers/net/wireless/wl12xx/Kconfig | 24 ++ drivers/net/wireless/wl12xx/Makefile | 6 +- drivers/net/wireless/wl12xx/wl1271.h | 33 ++- drivers/net/wireless/wl12xx/wl1271_acx.c | 8 +- drivers/net/wireless/wl12xx/wl1271_boot.c | 3 +- drivers/net/wireless/wl12xx/wl1271_cmd.c | 8 +- drivers/net/wireless/wl12xx/wl1271_cmd.h | 2 +- drivers/net/wireless/wl12xx/wl1271_event.c | 1 - drivers/net/wireless/wl12xx/wl1271_io.c | 87 ++---- drivers/net/wireless/wl12xx/wl1271_io.h | 122 ++++++- drivers/net/wireless/wl12xx/wl1271_main.c | 336 +++++-------------- drivers/net/wireless/wl12xx/wl1271_ps.c | 1 - drivers/net/wireless/wl12xx/wl1271_rx.c | 11 +- drivers/net/wireless/wl12xx/wl1271_sdio.c | 307 ++++++++++++++++ drivers/net/wireless/wl12xx/wl1271_spi.c | 267 ++++++++++++++- drivers/net/wireless/wl12xx/wl1271_spi.h | 96 ----- drivers/net/wireless/wl12xx/wl1271_testmode.c | 1 - drivers/net/wireless/wl12xx/wl1271_tx.c | 94 +++--- drivers/net/wireless/wl12xx/wl1271_tx.h | 4 +- drivers/ssb/driver_chipcommon.c | 1 + include/net/mac80211.h | 4 +- net/mac80211/Kconfig | 9 + net/mac80211/debugfs_sta.c | 2 - net/mac80211/ibss.c | 3 + net/mac80211/ieee80211_i.h | 1 + net/mac80211/iface.c | 116 ++++++- net/mac80211/rc80211_minstrel.c | 2 +- net/mac80211/rc80211_minstrel.h | 11 + net/mac80211/rc80211_minstrel_debugfs.c | 41 +-- net/mac80211/rx.c | 9 - net/mac80211/scan.c | 71 ++++- net/mac80211/sta_info.h | 2 - net/rfkill/core.c | 58 +++ 103 files changed, 3728 insertions(+), 1849 deletions(-) create mode 100644 Documentation/ABI/obsolete/sysfs-class-rfkill create mode 100644 Documentation/ABI/stable/sysfs-class-rfkill create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-ict.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn.h create mode 100644 drivers/net/wireless/iwmc3200wifi/trace.c create mode 100644 drivers/net/wireless/iwmc3200wifi/trace.h create mode 100644 drivers/net/wireless/wl12xx/wl1271_sdio.c delete mode 100644 drivers/net/wireless/wl12xx/wl1271_spi.h Merging mtd/master $ git merge mtd/master Resolved 'drivers/mtd/nand/sh_flctl.c' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/arm/mach-ep93xx/include/mach/ts72xx.h Auto-merging arch/arm/mach-ep93xx/ts72xx.c Auto-merging drivers/mtd/inftlcore.c Auto-merging drivers/mtd/nand/Kconfig Auto-merging drivers/mtd/nand/au1550nd.c Auto-merging drivers/mtd/nand/bcm_umi_nand.c Auto-merging drivers/mtd/nand/mxc_nand.c Auto-merging drivers/mtd/nand/omap2.c Auto-merging drivers/mtd/nand/sh_flctl.c CONFLICT (content): Merge conflict in drivers/mtd/nand/sh_flctl.c Removing drivers/mtd/nand/ts7250.c Auto-merging lib/idr.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master af1f847] Merge remote branch 'mtd/master' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 6 + arch/arm/mach-ep93xx/include/mach/ts72xx.h | 19 - arch/arm/mach-ep93xx/ts72xx.c | 190 ++- drivers/mtd/Kconfig | 21 + drivers/mtd/Makefile | 1 + drivers/mtd/chips/cfi_cmdset_0001.c | 6 +- drivers/mtd/chips/cfi_cmdset_0002.c | 20 +- drivers/mtd/devices/pmc551.c | 4 +- drivers/mtd/ftl.c | 1 - drivers/mtd/inftlcore.c | 1 - drivers/mtd/inftlmount.c | 7 +- drivers/mtd/maps/bfin-async-flash.c | 16 +- drivers/mtd/maps/ceiva.c | 2 +- drivers/mtd/maps/ixp4xx.c | 4 +- drivers/mtd/maps/physmap_of.c | 2 +- drivers/mtd/mtd_blkdevs.c | 335 ++++-- drivers/mtd/mtdblock.c | 72 +- drivers/mtd/mtdblock_ro.c | 4 +- drivers/mtd/mtdchar.c | 12 +- drivers/mtd/mtdcore.c | 284 +++-- drivers/mtd/mtdcore.h | 7 +- drivers/mtd/mtdoops.c | 5 - drivers/mtd/mtdsuper.c | 18 +- drivers/mtd/nand/Kconfig | 35 +- drivers/mtd/nand/Makefile | 6 +- drivers/mtd/nand/alauda.c | 2 +- drivers/mtd/nand/atmel_nand.c | 2 +- drivers/mtd/nand/au1550nd.c | 12 +- drivers/mtd/nand/bcm_umi_nand.c | 2 +- drivers/mtd/nand/cafe_nand.c | 4 +- drivers/mtd/nand/davinci_nand.c | 6 +- drivers/mtd/nand/fsl_elbc_nand.c | 4 +- drivers/mtd/nand/fsl_upm.c | 4 +- drivers/mtd/nand/gpio.c | 12 +- drivers/mtd/nand/mpc5121_nfc.c | 916 ++++++++++++++ drivers/mtd/nand/mxc_nand.c | 22 +- drivers/mtd/nand/nand_base.c | 312 ++++- drivers/mtd/nand/nand_bbt.c | 26 +- drivers/mtd/nand/nand_bcm_umi.h | 71 +- drivers/mtd/nand/nandsim.c | 11 +- drivers/mtd/nand/nomadik_nand.c | 6 +- drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} | 144 ++-- drivers/mtd/nand/omap2.c | 16 +- drivers/mtd/nand/orion_nand.c | 10 +- drivers/mtd/nand/pasemi_nand.c | 2 +- drivers/mtd/nand/r852.c | 1139 +++++++++++++++++ drivers/mtd/nand/r852.h | 163 +++ drivers/mtd/nand/s3c2410.c | 5 +- drivers/mtd/nand/sh_flctl.c | 2 +- drivers/mtd/nand/sm_common.c | 143 +++ drivers/mtd/nand/sm_common.h | 61 + drivers/mtd/nand/socrates_nand.c | 4 +- drivers/mtd/nand/tmio_nand.c | 14 +- drivers/mtd/nand/ts7250.c | 207 ---- drivers/mtd/nand/txx9ndfmc.c | 2 +- drivers/mtd/nftlcore.c | 1 - drivers/mtd/onenand/omap2.c | 4 +- drivers/mtd/rfd_ftl.c | 1 - drivers/mtd/sm_ftl.c | 1287 ++++++++++++++++++++ drivers/mtd/sm_ftl.h | 94 ++ drivers/mtd/ssfdc.c | 1 - fs/jffs2/fs.c | 10 +- fs/jffs2/nodelist.h | 8 +- include/linux/jffs2.h | 4 +- include/linux/mtd/blktrans.h | 15 +- include/linux/mtd/cfi.h | 14 +- include/linux/mtd/mtd.h | 8 +- include/linux/mtd/nand.h | 21 +- lib/idr.c | 2 +- 69 files changed, 4943 insertions(+), 929 deletions(-) create mode 100644 drivers/mtd/nand/mpc5121_nfc.c rename drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} (63%) create mode 100644 drivers/mtd/nand/r852.c create mode 100644 drivers/mtd/nand/r852.h create mode 100644 drivers/mtd/nand/sm_common.c create mode 100644 drivers/mtd/nand/sm_common.h delete mode 100644 drivers/mtd/nand/ts7250.c create mode 100644 drivers/mtd/sm_ftl.c create mode 100644 drivers/mtd/sm_ftl.h Merging crypto/master $ git merge crypto/master Merge made by recursive. arch/x86/crypto/aesni-intel_asm.S | 115 +++++++++++++++++++++++++++++++ arch/x86/crypto/aesni-intel_glue.c | 130 ++++++++++++++++++++++++++++++++++-- arch/x86/include/asm/inst.h | 96 +++++++++++++++++++++++++- crypto/internal.h | 2 +- crypto/tcrypt.c | 7 ++ crypto/tcrypt.h | 29 ++++++++ 6 files changed, 368 insertions(+), 11 deletions(-) Merging sound/for-next $ git merge sound/for-next Merge made by recursive. sound/core/pcm_native.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) Merging cpufreq/next $ git merge cpufreq/next Already up-to-date. Merging quilt/rr $ git merge quilt/rr Resolved 'MAINTAINERS' using previous resolution. Resolved 'drivers/char/hvc_console.c' using previous resolution. Resolved 'drivers/char/hvc_console.h' using previous resolution. Resolved 'drivers/char/virtio_console.c' using previous resolution. Auto-merging MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merging drivers/block/virtio_blk.c Auto-merging drivers/char/hvc_beat.c Auto-merging drivers/char/hvc_console.c CONFLICT (content): Merge conflict in drivers/char/hvc_console.c Auto-merging drivers/char/hvc_console.h CONFLICT (content): Merge conflict in drivers/char/hvc_console.h Auto-merging drivers/char/hvc_iseries.c Auto-merging drivers/char/hvc_iucv.c Auto-merging drivers/char/virtio_console.c CONFLICT (content): Merge conflict in drivers/char/virtio_console.c Auto-merging drivers/virtio/virtio_pci.c Auto-merging include/linux/gfp.h Auto-merging include/linux/kernel.h Auto-merging include/linux/virtio.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f4f1474] Merge branch 'quilt/rr' $ git diff -M --stat --summary HEAD^.. Documentation/cpu-hotplug.txt | 2 +- include/linux/gfp.h | 2 +- include/linux/kernel.h | 82 +++++++++++++++++++++++++---------------- include/linux/kmemcheck.h | 2 +- include/linux/virtio_config.h | 5 ++- 5 files changed, 57 insertions(+), 36 deletions(-) Merging mmc/next $ git merge mmc/next Already up-to-date. Merging input/next $ git merge input/next Already up-to-date. Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Auto-merging drivers/block/drbd/drbd_int.h Auto-merging fs/bio.c Merge made by recursive. Documentation/DocBook/tracepoint.tmpl | 13 +++ Documentation/block/biodoc.txt | 4 +- drivers/block/drbd/drbd_actlog.c | 17 +++- drivers/block/drbd/drbd_bitmap.c | 10 +- drivers/block/drbd/drbd_int.h | 12 ++- drivers/block/drbd/drbd_main.c | 20 ++++- drivers/block/drbd/drbd_nl.c | 44 +++++----- drivers/block/drbd/drbd_receiver.c | 34 ++++++- drivers/block/drbd/drbd_worker.c | 18 +++- drivers/block/paride/pcd.c | 4 +- drivers/block/paride/pf.c | 4 +- drivers/block/paride/pt.c | 4 +- fs/bio.c | 4 +- fs/fs-writeback.c | 133 +++++++++++++++------------ include/linux/drbd.h | 2 +- include/linux/drbd_nl.h | 3 +- include/linux/writeback.h | 3 + include/trace/events/block.h | 164 +++++++++++++++++++++++++++++++++ 18 files changed, 375 insertions(+), 118 deletions(-) Merging quilt/device-mapper $ git merge quilt/device-mapper Merge made by recursive. Documentation/device-mapper/dm-flakey.txt | 18 +++ drivers/md/Kconfig | 6 + drivers/md/Makefile | 1 + drivers/md/dm-flakey.c | 214 +++++++++++++++++++++++++++++ 4 files changed, 239 insertions(+), 0 deletions(-) create mode 100644 Documentation/device-mapper/dm-flakey.txt create mode 100644 drivers/md/dm-flakey.c Merging embedded/master $ git merge embedded/master Already up-to-date. Merging firmware/master $ git merge firmware/master Already up-to-date. Merging pcmcia/master $ git merge pcmcia/master Merge made by recursive. drivers/pcmcia/i82092.c | 1 + drivers/pcmcia/i82365.h | 1 + drivers/pcmcia/pcmcia_resource.c | 8 ------ drivers/pcmcia/pd6729.c | 1 + drivers/pcmcia/ti113x.h | 37 ++++++++++++++++++++++++++++- drivers/pcmcia/vrc4171_card.c | 5 ++- drivers/pcmcia/yenta_socket.c | 46 +++++++++++++++++++++++-------------- 7 files changed, 69 insertions(+), 30 deletions(-) Merging battery/master $ git merge battery/master Already up-to-date. Merging leds/for-mm $ git merge leds/for-mm Merge made by recursive. drivers/leds/Kconfig | 80 ++++++++++-------- drivers/leds/Makefile | 1 + drivers/leds/dell-led.c | 200 ++++++++++++++++++++++++++++++++++++++++++++ drivers/leds/led-class.c | 2 +- drivers/leds/leds-ss4200.c | 2 +- 5 files changed, 248 insertions(+), 37 deletions(-) create mode 100644 drivers/leds/dell-led.c Merging backlight/for-mm $ git merge backlight/for-mm Auto-merging drivers/acpi/video.c Auto-merging drivers/platform/x86/panasonic-laptop.c Auto-merging drivers/platform/x86/sony-laptop.c Auto-merging drivers/platform/x86/thinkpad_acpi.c Auto-merging drivers/platform/x86/toshiba_acpi.c Auto-merging drivers/video/bf54x-lq043fb.c Auto-merging drivers/video/bfin-t350mcqb-fb.c Merge made by recursive. drivers/acpi/video.c | 9 +- drivers/gpu/drm/nouveau/nouveau_backlight.c | 12 +- drivers/macintosh/via-pmu-backlight.c | 7 +- drivers/platform/x86/acer-wmi.c | 7 +- drivers/platform/x86/asus-laptop.c | 7 +- drivers/platform/x86/asus_acpi.c | 7 +- drivers/platform/x86/classmate-laptop.c | 8 +- drivers/platform/x86/compal-laptop.c | 11 +- drivers/platform/x86/dell-laptop.c | 13 +- drivers/platform/x86/eeepc-laptop.c | 8 +- drivers/platform/x86/fujitsu-laptop.c | 14 +- drivers/platform/x86/msi-laptop.c | 7 +- drivers/platform/x86/msi-wmi.c | 9 +- drivers/platform/x86/panasonic-laptop.c | 24 +- drivers/platform/x86/sony-laptop.c | 8 +- drivers/platform/x86/thinkpad_acpi.c | 12 +- drivers/platform/x86/toshiba_acpi.c | 10 +- drivers/staging/samsung-laptop/samsung-laptop.c | 7 +- drivers/usb/misc/appledisplay.c | 7 +- drivers/video/atmel_lcdfb.c | 8 +- drivers/video/aty/aty128fb.c | 7 +- drivers/video/aty/atyfb_base.c | 7 +- drivers/video/aty/radeon_backlight.c | 7 +- drivers/video/backlight/88pm860x_bl.c | 6 +- drivers/video/backlight/Kconfig | 7 + drivers/video/backlight/Makefile | 1 + drivers/video/backlight/adp5520_bl.c | 11 +- drivers/video/backlight/adx_bl.c | 10 +- drivers/video/backlight/atmel-pwm-bl.c | 8 +- drivers/video/backlight/backlight.c | 10 +- drivers/video/backlight/corgi_lcd.c | 8 +- drivers/video/backlight/cr_bllcd.c | 8 +- drivers/video/backlight/da903x_bl.c | 7 +- drivers/video/backlight/generic_bl.c | 8 +- drivers/video/backlight/hp680_bl.c | 8 +- drivers/video/backlight/jornada720_bl.c | 7 +- drivers/video/backlight/kb3886_bl.c | 8 +- drivers/video/backlight/l4f00242t03.c | 257 +++++++++++++++++++++++ drivers/video/backlight/locomolcd.c | 8 +- drivers/video/backlight/max8925_bl.c | 6 +- drivers/video/backlight/mbp_nvidia_bl.c | 10 +- drivers/video/backlight/omap1_bl.c | 7 +- drivers/video/backlight/progear_bl.c | 23 ++- drivers/video/backlight/pwm_bl.c | 8 +- drivers/video/backlight/tosa_bl.c | 8 +- drivers/video/backlight/wm831x_bl.c | 7 +- drivers/video/bf54x-lq043fb.c | 9 +- drivers/video/bfin-t350mcqb-fb.c | 9 +- drivers/video/nvidia/nv_backlight.c | 7 +- drivers/video/omap2/displays/panel-taal.c | 15 +- drivers/video/riva/fbdev.c | 7 +- include/linux/backlight.h | 11 +- include/linux/spi/l4f00242t03.h | 31 +++ 53 files changed, 585 insertions(+), 161 deletions(-) create mode 100644 drivers/video/backlight/l4f00242t03.c create mode 100644 include/linux/spi/l4f00242t03.h Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS Auto-merging arch/blackfin/kernel/kgdb.c Auto-merging drivers/gpu/drm/drm_fb_helper.c Auto-merging drivers/gpu/drm/i915/intel_display.c Auto-merging drivers/serial/8250.c Auto-merging drivers/serial/sh-sci.c Auto-merging drivers/video/console/fbcon.c Auto-merging include/linux/serial_core.h Auto-merging init/main.c Auto-merging kernel/Makefile Removing kernel/kgdb.c Auto-merging kernel/module.c Auto-merging kernel/printk.c Auto-merging kernel/sched.c Auto-merging kernel/signal.c Merge made by recursive. Documentation/DocBook/kgdb.tmpl | 773 +++++++--- Documentation/kernel-parameters.txt | 34 +- MAINTAINERS | 6 +- arch/arm/include/asm/kmap_types.h | 1 + arch/arm/kernel/kgdb.c | 5 + arch/blackfin/kernel/kgdb.c | 5 + arch/mips/include/asm/kgdb.h | 2 + arch/mips/kernel/kgdb.c | 27 +- arch/mips/kernel/traps.c | 13 + arch/powerpc/include/asm/kmap_types.h | 1 + arch/powerpc/kernel/kgdb.c | 11 +- arch/powerpc/kernel/traps.c | 7 +- arch/sh/kernel/kgdb.c | 14 +- arch/sparc/kernel/kgdb_32.c | 6 + arch/sparc/kernel/kgdb_64.c | 6 + arch/x86/include/asm/kgdb.h | 3 + arch/x86/include/asm/processor.h | 2 + arch/x86/kernel/cpu/common.c | 29 +- arch/x86/kernel/early_printk.c | 8 + arch/x86/kernel/kgdb.c | 103 +- arch/x86/kernel/setup.c | 1 + arch/x86/kernel/traps.c | 20 +- drivers/char/keyboard.c | 68 +- drivers/gpu/drm/drm_fb_helper.c | 79 + drivers/gpu/drm/i915/intel_display.c | 97 ++ drivers/misc/kgdbts.c | 6 + drivers/serial/8250.c | 4 +- drivers/serial/amba-pl011.c | 6 +- drivers/serial/kgdboc.c | 134 ++- drivers/serial/sh-sci.c | 6 +- drivers/serial/sunzilog.c | 50 + drivers/usb/early/ehci-dbgp.c | 120 ++- drivers/video/console/fbcon.c | 7 + include/asm-generic/kmap_types.h | 3 +- include/drm/drm_crtc_helper.h | 2 + include/drm/drm_fb_helper.h | 4 + include/linux/kbd_kern.h | 1 + include/linux/kdb.h | 117 ++ include/linux/kgdb.h | 83 +- include/linux/serial_core.h | 1 + init/main.c | 2 + kernel/Makefile | 2 +- kernel/debug/Makefile | 8 + kernel/debug/debug_core.c | 1006 ++++++++++++ kernel/debug/debug_core.h | 81 + kernel/debug/gdbstub.c | 1022 ++++++++++++ kernel/debug/kdb/.gitignore | 1 + kernel/debug/kdb/Makefile | 25 + kernel/debug/kdb/kdb_bp.c | 564 +++++++ kernel/debug/kdb/kdb_bt.c | 210 +++ kernel/debug/kdb/kdb_cmds | 35 + kernel/debug/kdb/kdb_debugger.c | 169 ++ kernel/debug/kdb/kdb_io.c | 826 ++++++++++ kernel/debug/kdb/kdb_keyboard.c | 212 +++ kernel/debug/kdb/kdb_main.c | 2852 +++++++++++++++++++++++++++++++++ kernel/debug/kdb/kdb_private.h | 300 ++++ kernel/debug/kdb/kdb_support.c | 926 +++++++++++ kernel/debug/kms_hooks.c | 62 + kernel/kallsyms.c | 21 + kernel/kgdb.c | 1763 -------------------- kernel/module.c | 4 + kernel/printk.c | 25 + kernel/sched.c | 7 +- kernel/signal.c | 40 + lib/Kconfig.kgdb | 24 +- 65 files changed, 9993 insertions(+), 2059 deletions(-) create mode 100644 include/linux/kdb.h create mode 100644 kernel/debug/Makefile create mode 100644 kernel/debug/debug_core.c create mode 100644 kernel/debug/debug_core.h create mode 100644 kernel/debug/gdbstub.c create mode 100644 kernel/debug/kdb/.gitignore create mode 100644 kernel/debug/kdb/Makefile create mode 100644 kernel/debug/kdb/kdb_bp.c create mode 100644 kernel/debug/kdb/kdb_bt.c create mode 100644 kernel/debug/kdb/kdb_cmds create mode 100644 kernel/debug/kdb/kdb_debugger.c create mode 100644 kernel/debug/kdb/kdb_io.c create mode 100644 kernel/debug/kdb/kdb_keyboard.c create mode 100644 kernel/debug/kdb/kdb_main.c create mode 100644 kernel/debug/kdb/kdb_private.h create mode 100644 kernel/debug/kdb/kdb_support.c create mode 100644 kernel/debug/kms_hooks.c delete mode 100644 kernel/kgdb.c Merging slab/for-next $ git merge slab/for-next Merge made by recursive. mm/slab.c | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 170 insertions(+), 32 deletions(-) Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Already up-to-date. Merging mfd/for-next $ git merge mfd/for-next Auto-merging drivers/mfd/sm501.c Merge made by recursive. Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Already up-to-date. Merging voltage/for-next $ git merge voltage/for-next Merge made by recursive. drivers/regulator/lp3971.c | 5 +++++ drivers/regulator/max8925-regulator.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) Merging security-testing/next $ git merge security-testing/next Merge made by recursive. security/integrity/ima/ima_iint.c | 6 +++--- security/integrity/ima/ima_main.c | 2 +- security/keys/keyring.c | 13 +++++-------- security/security.c | 2 +- security/selinux/hooks.c | 2 +- security/selinux/include/initial_sid_to_string.h | 2 +- security/selinux/netlink.c | 1 - security/selinux/nlmsgtab.c | 1 - security/selinux/ss/policydb.c | 2 +- security/selinux/ss/symtab.c | 1 - security/tomoyo/common.c | 10 +++------- 11 files changed, 16 insertions(+), 26 deletions(-) Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging agp/agp-next $ git merge agp/agp-next Merge made by recursive. Merging uwb/for-upstream $ git merge uwb/for-upstream Merge made by recursive. drivers/uwb/hwa-rc.c | 2 +- drivers/uwb/i1480/dfu/usb.c | 12 +++-- drivers/uwb/wlp/messages.c | 106 +++++++++++++++++++++++++------------------ 3 files changed, 69 insertions(+), 51 deletions(-) Merging watchdog/master $ git merge watchdog/master Already up-to-date. Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Merge made by recursive. drivers/pci/dmar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging cputime/cputime $ git merge cputime/cputime Already up-to-date. Merging osd/linux-next $ git merge osd/linux-next Already up-to-date. Merging jc_docs/docs-next $ git merge jc_docs/docs-next Already up-to-date. Merging nommu/master $ git merge nommu/master Already up-to-date. Merging trivial/for-next $ git merge trivial/for-next Already up-to-date. Merging audit/for-next $ git merge audit/for-next Already up-to-date. Merging quilt/aoe $ git merge quilt/aoe Auto-merging drivers/block/aoe/aoecmd.c Merge made by recursive. drivers/block/aoe/aoecmd.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) Merging suspend/linux-next $ git merge suspend/linux-next Merge made by recursive. kernel/power/process.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) Merging bluetooth/master $ git merge bluetooth/master Already up-to-date. Merging fsnotify/for-next $ git merge fsnotify/for-next Recorded preimage for 'kernel/sysctl.c' Resolved 'fs/notify/inotify/inotify_user.c' using previous resolution. Resolved 'include/linux/fsnotify.h' using previous resolution. Resolved 'kernel/audit_tree.c' using previous resolution. Auto-merging Documentation/feature-removal-schedule.txt Auto-merging arch/x86/ia32/ia32entry.S Auto-merging arch/x86/ia32/sys_ia32.c Auto-merging arch/x86/include/asm/sys_ia32.h Auto-merging arch/x86/include/asm/unistd_32.h Auto-merging arch/x86/include/asm/unistd_64.h Auto-merging arch/x86/kernel/syscall_table_32.S Auto-merging fs/compat.c Auto-merging fs/exec.c Auto-merging fs/inode.c Auto-merging fs/namei.c Auto-merging fs/namespace.c Auto-merging fs/nfsd/vfs.c Removing fs/notify/inotify/inotify.c Auto-merging fs/notify/inotify/inotify_user.c CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_user.c Auto-merging fs/open.c Auto-merging include/linux/fs.h Auto-merging include/linux/fsnotify.h CONFLICT (content): Merge conflict in include/linux/fsnotify.h Auto-merging include/linux/mount.h Auto-merging include/linux/security.h Auto-merging include/linux/syscalls.h Auto-merging init/Kconfig Auto-merging kernel/Makefile Auto-merging kernel/audit.c Auto-merging kernel/audit_tree.c CONFLICT (content): Merge conflict in kernel/audit_tree.c Auto-merging kernel/auditsc.c Auto-merging kernel/sys_ni.c Auto-merging kernel/sysctl.c CONFLICT (content): Merge conflict in kernel/sysctl.c Auto-merging security/security.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'kernel/sysctl.c'. [master f505ff3] Merge remote branch 'fsnotify/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/feature-removal-schedule.txt | 8 - arch/x86/ia32/ia32entry.S | 2 + arch/x86/ia32/sys_ia32.c | 9 + arch/x86/include/asm/sys_ia32.h | 3 + arch/x86/include/asm/unistd_32.h | 4 +- arch/x86/include/asm/unistd_64.h | 4 + arch/x86/kernel/syscall_table_32.S | 2 + fs/compat.c | 5 +- fs/exec.c | 4 +- fs/inode.c | 8 +- fs/namei.c | 2 +- fs/namespace.c | 5 + fs/nfsd/vfs.c | 4 +- fs/notify/Kconfig | 1 + fs/notify/Makefile | 4 +- fs/notify/dnotify/dnotify.c | 198 +++---- fs/notify/fanotify/Kconfig | 26 + fs/notify/fanotify/Makefile | 1 + fs/notify/fanotify/fanotify.c | 255 ++++++++ fs/notify/fanotify/fanotify_user.c | 776 +++++++++++++++++++++++ fs/notify/fsnotify.c | 141 ++++- fs/notify/fsnotify.h | 33 +- fs/notify/group.c | 178 +++--- fs/notify/inode_mark.c | 309 +++------- fs/notify/inotify/Kconfig | 15 - fs/notify/inotify/Makefile | 1 - fs/notify/inotify/inotify.c | 933 ---------------------------- fs/notify/inotify/inotify.h | 7 +- fs/notify/inotify/inotify_fsnotify.c | 114 +++- fs/notify/inotify/inotify_user.c | 305 ++++++---- fs/notify/mark.c | 325 ++++++++++ fs/notify/notification.c | 180 +++--- fs/notify/vfsmount_mark.c | 176 ++++++ fs/open.c | 3 +- fs/read_write.c | 8 +- include/asm-generic/fcntl.h | 8 + include/linux/Kbuild | 1 + include/linux/dnotify.h | 1 + include/linux/fanotify.h | 105 ++++ include/linux/fs.h | 16 +- include/linux/fsnotify.h | 164 +++--- include/linux/fsnotify_backend.h | 169 ++++-- include/linux/inotify.h | 175 +----- include/linux/mount.h | 6 +- include/linux/security.h | 1 + include/linux/syscalls.h | 5 + init/Kconfig | 10 +- kernel/Makefile | 5 +- kernel/audit.c | 1 - kernel/audit.h | 26 +- kernel/audit_tree.c | 232 ++++--- kernel/audit_watch.c | 295 +++++---- kernel/auditfilter.c | 39 +- kernel/auditsc.c | 10 +- kernel/sys_ni.c | 4 + kernel/sysctl.c | 8 +- security/security.c | 16 +- 57 files changed, 3097 insertions(+), 2249 deletions(-) create mode 100644 fs/notify/fanotify/Kconfig create mode 100644 fs/notify/fanotify/Makefile create mode 100644 fs/notify/fanotify/fanotify.c create mode 100644 fs/notify/fanotify/fanotify_user.c delete mode 100644 fs/notify/inotify/inotify.c create mode 100644 fs/notify/mark.c create mode 100644 fs/notify/vfsmount_mark.c create mode 100644 include/linux/fanotify.h Merging irda/for-next $ git merge irda/for-next Resolved 'drivers/net/irda/irda-usb.c' using previous resolution. Auto-merging drivers/net/irda/irda-usb.c CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 45b54de] Merge remote branch 'irda/for-next' $ git diff -M --stat --summary HEAD^.. drivers/net/irda/irda-usb.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) Merging hwlat/for-linus $ git merge hwlat/for-linus Resolved 'MAINTAINERS' using previous resolution. Resolved 'drivers/misc/Makefile' using previous resolution. Auto-merging MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merging drivers/misc/Kconfig Auto-merging drivers/misc/Makefile CONFLICT (content): Merge conflict in drivers/misc/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 52c4815] Merge remote branch 'hwlat/for-linus' $ git diff -M --stat --summary HEAD^.. Documentation/hwlat_detector.txt | 64 ++ MAINTAINERS | 9 + drivers/misc/Kconfig | 29 + drivers/misc/Makefile | 1 + drivers/misc/hwlat_detector.c | 1208 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 1311 insertions(+), 0 deletions(-) create mode 100644 Documentation/hwlat_detector.txt create mode 100644 drivers/misc/hwlat_detector.c Merging drbd/for-jens $ git merge drbd/for-jens Already up-to-date. Merging catalin/for-next $ git merge catalin/for-next Already up-to-date. Merging alacrity/linux-next $ git merge alacrity/linux-next Resolved 'include/linux/Kbuild' using previous resolution. Resolved 'lib/Kconfig' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/x86/Kconfig Auto-merging drivers/Makefile Auto-merging drivers/net/Kconfig Auto-merging drivers/net/Makefile Auto-merging include/linux/Kbuild CONFLICT (content): Merge conflict in include/linux/Kbuild Auto-merging lib/Kconfig CONFLICT (content): Merge conflict in lib/Kconfig Auto-merging lib/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 1a59b47] Merge remote branch 'alacrity/linux-next' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 25 + arch/x86/Kconfig | 2 + drivers/Makefile | 1 + drivers/net/Kconfig | 14 + drivers/net/Makefile | 1 + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ drivers/vbus/Kconfig | 25 + drivers/vbus/Makefile | 6 + drivers/vbus/bus-proxy.c | 247 +++++++ drivers/vbus/pci-bridge.c | 1015 ++++++++++++++++++++++++++++ include/linux/Kbuild | 4 + include/linux/ioq.h | 414 ++++++++++++ include/linux/shm_signal.h | 189 ++++++ include/linux/vbus_driver.h | 83 +++ include/linux/vbus_pci.h | 145 ++++ include/linux/venet.h | 133 ++++ lib/Kconfig | 21 + lib/Makefile | 2 + lib/ioq.c | 304 +++++++++ lib/shm_signal.c | 196 ++++++ 20 files changed, 4387 insertions(+), 0 deletions(-) create mode 100644 drivers/net/vbus-enet.c create mode 100644 drivers/vbus/Kconfig create mode 100644 drivers/vbus/Makefile create mode 100644 drivers/vbus/bus-proxy.c create mode 100644 drivers/vbus/pci-bridge.c create mode 100644 include/linux/ioq.h create mode 100644 include/linux/shm_signal.h create mode 100644 include/linux/vbus_driver.h create mode 100644 include/linux/vbus_pci.h create mode 100644 include/linux/venet.h create mode 100644 lib/ioq.c create mode 100644 lib/shm_signal.c Merging i7core_edac/linux_next $ git merge i7core_edac/linux_next Auto-merging Documentation/edac.txt Auto-merging arch/x86/include/asm/pci_x86.h Auto-merging arch/x86/kernel/cpu/mcheck/mce.c Auto-merging arch/x86/pci/legacy.c Auto-merging drivers/edac/edac_core.h Auto-merging drivers/edac/edac_mc_sysfs.c Auto-merging include/linux/pci.h Auto-merging include/linux/pci_ids.h Merge made by recursive. Documentation/edac.txt | 153 +++ arch/x86/include/asm/pci_x86.h | 2 + arch/x86/kernel/cpu/mcheck/mce.c | 10 + arch/x86/pci/legacy.c | 42 +- drivers/edac/Kconfig | 13 + drivers/edac/Makefile | 2 + drivers/edac/edac_core.h | 23 +- drivers/edac/edac_mc_sysfs.c | 175 +++- drivers/edac/edac_mce.c | 61 ++ drivers/edac/i7core_edac.c | 1977 ++++++++++++++++++++++++++++++++++++++ include/linux/edac_mce.h | 31 + include/linux/pci.h | 1 + include/linux/pci_ids.h | 19 + 13 files changed, 2465 insertions(+), 44 deletions(-) create mode 100644 drivers/edac/edac_mce.c create mode 100644 drivers/edac/i7core_edac.c create mode 100644 include/linux/edac_mce.h Merging devicetree/next-devicetree $ git merge devicetree/next-devicetree Already up-to-date. Merging spi/next-spi $ git merge spi/next-spi Already up-to-date. Merging limits/writable_limits $ git merge limits/writable_limits Resolved 'arch/x86/ia32/ia32entry.S' using previous resolution. Resolved 'arch/x86/include/asm/unistd_32.h' using previous resolution. Resolved 'arch/x86/include/asm/unistd_64.h' using previous resolution. Resolved 'arch/x86/kernel/syscall_table_32.S' using previous resolution. Auto-merging Documentation/filesystems/proc.txt Auto-merging arch/x86/ia32/ia32entry.S CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S Auto-merging arch/x86/include/asm/unistd_32.h CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h Auto-merging arch/x86/include/asm/unistd_64.h CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h Auto-merging arch/x86/kernel/syscall_table_32.S CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S Auto-merging fs/proc/base.c Auto-merging include/linux/security.h Auto-merging include/linux/syscalls.h Auto-merging kernel/posix-cpu-timers.c Auto-merging kernel/sys.c Auto-merging security/capability.c Auto-merging security/security.c Auto-merging security/selinux/hooks.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master c8dc1d4] Merge remote branch 'limits/writable_limits' $ git diff -M --stat --summary HEAD^.. Documentation/filesystems/proc.txt | 11 +++ arch/x86/ia32/ia32entry.S | 2 + arch/x86/include/asm/unistd_32.h | 4 +- arch/x86/include/asm/unistd_64.h | 4 + arch/x86/kernel/syscall_table_32.S | 2 + fs/proc/base.c | 101 ++++++++++++++++++++++-- include/asm-generic/unistd.h | 6 +- include/linux/posix-timers.h | 2 +- include/linux/resource.h | 2 + include/linux/security.h | 9 ++- include/linux/syscalls.h | 4 + kernel/compat.c | 98 +++++++++++++++++------- kernel/posix-cpu-timers.c | 10 +- kernel/sys.c | 151 ++++++++++++++++++++++++++++++------ security/capability.c | 3 +- security/security.c | 5 +- security/selinux/hooks.c | 10 ++- 17 files changed, 346 insertions(+), 78 deletions(-) Merging omap_dss2/for-next $ git merge omap_dss2/for-next Merge made by recursive. drivers/video/omap2/vram.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) Merging tip/auto-latest $ git merge tip/auto-latest Auto-merging include/linux/syscalls.h Auto-merging kernel/posix-cpu-timers.c Merge made by recursive. arch/powerpc/kernel/perf_event.c | 21 ++- arch/sh/kernel/perf_event.c | 20 ++- arch/x86/kernel/cpu/perf_event.c | 182 +++++++++++--------- arch/x86/kernel/cpu/perf_event_amd.c | 62 +++---- arch/x86/kernel/cpu/perf_event_intel.c | 57 +++--- arch/x86/kernel/cpu/perf_event_p6.c | 10 +- arch/x86/kernel/dumpstack.h | 15 ++ arch/x86/kernel/dumpstack_64.c | 4 +- include/linux/clockchips.h | 2 + include/linux/ftrace_event.h | 23 ++- include/linux/perf_event.h | 59 ++++++- include/linux/syscalls.h | 24 ++-- include/trace/ftrace.h | 44 +++-- include/trace/syscall.h | 8 +- kernel/irq/chip.c | 31 +++- kernel/irq/manage.c | 18 ++ kernel/kprobes.c | 3 +- kernel/lockdep.c | 9 +- kernel/perf_event.c | 82 ++++----- kernel/posix-cpu-timers.c | 10 +- kernel/time/tick-oneshot.c | 52 +++++-- kernel/time/timer_list.c | 3 +- kernel/timer.c | 1 + kernel/trace/Makefile | 2 +- .../{trace_event_profile.c => trace_event_perf.c} | 48 +++--- kernel/trace/trace_events.c | 2 +- kernel/trace/trace_kprobe.c | 29 ++-- kernel/trace/trace_syscalls.c | 72 ++++---- tools/perf/Documentation/Makefile | 4 +- tools/perf/Makefile | 6 +- tools/perf/builtin-annotate.c | 6 +- tools/perf/builtin-diff.c | 13 +- tools/perf/builtin-probe.c | 1 - tools/perf/builtin-record.c | 13 +- tools/perf/builtin-report.c | 112 +++++++++++-- tools/perf/builtin-stat.c | 10 +- tools/perf/builtin-top.c | 9 +- tools/perf/util/cpumap.c | 59 +++++++ tools/perf/util/cpumap.h | 7 + tools/perf/util/event.h | 9 + tools/perf/util/hist.c | 50 +++--- tools/perf/util/hist.h | 12 +- tools/perf/util/probe-event.c | 2 +- tools/perf/util/probe-finder.c | 5 +- tools/perf/util/session.c | 1 + tools/perf/util/session.h | 1 + tools/perf/util/thread.c | 41 ++++- tools/perf/util/thread.h | 3 + 48 files changed, 832 insertions(+), 425 deletions(-) rename kernel/trace/{trace_event_profile.c => trace_event_perf.c} (69%) create mode 100644 tools/perf/util/cpumap.c create mode 100644 tools/perf/util/cpumap.h $ git reset --hard HEAD^ HEAD is now at 0981e22 Merge remote branch 'omap_dss2/for-next' Merging refs/next/20100311/tip $ git merge refs/next/20100311/tip Auto-merging arch/x86/Kconfig Auto-merging arch/x86/kernel/traps.c Auto-merging include/linux/rbtree.h Auto-merging init/Kconfig Auto-merging kernel/Makefile Auto-merging kernel/sysctl.c Auto-merging lib/Kconfig.debug Merge made by recursive. Documentation/rbtree.txt | 58 ++++++++ arch/mips/include/asm/i8253.h | 2 +- arch/mips/kernel/i8253.c | 14 +- arch/x86/Kconfig | 1 + arch/x86/include/asm/i8253.h | 2 +- arch/x86/include/asm/nmi.h | 2 + arch/x86/kernel/apic/Makefile | 7 +- arch/x86/kernel/apic/hw_nmi.c | 127 +++++++++++++++++ arch/x86/kernel/apic/nmi.c | 7 - arch/x86/kernel/apm_32.c | 4 +- arch/x86/kernel/i8253.c | 14 +- arch/x86/kernel/traps.c | 7 + arch/x86/mm/Makefile | 1 + arch/x86/mm/pat.c | 231 +++---------------------------- arch/x86/mm/pat_internal.h | 46 ++++++ arch/x86/mm/pat_rbtree.c | 273 +++++++++++++++++++++++++++++++++++++ drivers/block/hd.c | 4 +- drivers/input/gameport/gameport.c | 4 +- drivers/input/joystick/analog.c | 4 +- drivers/input/misc/pcspkr.c | 6 +- include/linux/nmi.h | 13 ++ include/linux/rbtree.h | 5 +- init/Kconfig | 5 + kernel/Makefile | 1 + kernel/nmi_watchdog.c | 259 +++++++++++++++++++++++++++++++++++ kernel/sysctl.c | 15 ++- lib/Kconfig.debug | 12 ++ lib/rbtree.c | 48 ++++++- sound/drivers/pcsp/pcsp.h | 2 +- sound/drivers/pcsp/pcsp_input.c | 4 +- sound/drivers/pcsp/pcsp_lib.c | 12 +- 31 files changed, 928 insertions(+), 262 deletions(-) create mode 100644 arch/x86/kernel/apic/hw_nmi.c create mode 100644 arch/x86/mm/pat_internal.h create mode 100644 arch/x86/mm/pat_rbtree.c create mode 100644 kernel/nmi_watchdog.c Merging edac-amd/for-next $ git merge edac-amd/for-next Merge made by recursive. drivers/edac/edac_mce_amd.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) Merging oprofile/for-next $ git merge oprofile/for-next Already up-to-date. Merging percpu/for-next $ git merge percpu/for-next Already up-to-date. Merging workqueues/for-next $ git merge workqueues/for-next Merge made by recursive. kernel/workqueue.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) Merging sfi/sfi-test $ git merge sfi/sfi-test Already up-to-date. Merging asm-generic/next $ git merge asm-generic/next Already up-to-date. Merging hwpoison/hwpoison $ git merge hwpoison/hwpoison Already up-to-date. Merging sysctl/master $ git merge sysctl/master Already up-to-date. Merging quilt/driver-core $ git merge quilt/driver-core Merge made by recursive. drivers/base/core.c | 3 +-- drivers/net/mlx4/mlx4.h | 1 + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1 + drivers/usb/core/usb.c | 2 +- include/linux/device.h | 9 ++++----- 5 files changed, 8 insertions(+), 8 deletions(-) Merging quilt/tty $ git merge quilt/tty Already up-to-date. Merging quilt/usb $ git merge quilt/usb Already up-to-date. Merging quilt/staging $ git merge quilt/staging Already up-to-date. Merging scsi-post-merge/master $ git merge scsi-post-merge/master Already up-to-date.