$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at be1066b Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 Merging origin/master $ git merge origin/master Updating be1066b..d93ac51 Fast-forward arch/mips/Kconfig | 31 ++- arch/mips/Makefile | 13 + arch/mips/alchemy/devboards/db1200/setup.c | 10 +- arch/mips/configs/bcm63xx_defconfig | 418 +++++++++++++++++++----- arch/mips/include/asm/cmpxchg.h | 2 +- arch/mips/include/asm/mach-loongson/loongson.h | 2 +- arch/mips/include/asm/pgtable-64.h | 9 +- arch/mips/include/asm/ptrace.h | 4 +- arch/mips/include/asm/stackframe.h | 2 +- arch/mips/include/asm/uasm.h | 18 + arch/mips/jazz/setup.c | 12 +- arch/mips/kernel/traps.c | 16 +- arch/mips/loongson/common/machtype.c | 2 +- arch/mips/loongson/common/mem.c | 4 +- arch/mips/loongson/common/reset.c | 20 +- arch/mips/loongson/common/setup.c | 15 +- arch/mips/loongson/lemote-2f/irq.c | 2 +- arch/mips/mm/tlbex.c | 140 ++++++--- arch/mips/nxp/pnx8550/common/reset.c | 2 + arch/mips/pci/pci-sb1250.c | 3 +- arch/mips/sgi-ip22/ip22-berr.c | 2 +- arch/mips/sgi-ip22/ip28-berr.c | 2 +- arch/mips/sibyte/swarm/setup.c | 17 +- drivers/dma/txx9dmac.c | 2 + drivers/i2c/busses/i2c-octeon.c | 4 +- drivers/net/phy/mdio-octeon.c | 10 + drivers/pcmcia/db1xxx_ss.c | 16 +- drivers/staging/octeon/cvmx-helper-board.c | 8 + drivers/watchdog/ep93xx_wdt.c | 2 +- fs/ceph/addr.c | 2 +- fs/ceph/auth.c | 1 + fs/ceph/auth_none.h | 2 + fs/ceph/auth_x.c | 32 +-- fs/ceph/caps.c | 2 +- fs/ceph/dir.c | 9 + fs/ceph/file.c | 3 +- fs/ceph/inode.c | 4 + fs/ceph/messenger.c | 22 ++ fs/ceph/snap.c | 24 +- fs/ceph/super.c | 7 +- fs/ceph/super.h | 1 + fs/nilfs2/super.c | 1 + sound/soc/txx9/txx9aclc-ac97.c | 1 + sound/soc/txx9/txx9aclc-generic.c | 1 + 44 files changed, 671 insertions(+), 229 deletions(-) Merging fixes/fixes $ git merge fixes/fixes Already up-to-date. Merging arm-current/master $ git merge arm-current/master Merge made by recursive. arch/arm/include/asm/elf.h | 2 + arch/arm/kernel/entry-armv.S | 4 +- arch/arm/kernel/smp.c | 6 ++++ arch/arm/mach-mx5/clock-mx51.c | 1 + arch/arm/mach-sa1100/Kconfig | 4 +- arch/arm/mach-sa1100/cpu-sa1110.c | 3 ++ arch/arm/plat-pxa/dma.c | 2 +- arch/arm/tools/mach-types | 57 ++++++++++++++++++++++++++++++++++++- 8 files changed, 73 insertions(+), 6 deletions(-) Merging m68k-current/for-linus $ git merge m68k-current/for-linus Already up-to-date. 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 Merge made by recursive. drivers/scsi/advansys.c | 50 +++++++++++++++++++++++++---------- drivers/scsi/libiscsi.c | 2 +- drivers/scsi/libsas/sas_ata.c | 4 +++ drivers/scsi/libsas/sas_scsi_host.c | 4 +++ drivers/scsi/scsi_debug.c | 3 +- 5 files changed, 47 insertions(+), 16 deletions(-) Merging net-current/master $ git merge net-current/master Merge made by recursive. drivers/net/e1000e/netdev.c | 3 + drivers/net/phy/Kconfig | 5 ++ drivers/net/phy/Makefile | 1 + drivers/net/phy/micrel.c | 104 +++++++++++++++++++++++++++++++++++++ drivers/net/ppp_generic.c | 34 ++++++++---- drivers/net/r8169.c | 22 ++++++-- drivers/net/sb1250-mac.c | 67 ++++++++++++------------ drivers/net/usb/Kconfig | 1 - drivers/net/usb/dm9601.c | 2 +- drivers/net/usb/sierra_net.c | 3 + drivers/net/wireless/p54/p54pci.c | 2 +- include/net/sctp/structs.h | 1 + include/net/sock.h | 2 +- net/sctp/sm_make_chunk.c | 62 ++++++++++++++++++++-- 14 files changed, 249 insertions(+), 60 deletions(-) create mode 100644 drivers/net/phy/micrel.c $ 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 ece8a03] Merge remote branch 'net-current/master' 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 Merge made by recursive. drivers/base/cpu.c | 2 +- drivers/base/firmware_class.c | 26 ++++++++++++++++++++------ include/linux/firmware.h | 1 + 3 files changed, 22 insertions(+), 7 deletions(-) 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. $ git am -3 ../patches/staging__update_gfp_slab.h_includes Applying: staging: update gfp/slab.h includes $ git reset HEAD^ Unstaged changes after reset: M drivers/staging/comedi/drivers/quatech_daqp_cs.c $ git add . $ git commit -v -a --amend [master 2ccff40] Merge branch 'quilt/driver-core.current' Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Already up-to-date. Merging input-current/for-linus $ git merge input-current/for-linus Auto-merging drivers/input/mouse/alps.c Auto-merging drivers/input/mouse/synaptics.c Auto-merging drivers/input/touchscreen/eeti_ts.c Merge made by recursive. drivers/input/mouse/alps.c | 1 - drivers/input/mouse/psmouse-base.c | 18 +++++++++-- drivers/input/mouse/psmouse.h | 1 + drivers/input/mouse/synaptics.c | 35 ++++++++++++++++++--- drivers/input/mouse/synaptics.h | 4 ++ drivers/input/touchscreen/eeti_ts.c | 56 ++++++++++++++++++++++++++++------ 6 files changed, 96 insertions(+), 19 deletions(-) Merging md-current/for-linus $ git merge md-current/for-linus Already up-to-date. 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 Merge made by recursive. drivers/ide/ide_platform.c | 1 + include/linux/ide.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging gcl-current/merge $ git merge gcl-current/merge Already up-to-date. Merging arm/devel $ git merge arm/devel 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. Documentation/arm/00-INDEX | 2 + Documentation/arm/SPEAr/overview.txt | 60 + MAINTAINERS | 46 + arch/arm/Kconfig | 118 ++- arch/arm/Makefile | 8 + arch/arm/boot/compressed/Makefile | 1 + arch/arm/boot/compressed/decompress.c | 4 + arch/arm/boot/compressed/piggy.lzma.S | 6 + arch/arm/common/Kconfig | 6 +- arch/arm/common/Makefile | 3 +- arch/arm/common/clkdev.c | 7 +- arch/arm/common/icst.c | 100 ++ arch/arm/common/icst307.c | 161 --- arch/arm/common/icst525.c | 160 --- arch/arm/common/vic.c | 107 +- arch/arm/configs/cns3420vb_defconfig | 831 +++++++++++ arch/arm/configs/spear300_defconfig | 773 +++++++++++ arch/arm/configs/spear310_defconfig | 775 +++++++++++ arch/arm/configs/spear320_defconfig | 775 +++++++++++ arch/arm/configs/spear600_defconfig | 760 ++++++++++ arch/arm/configs/stamp9g20_defconfig | 1456 ++++++++++++++++++++ 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/include/asm/hardware/sp810.h | 59 + arch/arm/include/asm/mach/pci.h | 11 + arch/arm/include/asm/mach/time.h | 2 +- arch/arm/include/asm/pci.h | 15 + arch/arm/include/asm/pmu.h | 5 + arch/arm/include/asm/scatterlist.h | 20 +- arch/arm/kernel/bios32.c | 3 + arch/arm/kernel/dma.c | 36 + arch/arm/kernel/pmu.c | 2 + arch/arm/kernel/time.c | 70 +- arch/arm/mach-at91/Kconfig | 14 + arch/arm/mach-at91/Makefile | 2 + arch/arm/mach-at91/board-stamp9g20.c | 315 +++++ arch/arm/mach-at91/include/mach/cpu.h | 4 +- arch/arm/mach-at91/include/mach/system.h | 7 +- arch/arm/mach-bcmring/arch.c | 16 + arch/arm/mach-cns3xxx/Kconfig | 12 + arch/arm/mach-cns3xxx/Makefile | 2 + arch/arm/mach-cns3xxx/Makefile.boot | 3 + arch/arm/mach-cns3xxx/cns3420vb.c | 148 ++ arch/arm/mach-cns3xxx/core.c | 249 ++++ arch/arm/mach-cns3xxx/core.h | 23 + arch/arm/mach-cns3xxx/include/mach/cns3xxx.h | 635 +++++++++ arch/arm/mach-cns3xxx/include/mach/debug-macro.S | 21 + arch/arm/mach-cns3xxx/include/mach/entry-macro.S | 82 ++ arch/arm/mach-cns3xxx/include/mach/hardware.h | 22 + arch/arm/mach-cns3xxx/include/mach/io.h | 17 + arch/arm/mach-cns3xxx/include/mach/irqs.h | 24 + arch/arm/mach-cns3xxx/include/mach/memory.h | 26 + arch/arm/mach-cns3xxx/include/mach/system.h | 29 + arch/arm/mach-cns3xxx/include/mach/timex.h | 12 + arch/arm/mach-cns3xxx/include/mach/uncompress.h | 55 + arch/arm/mach-cns3xxx/include/mach/vmalloc.h | 11 + arch/arm/mach-cns3xxx/pm.c | 86 ++ arch/arm/mach-ep93xx/adssphere.c | 2 +- arch/arm/mach-ep93xx/core.c | 71 +- arch/arm/mach-ep93xx/edb93xx.c | 4 +- arch/arm/mach-ep93xx/gesbc9312.c | 2 +- arch/arm/mach-ep93xx/include/mach/platform.h | 8 + arch/arm/mach-ep93xx/micro9.c | 2 +- arch/arm/mach-ep93xx/simone.c | 6 +- arch/arm/mach-ep93xx/snappercl15.c | 6 +- arch/arm/mach-ep93xx/ts72xx.c | 2 +- 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-iop32x/n2100.c | 2 +- arch/arm/mach-msm/Kconfig | 2 + arch/arm/mach-nomadik/Kconfig | 1 + arch/arm/mach-nomadik/Makefile | 2 +- arch/arm/mach-nomadik/cpu-8815.c | 83 +- arch/arm/mach-nomadik/include/mach/gpio.h | 67 +- arch/arm/mach-omap2/devices.c | 34 + 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 | 34 +- arch/arm/mach-realview/realview_pb1176.c | 17 +- arch/arm/mach-realview/realview_pb11mp.c | 34 +- arch/arm/mach-realview/realview_pba8.c | 17 +- arch/arm/mach-realview/realview_pbx.c | 32 + arch/arm/mach-spear3xx/Kconfig | 33 + arch/arm/mach-spear3xx/Kconfig300 | 17 + arch/arm/mach-spear3xx/Kconfig310 | 17 + arch/arm/mach-spear3xx/Kconfig320 | 17 + arch/arm/mach-spear3xx/Makefile | 26 + arch/arm/mach-spear3xx/Makefile.boot | 3 + arch/arm/mach-spear3xx/clock.c | 389 ++++++ arch/arm/mach-spear3xx/include/mach/clkdev.h | 19 + arch/arm/mach-spear3xx/include/mach/debug-macro.S | 14 + arch/arm/mach-spear3xx/include/mach/entry-macro.S | 46 + arch/arm/mach-spear3xx/include/mach/generic.h | 205 +++ arch/arm/mach-spear3xx/include/mach/gpio.h | 19 + arch/arm/mach-spear3xx/include/mach/hardware.h | 20 + arch/arm/mach-spear3xx/include/mach/io.h | 19 + arch/arm/mach-spear3xx/include/mach/irqs.h | 65 + arch/arm/mach-spear3xx/include/mach/memory.h | 19 + arch/arm/mach-spear3xx/include/mach/misc_regs.h | 163 +++ arch/arm/mach-spear3xx/include/mach/spear.h | 144 ++ arch/arm/mach-spear3xx/include/mach/spear300.h | 67 + arch/arm/mach-spear3xx/include/mach/spear310.h | 46 + arch/arm/mach-spear3xx/include/mach/spear320.h | 70 + arch/arm/mach-spear3xx/include/mach/system.h | 19 + arch/arm/mach-spear3xx/include/mach/timex.h | 19 + arch/arm/mach-spear3xx/include/mach/uncompress.h | 19 + arch/arm/mach-spear3xx/include/mach/vmalloc.h | 19 + arch/arm/mach-spear3xx/spear300.c | 403 ++++++ arch/arm/mach-spear3xx/spear300_evb.c | 77 + arch/arm/mach-spear3xx/spear310.c | 154 ++ arch/arm/mach-spear3xx/spear310_evb.c | 84 ++ arch/arm/mach-spear3xx/spear320.c | 399 ++++++ arch/arm/mach-spear3xx/spear320_evb.c | 81 ++ arch/arm/mach-spear3xx/spear3xx.c | 548 ++++++++ arch/arm/mach-spear6xx/Kconfig | 20 + arch/arm/mach-spear6xx/Kconfig600 | 17 + arch/arm/mach-spear6xx/Makefile | 12 + arch/arm/mach-spear6xx/Makefile.boot | 3 + arch/arm/mach-spear6xx/clock.c | 483 +++++++ arch/arm/mach-spear6xx/include/mach/clkdev.h | 19 + arch/arm/mach-spear6xx/include/mach/debug-macro.S | 14 + arch/arm/mach-spear6xx/include/mach/entry-macro.S | 55 + arch/arm/mach-spear6xx/include/mach/generic.h | 45 + arch/arm/mach-spear6xx/include/mach/gpio.h | 19 + arch/arm/mach-spear6xx/include/mach/hardware.h | 21 + arch/arm/mach-spear6xx/include/mach/io.h | 20 + arch/arm/mach-spear6xx/include/mach/irqs.h | 96 ++ arch/arm/mach-spear6xx/include/mach/memory.h | 19 + arch/arm/mach-spear6xx/include/mach/misc_regs.h | 173 +++ arch/arm/mach-spear6xx/include/mach/spear.h | 173 +++ arch/arm/mach-spear6xx/include/mach/spear600.h | 21 + arch/arm/mach-spear6xx/include/mach/system.h | 19 + arch/arm/mach-spear6xx/include/mach/timex.h | 19 + arch/arm/mach-spear6xx/include/mach/uncompress.h | 19 + arch/arm/mach-spear6xx/include/mach/vmalloc.h | 19 + arch/arm/mach-spear6xx/spear600.c | 25 + arch/arm/mach-spear6xx/spear600_evb.c | 51 + arch/arm/mach-spear6xx/spear6xx.c | 158 +++ arch/arm/mach-u300/mmc.c | 3 +- arch/arm/mach-ux500/Kconfig | 1 + arch/arm/mach-ux500/board-mop500.c | 20 +- arch/arm/mach-ux500/clock.c | 491 ++++++- arch/arm/mach-ux500/clock.h | 125 ++ arch/arm/mach-ux500/cpu-u8500.c | 143 ++- arch/arm/mach-ux500/include/mach/gpio.h | 12 + arch/arm/mach-ux500/include/mach/hardware.h | 41 +- arch/arm/mach-ux500/include/mach/irqs.h | 8 +- arch/arm/mach-ux500/include/mach/setup.h | 3 + arch/arm/mach-ux500/platsmp.c | 3 +- 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 | 249 ++++ 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 | 47 + 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 | 361 +++++ arch/arm/mm/Kconfig | 5 +- arch/arm/mm/abort-ev7.S | 21 + arch/arm/mm/alignment.c | 53 +- arch/arm/mm/fault-armv.c | 2 - arch/arm/mm/ioremap.c | 6 + arch/arm/plat-iop/Makefile | 2 + arch/arm/plat-iop/pmu.c | 40 + arch/arm/plat-nomadik/Kconfig | 5 + arch/arm/plat-nomadik/Makefile | 1 + arch/arm/{mach-nomadik => plat-nomadik}/gpio.c | 93 +- arch/arm/plat-nomadik/include/plat/gpio.h | 70 + arch/arm/plat-nomadik/timer.c | 125 +- arch/arm/plat-pxa/Makefile | 2 +- arch/arm/plat-pxa/pmu.c | 33 + arch/arm/plat-spear/Kconfig | 31 + arch/arm/plat-spear/Makefile | 6 + arch/arm/plat-spear/clock.c | 435 ++++++ arch/arm/plat-spear/include/plat/clkdev.h | 20 + arch/arm/plat-spear/include/plat/clock.h | 126 ++ arch/arm/plat-spear/include/plat/debug-macro.S | 38 + arch/arm/plat-spear/include/plat/gpio.h | 24 + arch/arm/plat-spear/include/plat/io.h | 22 + arch/arm/plat-spear/include/plat/memory.h | 20 + arch/arm/plat-spear/include/plat/padmux.h | 92 ++ arch/arm/plat-spear/include/plat/system.h | 41 + arch/arm/plat-spear/include/plat/timex.h | 19 + arch/arm/plat-spear/include/plat/uncompress.h | 43 + arch/arm/plat-spear/include/plat/vmalloc.h | 19 + arch/arm/plat-spear/padmux.c | 164 +++ arch/arm/plat-spear/time.c | 292 ++++ 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 +- drivers/mmc/host/mmci.c | 19 +- drivers/mmc/host/mmci.h | 6 +- include/linux/amba/mmci.h | 23 +- 241 files changed, 17421 insertions(+), 1775 deletions(-) create mode 100644 Documentation/arm/SPEAr/overview.txt create mode 100644 arch/arm/boot/compressed/piggy.lzma.S 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/configs/cns3420vb_defconfig create mode 100644 arch/arm/configs/spear300_defconfig create mode 100644 arch/arm/configs/spear310_defconfig create mode 100644 arch/arm/configs/spear320_defconfig create mode 100644 arch/arm/configs/spear600_defconfig create mode 100644 arch/arm/configs/stamp9g20_defconfig 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 create mode 100644 arch/arm/include/asm/hardware/sp810.h create mode 100644 arch/arm/mach-at91/board-stamp9g20.c create mode 100644 arch/arm/mach-cns3xxx/Kconfig create mode 100644 arch/arm/mach-cns3xxx/Makefile create mode 100644 arch/arm/mach-cns3xxx/Makefile.boot create mode 100644 arch/arm/mach-cns3xxx/cns3420vb.c create mode 100644 arch/arm/mach-cns3xxx/core.c create mode 100644 arch/arm/mach-cns3xxx/core.h create mode 100644 arch/arm/mach-cns3xxx/include/mach/cns3xxx.h create mode 100644 arch/arm/mach-cns3xxx/include/mach/debug-macro.S create mode 100644 arch/arm/mach-cns3xxx/include/mach/entry-macro.S create mode 100644 arch/arm/mach-cns3xxx/include/mach/hardware.h create mode 100644 arch/arm/mach-cns3xxx/include/mach/io.h create mode 100644 arch/arm/mach-cns3xxx/include/mach/irqs.h create mode 100644 arch/arm/mach-cns3xxx/include/mach/memory.h create mode 100644 arch/arm/mach-cns3xxx/include/mach/system.h create mode 100644 arch/arm/mach-cns3xxx/include/mach/timex.h create mode 100644 arch/arm/mach-cns3xxx/include/mach/uncompress.h create mode 100644 arch/arm/mach-cns3xxx/include/mach/vmalloc.h create mode 100644 arch/arm/mach-cns3xxx/pm.c 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 create mode 100644 arch/arm/mach-spear3xx/Kconfig create mode 100644 arch/arm/mach-spear3xx/Kconfig300 create mode 100644 arch/arm/mach-spear3xx/Kconfig310 create mode 100644 arch/arm/mach-spear3xx/Kconfig320 create mode 100644 arch/arm/mach-spear3xx/Makefile create mode 100644 arch/arm/mach-spear3xx/Makefile.boot create mode 100644 arch/arm/mach-spear3xx/clock.c create mode 100644 arch/arm/mach-spear3xx/include/mach/clkdev.h create mode 100644 arch/arm/mach-spear3xx/include/mach/debug-macro.S create mode 100644 arch/arm/mach-spear3xx/include/mach/entry-macro.S create mode 100644 arch/arm/mach-spear3xx/include/mach/generic.h create mode 100644 arch/arm/mach-spear3xx/include/mach/gpio.h create mode 100644 arch/arm/mach-spear3xx/include/mach/hardware.h create mode 100644 arch/arm/mach-spear3xx/include/mach/io.h create mode 100644 arch/arm/mach-spear3xx/include/mach/irqs.h create mode 100644 arch/arm/mach-spear3xx/include/mach/memory.h create mode 100644 arch/arm/mach-spear3xx/include/mach/misc_regs.h create mode 100644 arch/arm/mach-spear3xx/include/mach/spear.h create mode 100644 arch/arm/mach-spear3xx/include/mach/spear300.h create mode 100644 arch/arm/mach-spear3xx/include/mach/spear310.h create mode 100644 arch/arm/mach-spear3xx/include/mach/spear320.h create mode 100644 arch/arm/mach-spear3xx/include/mach/system.h create mode 100644 arch/arm/mach-spear3xx/include/mach/timex.h create mode 100644 arch/arm/mach-spear3xx/include/mach/uncompress.h create mode 100644 arch/arm/mach-spear3xx/include/mach/vmalloc.h create mode 100644 arch/arm/mach-spear3xx/spear300.c create mode 100644 arch/arm/mach-spear3xx/spear300_evb.c create mode 100644 arch/arm/mach-spear3xx/spear310.c create mode 100644 arch/arm/mach-spear3xx/spear310_evb.c create mode 100644 arch/arm/mach-spear3xx/spear320.c create mode 100644 arch/arm/mach-spear3xx/spear320_evb.c create mode 100644 arch/arm/mach-spear3xx/spear3xx.c create mode 100644 arch/arm/mach-spear6xx/Kconfig create mode 100644 arch/arm/mach-spear6xx/Kconfig600 create mode 100644 arch/arm/mach-spear6xx/Makefile create mode 100644 arch/arm/mach-spear6xx/Makefile.boot create mode 100644 arch/arm/mach-spear6xx/clock.c create mode 100644 arch/arm/mach-spear6xx/include/mach/clkdev.h create mode 100644 arch/arm/mach-spear6xx/include/mach/debug-macro.S create mode 100644 arch/arm/mach-spear6xx/include/mach/entry-macro.S create mode 100644 arch/arm/mach-spear6xx/include/mach/generic.h create mode 100644 arch/arm/mach-spear6xx/include/mach/gpio.h create mode 100644 arch/arm/mach-spear6xx/include/mach/hardware.h create mode 100644 arch/arm/mach-spear6xx/include/mach/io.h create mode 100644 arch/arm/mach-spear6xx/include/mach/irqs.h create mode 100644 arch/arm/mach-spear6xx/include/mach/memory.h create mode 100644 arch/arm/mach-spear6xx/include/mach/misc_regs.h create mode 100644 arch/arm/mach-spear6xx/include/mach/spear.h create mode 100644 arch/arm/mach-spear6xx/include/mach/spear600.h create mode 100644 arch/arm/mach-spear6xx/include/mach/system.h create mode 100644 arch/arm/mach-spear6xx/include/mach/timex.h create mode 100644 arch/arm/mach-spear6xx/include/mach/uncompress.h create mode 100644 arch/arm/mach-spear6xx/include/mach/vmalloc.h create mode 100644 arch/arm/mach-spear6xx/spear600.c create mode 100644 arch/arm/mach-spear6xx/spear600_evb.c create mode 100644 arch/arm/mach-spear6xx/spear6xx.c create mode 100644 arch/arm/mach-ux500/clock.h create mode 100644 arch/arm/mach-ux500/include/mach/gpio.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-iop/pmu.c rename arch/arm/{mach-nomadik => plat-nomadik}/gpio.c (86%) create mode 100644 arch/arm/plat-nomadik/include/plat/gpio.h create mode 100644 arch/arm/plat-pxa/pmu.c create mode 100644 arch/arm/plat-spear/Kconfig create mode 100644 arch/arm/plat-spear/Makefile create mode 100644 arch/arm/plat-spear/clock.c create mode 100644 arch/arm/plat-spear/include/plat/clkdev.h create mode 100644 arch/arm/plat-spear/include/plat/clock.h create mode 100644 arch/arm/plat-spear/include/plat/debug-macro.S create mode 100644 arch/arm/plat-spear/include/plat/gpio.h create mode 100644 arch/arm/plat-spear/include/plat/io.h create mode 100644 arch/arm/plat-spear/include/plat/memory.h create mode 100644 arch/arm/plat-spear/include/plat/padmux.h create mode 100644 arch/arm/plat-spear/include/plat/system.h create mode 100644 arch/arm/plat-spear/include/plat/timex.h create mode 100644 arch/arm/plat-spear/include/plat/uncompress.h create mode 100644 arch/arm/plat-spear/include/plat/vmalloc.h create mode 100644 arch/arm/plat-spear/padmux.c create mode 100644 arch/arm/plat-spear/time.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 $ git am -3 ../patches/arm__update_gfp_slab.h_includes Applying: arm: update gfp/slab.h includes Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging arch/arm/mach-vexpress/ct-ca9x4.c $ git reset HEAD^ Unstaged changes after reset: M arch/arm/mach-vexpress/ct-ca9x4.c $ git add . $ git commit -v -a --amend [master 6be57b1] Merge remote branch 'arm/devel' Merging davinci/davinci-next $ git merge davinci/davinci-next Auto-merging arch/arm/Kconfig Merge made by recursive. arch/arm/Kconfig | 1 - arch/arm/mach-davinci/Kconfig | 2 + arch/arm/mach-davinci/board-da830-evm.c | 44 ++- arch/arm/mach-davinci/board-da850-evm.c | 20 +- arch/arm/mach-davinci/board-dm355-evm.c | 11 +- arch/arm/mach-davinci/board-dm355-leopard.c | 11 +- arch/arm/mach-davinci/board-dm365-evm.c | 5 - arch/arm/mach-davinci/board-dm644x-evm.c | 53 +-- arch/arm/mach-davinci/board-dm646x-evm.c | 13 +- arch/arm/mach-davinci/board-neuros-osd2.c | 47 +-- arch/arm/mach-davinci/board-sffsdr.c | 13 +- arch/arm/mach-davinci/cdce949.c | 1 + arch/arm/mach-davinci/clock.c | 22 +- arch/arm/mach-davinci/clock.h | 8 +- arch/arm/mach-davinci/cp_intc.c | 6 +- arch/arm/mach-davinci/devices.c | 46 ++ arch/arm/mach-davinci/dm355.c | 2 +- arch/arm/mach-davinci/dm365.c | 3 +- arch/arm/mach-davinci/dm644x.c | 4 +- arch/arm/mach-davinci/dm646x.c | 36 +-- arch/arm/mach-davinci/dma.c | 11 +- arch/arm/mach-davinci/gpio.c | 41 +- arch/arm/mach-davinci/include/mach/common.h | 4 + arch/arm/mach-davinci/include/mach/cp_intc.h | 2 +- arch/arm/mach-davinci/include/mach/cputype.h | 8 + arch/arm/mach-davinci/include/mach/da8xx.h | 6 - arch/arm/mach-davinci/include/mach/dm355.h | 3 + arch/arm/mach-davinci/include/mach/dm365.h | 4 + arch/arm/mach-davinci/include/mach/dm644x.h | 6 + arch/arm/mach-davinci/include/mach/dm646x.h | 4 +- arch/arm/mach-davinci/include/mach/gpio.h | 8 +- arch/arm/mach-davinci/include/mach/irqs.h | 97 ++++ arch/arm/mach-davinci/include/mach/mux.h | 275 +++++++++++ arch/arm/mach-davinci/include/mach/psc.h | 55 ++- arch/arm/mach-davinci/mux.c | 2 +- arch/arm/mach-davinci/psc.c | 3 +- arch/arm/mach-davinci/time.c | 6 +- drivers/rtc/Kconfig | 10 + drivers/rtc/Makefile | 1 + drivers/rtc/rtc-davinci.c | 673 ++++++++++++++++++++++++++ drivers/rtc/rtc-omap.c | 12 +- 41 files changed, 1339 insertions(+), 240 deletions(-) create mode 100644 drivers/rtc/rtc-davinci.c $ git am -3 ../patches/davinci__update_gfp_slab.h_includes Applying: davinci: update gfp/slab.h includes $ git reset HEAD^ Unstaged changes after reset: M drivers/rtc/rtc-davinci.c $ git add . $ git commit -v -a --amend [master 8755eb6] Merge remote branch 'davinci/davinci-next' Merging i.MX/for-next $ git merge i.MX/for-next Auto-merging arch/arm/mach-mx5/clock-mx51.c Merge made by recursive. arch/arm/configs/mx51_defconfig | 17 +++- arch/arm/mach-mx3/Kconfig | 1 + arch/arm/mach-mx3/devices.c | 19 ++++ arch/arm/mach-mx3/devices.h | 1 + arch/arm/mach-mx3/mach-mx31lilly.c | 145 +++++++++++++++++++++++++++ arch/arm/mach-mx3/mx31lite-db.c | 1 + arch/arm/mach-mx5/board-mx51_babbage.c | 129 ++++++++++++++++++++++++ arch/arm/mach-mx5/clock-mx51.c | 8 ++ arch/arm/mach-mx5/devices.c | 82 +++++++++++++++- arch/arm/mach-mx5/devices.h | 2 + arch/arm/plat-mxc/ehci.c | 100 ++++++++++++++++++- arch/arm/plat-mxc/gpio.c | 5 +- arch/arm/plat-mxc/include/mach/iomux-mx51.h | 33 ++++--- arch/arm/plat-mxc/include/mach/mxc_ehci.h | 14 +++- arch/arm/plat-mxc/time.c | 46 ++++---- arch/arm/plat-mxc/tzic.c | 4 +- drivers/mmc/core/sdio.c | 6 + drivers/mmc/host/mxcmmc.c | 103 ++++++++++++++++--- drivers/mtd/nand/mxc_nand.c | 125 +++++++++++++---------- drivers/usb/host/ehci-mxc.c | 4 +- include/linux/mmc/host.h | 3 + 21 files changed, 730 insertions(+), 118 deletions(-) Merging msm/for-next $ git merge msm/for-next Recorded preimage for 'arch/arm/mach-msm/Kconfig' Auto-merging MAINTAINERS Auto-merging arch/arm/mach-msm/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-msm/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/arm/mach-msm/Kconfig'. [master 3eb2655] Merge remote branch 'msm/for-next' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 1 + arch/arm/mach-msm/Kconfig | 26 +- arch/arm/mach-msm/Makefile | 7 +- 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} | 6 +- arch/arm/mach-msm/{board-dream.h => board-trout.h} | 0 arch/arm/mach-msm/devices.c | 78 ++ arch/arm/mach-msm/dma.c | 28 +- arch/arm/mach-msm/include/mach/board.h | 11 +- arch/arm/mach-msm/include/mach/dma.h | 2 + arch/arm/mach-msm/include/mach/msm_fb.h | 147 +++ arch/arm/mach-msm/include/mach/msm_iomap.h | 6 + arch/arm/mach-msm/include/mach/msm_smd.h | 109 ++ arch/arm/mach-msm/include/mach/system.h | 5 + arch/arm/mach-msm/include/mach/vreg.h | 2 +- arch/arm/mach-msm/io.c | 3 + arch/arm/mach-msm/irq.c | 4 +- arch/arm/mach-msm/last_radio_log.c | 82 ++ arch/arm/mach-msm/proc_comm.c | 26 +- arch/arm/mach-msm/proc_comm.h | 105 ++- arch/arm/mach-msm/smd.c | 1046 ++++++++++++++++++++ arch/arm/mach-msm/smd_debug.c | 315 ++++++ arch/arm/mach-msm/smd_private.h | 403 ++++++++ arch/arm/mach-msm/vreg.c | 154 +++- drivers/mmc/host/msm_sdcc.c | 472 ++++++---- drivers/mmc/host/msm_sdcc.h | 15 +- drivers/video/Kconfig | 1 - include/linux/msm_mdp.h | 78 ++ 35 files changed, 4213 insertions(+), 248 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} (95%) rename arch/arm/mach-msm/{board-dream.h => board-trout.h} (100%) create mode 100644 arch/arm/mach-msm/include/mach/msm_fb.h create mode 100644 arch/arm/mach-msm/include/mach/msm_smd.h create mode 100644 arch/arm/mach-msm/last_radio_log.c create mode 100644 arch/arm/mach-msm/smd.c create mode 100644 arch/arm/mach-msm/smd_debug.c create mode 100644 arch/arm/mach-msm/smd_private.h create mode 100644 include/linux/msm_mdp.h Merging omap/for-next $ git merge omap/for-next Merge made by recursive. arch/arm/configs/omap3_defconfig | 34 ++++------ arch/arm/kernel/head.S | 10 +++ arch/arm/mach-omap2/board-4430sdp.c | 3 + arch/arm/mach-omap2/board-cm-t35.c | 1 + arch/arm/mach-omap2/board-zoom-debugboard.c | 2 +- arch/arm/mach-omap2/include/mach/debug-macro.S | 4 +- arch/arm/mach-omap2/io.c | 9 +++ arch/arm/mach-omap2/mux34xx.c | 86 ------------------------ arch/arm/plat-omap/include/plat/multi.h | 16 +++- arch/arm/plat-omap/include/plat/serial.h | 2 +- arch/arm/plat-omap/sram.c | 16 ++++- 11 files changed, 68 insertions(+), 115 deletions(-) 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 Already up-to-date. Merging cris/for-next $ git merge cris/for-next Merge made by recursive. arch/cris/arch-v10/drivers/ds1302.c | 20 +++++++++++++++----- arch/cris/arch-v10/drivers/pcf8563.c | 19 +++++++++++++++---- arch/cris/arch-v32/drivers/i2c.c | 22 ++++++++++++++-------- arch/cris/arch-v32/drivers/pcf8563.c | 21 ++++++++++++++++----- 4 files changed, 60 insertions(+), 22 deletions(-) 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 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/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 ++++++++- 20 files changed, 1249 insertions(+), 102 deletions(-) create mode 100644 arch/m68k/include/asm/mcfqspi.h Merging microblaze/next $ git merge microblaze/next Merge made by recursive. arch/microblaze/include/asm/cache.h | 2 +- arch/microblaze/include/asm/dma.h | 6 + arch/microblaze/include/asm/exceptions.h | 6 - arch/microblaze/include/asm/io.h | 2 - arch/microblaze/include/asm/page.h | 12 +-- arch/microblaze/include/asm/pci.h | 8 -- arch/microblaze/include/asm/pgalloc.h | 16 +--- arch/microblaze/include/asm/pgtable.h | 35 +----- arch/microblaze/kernel/asm-offsets.c | 1 + arch/microblaze/kernel/cpu/cache.c | 72 ++++++----- arch/microblaze/kernel/cpu/mb.c | 10 +- arch/microblaze/kernel/dma.c | 2 +- arch/microblaze/kernel/entry-nommu.S | 2 + arch/microblaze/kernel/exceptions.c | 2 +- arch/microblaze/kernel/head.S | 3 +- arch/microblaze/kernel/irq.c | 3 +- arch/microblaze/kernel/microblaze_ksyms.c | 10 ++ arch/microblaze/kernel/misc.S | 36 ------ arch/microblaze/kernel/traps.c | 34 ----- arch/microblaze/kernel/vmlinux.lds.S | 3 +- arch/microblaze/mm/consistent.c | 190 +++++++++++++++-------------- arch/microblaze/mm/fault.c | 13 +-- arch/microblaze/mm/pgtable.c | 51 +++------ arch/microblaze/pci/pci-common.c | 17 ++-- 24 files changed, 206 insertions(+), 330 deletions(-) Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Merge made by recursive. drivers/video/tdfxfb.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Merging parisc/next $ git merge parisc/next Already up-to-date. Merging powerpc/next $ git merge powerpc/next Auto-merging drivers/misc/Makefile Removing drivers/misc/hdpuftrs/Makefile Removing drivers/misc/hdpuftrs/hdpu_cpustate.c Removing drivers/misc/hdpuftrs/hdpu_nexus.c Removing include/linux/hdpu_features.h Merge made by recursive. arch/powerpc/Kconfig | 1 + arch/powerpc/boot/Makefile | 4 +- arch/powerpc/boot/wrapper | 6 +- arch/powerpc/include/asm/hvcall.h | 1 + arch/powerpc/include/asm/pgtable-ppc32.h | 2 +- arch/powerpc/include/asm/ptrace.h | 64 +++++++ arch/powerpc/include/asm/topology.h | 10 + arch/powerpc/kernel/exceptions-64s.S | 13 ++- arch/powerpc/kernel/head_8xx.S | 70 ++++++--- arch/powerpc/kernel/lparcfg.c | 12 ++- arch/powerpc/kernel/ptrace.c | 103 ++++++++++++ arch/powerpc/kernel/rtas.c | 15 +- arch/powerpc/kernel/smp.c | 4 +- arch/powerpc/kernel/vio.c | 49 ++++++- arch/powerpc/lib/string.S | 4 +- arch/powerpc/mm/fault.c | 5 +- arch/powerpc/mm/pgtable_32.c | 8 + arch/powerpc/mm/pgtable_64.c | 8 + arch/powerpc/platforms/iseries/pci.c | 10 +- arch/powerpc/platforms/powermac/low_i2c.c | 7 +- arch/powerpc/platforms/pseries/dlpar.c | 8 +- drivers/macintosh/macio-adb.c | 1 + drivers/macintosh/smu.c | 4 +- drivers/macintosh/therm_adt746x.c | 2 + drivers/macintosh/windfarm_pm81.c | 6 +- drivers/macintosh/windfarm_pm91.c | 9 +- drivers/misc/Makefile | 1 - drivers/misc/hdpuftrs/Makefile | 1 - drivers/misc/hdpuftrs/hdpu_cpustate.c | 256 ----------------------------- drivers/misc/hdpuftrs/hdpu_nexus.c | 149 ----------------- drivers/serial/mpsc.c | 1 + include/linux/hdpu_features.h | 26 --- sound/aoa/core/gpio-pmf.c | 9 +- 33 files changed, 363 insertions(+), 506 deletions(-) delete mode 100644 drivers/misc/hdpuftrs/Makefile delete mode 100644 drivers/misc/hdpuftrs/hdpu_cpustate.c delete mode 100644 drivers/misc/hdpuftrs/hdpu_nexus.c delete mode 100644 include/linux/hdpu_features.h Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging 52xx-and-virtex/next $ git merge 52xx-and-virtex/next Merge made by recursive. arch/powerpc/platforms/512x/Kconfig | 13 +-- drivers/serial/mpc52xx_uart.c | 145 ++++++++++++++++++++++++++++------- 2 files changed, 120 insertions(+), 38 deletions(-) Merging galak/next $ git merge galak/next Already up-to-date. Merging s390/features $ git merge s390/features Merge made by recursive. arch/s390/Makefile | 6 + arch/s390/hypfs/inode.c | 2 +- arch/s390/include/asm/lowcore.h | 48 +++---- arch/s390/include/asm/system.h | 5 - arch/s390/include/asm/topology.h | 2 + arch/s390/kernel/asm-offsets.c | 1 - arch/s390/kernel/debug.c | 1 + arch/s390/kernel/entry.S | 268 ++++++++++++++++------------------- arch/s390/kernel/entry64.S | 291 +++++++++++++++++--------------------- arch/s390/kernel/head.S | 4 +- arch/s390/kernel/processor.c | 37 +++-- arch/s390/kernel/setup.c | 24 +--- arch/s390/kernel/topology.c | 7 +- arch/s390/kernel/vdso.c | 4 - drivers/s390/char/Kconfig | 3 +- drivers/s390/char/fs3270.c | 1 + drivers/s390/char/vmcp.c | 38 +---- drivers/s390/char/zcore.c | 4 +- drivers/s390/cio/chsc_sch.c | 1 + drivers/s390/cio/css.c | 8 +- drivers/s390/crypto/zcrypt_api.c | 2 +- drivers/s390/scsi/zfcp_cfdc.c | 1 + 22 files changed, 345 insertions(+), 413 deletions(-) Merging sh/master $ git merge sh/master Merge made by recursive. arch/sh/Kconfig | 26 ++- arch/sh/Makefile | 1 - arch/sh/boards/board-urquell.c | 3 + arch/sh/boards/mach-sdk7786/setup.c | 17 + arch/sh/boards/mach-x3proto/setup.c | 7 + arch/sh/boot/compressed/Makefile | 6 + arch/sh/boot/compressed/head_32.S | 4 + arch/sh/configs/rts7751r2d1_defconfig | 2 +- arch/sh/configs/rts7751r2dplus_defconfig | 2 +- arch/sh/configs/sdk7786_defconfig | 636 +++++++++++++++++++--------- arch/sh/drivers/pci/pci-sh7751.c | 5 +- arch/sh/include/asm/cache.h | 4 - arch/sh/include/asm/clkdev.h | 35 ++ arch/sh/include/asm/clock.h | 7 - arch/sh/include/asm/dmaengine.h | 63 +--- arch/sh/include/asm/hw_breakpoint.h | 1 - arch/sh/include/asm/irq.h | 19 + arch/sh/include/asm/page.h | 13 +- arch/sh/include/asm/processor.h | 7 + arch/sh/include/asm/processor_32.h | 2 - arch/sh/include/asm/siu.h | 8 +- arch/sh/include/asm/smp-ops.h | 51 +++ arch/sh/include/asm/smp.h | 40 ++- arch/sh/include/cpu-sh4/cpu/dma-register.h | 5 +- arch/sh/include/cpu-sh4/cpu/mmu_context.h | 18 +- arch/sh/include/mach-sdk7786/mach/fpga.h | 9 + arch/sh/kernel/Makefile | 2 +- arch/sh/kernel/clkdev.c | 169 ++++++++ arch/sh/kernel/cpu/clock-cpg.c | 5 + arch/sh/kernel/cpu/clock.c | 55 +--- arch/sh/kernel/cpu/init.c | 24 +- arch/sh/kernel/cpu/sh2/probe.c | 5 +- arch/sh/kernel/cpu/sh2/setup-sh7619.c | 6 - arch/sh/kernel/cpu/sh2a/probe.c | 4 +- arch/sh/kernel/cpu/sh2a/setup-mxg.c | 9 - arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 9 - arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 12 - arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 15 - arch/sh/kernel/cpu/sh3/probe.c | 4 +- arch/sh/kernel/cpu/sh3/setup-sh7705.c | 9 - arch/sh/kernel/cpu/sh3/setup-sh770x.c | 9 - arch/sh/kernel/cpu/sh3/setup-sh7710.c | 9 - arch/sh/kernel/cpu/sh3/setup-sh7720.c | 24 - arch/sh/kernel/cpu/sh4/probe.c | 4 +- arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 9 - arch/sh/kernel/cpu/sh4/setup-sh7750.c | 15 - arch/sh/kernel/cpu/sh4/setup-sh7760.c | 9 - arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 12 +- arch/sh/kernel/cpu/sh4a/clock-sh7366.c | 10 +- arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 10 +- arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 58 ++- arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 56 ++- arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 51 ++- arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 80 ++++- arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 16 - arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 13 - arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 21 +- arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 27 -- arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 81 +---- arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 6 - arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 18 - arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 27 -- arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 24 +- arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 30 +-- arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 157 +++++-- arch/sh/kernel/cpu/sh4a/setup-shx3.c | 18 - arch/sh/kernel/cpu/sh4a/smp-shx3.c | 74 +++- arch/sh/kernel/cpu/sh5/probe.c | 4 +- arch/sh/kernel/cpu/sh5/setup-sh5.c | 9 - arch/sh/kernel/dwarf.c | 1 + arch/sh/kernel/head_32.S | 7 +- arch/sh/kernel/hw_breakpoint.c | 5 - arch/sh/kernel/idle.c | 8 +- arch/sh/kernel/irq.c | 91 +++- arch/sh/kernel/localtimer.c | 6 +- arch/sh/kernel/process.c | 2 +- arch/sh/kernel/setup.c | 3 +- arch/sh/kernel/smp.c | 160 ++++++- arch/sh/kernel/topology.c | 6 +- arch/sh/mm/Makefile | 9 +- arch/sh/mm/cache-shx3.c | 44 ++ arch/sh/mm/cache.c | 7 + arch/sh/mm/fault_32.c | 14 +- arch/sh/mm/pmb.c | 2 +- arch/sh/mm/tlb-debugfs.c | 179 ++++++++ arch/sh/mm/tlbflush_64.c | 20 +- drivers/base/platform.c | 20 + drivers/clocksource/sh_cmt.c | 45 +- drivers/clocksource/sh_mtu2.c | 37 +- drivers/clocksource/sh_tmu.c | 41 +- drivers/dma/shdma.c | 52 ++- drivers/dma/shdma.h | 4 +- drivers/serial/sh-sci.c | 189 ++++++--- drivers/sh/Kconfig | 24 + drivers/sh/intc.c | 333 +++++++++++++-- include/linux/device.h | 4 + include/linux/serial_sci.h | 4 +- include/linux/sh_dma.h | 102 +++++ include/linux/sh_intc.h | 26 +- 99 files changed, 2500 insertions(+), 1145 deletions(-) create mode 100644 arch/sh/include/asm/clkdev.h create mode 100644 arch/sh/include/asm/smp-ops.h create mode 100644 arch/sh/kernel/clkdev.c create mode 100644 arch/sh/mm/cache-shx3.c create mode 100644 arch/sh/mm/tlb-debugfs.c create mode 100644 drivers/sh/Kconfig create mode 100644 include/linux/sh_dma.h Merging genesis/master $ git merge genesis/master Auto-merging MAINTAINERS Auto-merging drivers/dma/shdma.c Auto-merging drivers/i2c/busses/Kconfig Merge made by recursive. MAINTAINERS | 3 +- arch/arm/mach-shmobile/board-ap4evb.c | 106 +++++++++- arch/arm/mach-shmobile/board-g4evm.c | 127 +++++++++++ arch/arm/mach-shmobile/include/mach/irqs.h | 6 + arch/arm/mach-shmobile/include/mach/memory.h | 3 + arch/arm/mach-shmobile/include/mach/vmalloc.h | 3 +- arch/arm/mach-shmobile/intc-sh7367.c | 178 ++++++++++++++- arch/arm/mach-shmobile/intc-sh7372.c | 12 +- arch/arm/mach-shmobile/intc-sh7377.c | 300 ++++++++++++++++++++++++- arch/arm/mach-shmobile/setup-sh7372.c | 47 ++++ drivers/dma/Kconfig | 2 +- drivers/dma/shdma.c | 8 +- drivers/i2c/busses/Kconfig | 2 +- drivers/i2c/busses/i2c-sh_mobile.c | 121 +++++++--- include/linux/serial_sci.h | 2 +- 15 files changed, 856 insertions(+), 64 deletions(-) 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 Auto-merging fs/ceph/addr.c Auto-merging fs/ceph/auth.c Auto-merging fs/ceph/auth_x.c Auto-merging fs/ceph/caps.c Auto-merging fs/ceph/dir.c Auto-merging fs/ceph/export.c Auto-merging fs/ceph/file.c Auto-merging fs/ceph/inode.c Auto-merging fs/ceph/mds_client.c Auto-merging fs/ceph/messenger.c Auto-merging fs/ceph/mon_client.c Auto-merging fs/ceph/pagelist.c Auto-merging fs/ceph/snap.c Auto-merging fs/ceph/super.c Auto-merging fs/ceph/super.h Auto-merging fs/ceph/xattr.c Merge made by recursive. fs/ceph/addr.c | 11 +-- fs/ceph/caps.c | 21 +++--- fs/ceph/dir.c | 10 ++-- fs/ceph/export.c | 14 ++-- fs/ceph/file.c | 8 +- fs/ceph/inode.c | 10 ++-- fs/ceph/ioctl.c | 2 +- fs/ceph/mds_client.c | 65 ++++++++--------- fs/ceph/messenger.c | 44 +++++------- fs/ceph/messenger.h | 5 +- fs/ceph/mon_client.c | 187 +++++++++++++++++++++++++++++-------------------- fs/ceph/mon_client.h | 12 +-- fs/ceph/msgpool.c | 171 ++++++--------------------------------------- fs/ceph/msgpool.h | 8 +-- fs/ceph/osd_client.c | 88 ++++++++---------------- fs/ceph/pagelist.c | 2 +- fs/ceph/snap.c | 2 +- fs/ceph/super.c | 24 +++---- fs/ceph/super.h | 6 -- fs/ceph/xattr.c | 12 +--- 20 files changed, 271 insertions(+), 431 deletions(-) Merging cifs/master $ git merge cifs/master Auto-merging fs/cifs/cifsfs.c Merge made by recursive. fs/cifs/asn1.c | 73 +++---- fs/cifs/cifs_debug.c | 48 ++-- fs/cifs/cifs_debug.h | 42 +++- fs/cifs/cifs_dfs_ref.c | 34 ++-- fs/cifs/cifs_spnego.c | 2 +- fs/cifs/cifs_unicode.c | 5 +- fs/cifs/cifsacl.c | 76 ++++---- fs/cifs/cifsencrypt.c | 10 +- fs/cifs/cifsfs.c | 51 ++--- fs/cifs/cifsfs.h | 2 +- fs/cifs/cifsglob.h | 3 +- fs/cifs/cifsproto.h | 23 ++- fs/cifs/cifssmb.c | 422 ++++++++++++++++++------------------ fs/cifs/connect.c | 565 ++++++++++++++++++++++++++---------------------- fs/cifs/dir.c | 63 +++--- fs/cifs/dns_resolve.c | 16 +- fs/cifs/export.c | 2 +- fs/cifs/file.c | 217 +++++++++---------- fs/cifs/inode.c | 104 +++++----- fs/cifs/ioctl.c | 10 +- fs/cifs/link.c | 10 +- fs/cifs/misc.c | 81 ++++---- fs/cifs/netmisc.c | 16 +- fs/cifs/readdir.c | 85 ++++---- fs/cifs/sess.c | 79 ++++--- fs/cifs/transport.c | 91 ++++---- fs/cifs/xattr.c | 40 ++-- 27 files changed, 1109 insertions(+), 1061 deletions(-) Merging configfs/linux-next $ git merge configfs/linux-next Already up-to-date. Merging ecryptfs/next $ git merge ecryptfs/next Auto-merging fs/ecryptfs/main.c Merge made by recursive. fs/ecryptfs/main.c | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) Merging ext3/for_next $ git merge ext3/for_next Merge made by recursive. Documentation/filesystems/ext3.txt | 15 ++++- fs/ext2/balloc.c | 6 ++ fs/ext2/ialloc.c | 9 +-- fs/ext2/inode.c | 5 +- fs/ext2/super.c | 99 +++++++++++++------------------ fs/ext2/xattr.c | 2 + fs/ext3/balloc.c | 6 ++ fs/ext3/fsync.c | 20 +++---- fs/ext3/super.c | 77 ++++++++++++++--------- fs/jbd/commit.c | 8 ++- fs/jbd/journal.c | 33 ++++++++++ fs/quota/dquot.c | 117 +++++++++++++++++++++++++----------- fs/quota/quota_tree.c | 4 +- fs/quota/quota_v1.c | 4 +- fs/ufs/inode.c | 2 +- fs/ufs/namei.c | 2 +- fs/ufs/symlink.c | 8 +++ fs/ufs/truncate.c | 2 +- fs/ufs/ufs.h | 2 + include/linux/ext2_fs_sb.h | 9 +++ include/linux/jbd.h | 3 +- include/linux/quota.h | 42 ++++++++++--- 22 files changed, 313 insertions(+), 162 deletions(-) Merging ext4/next $ git merge ext4/next Auto-merging fs/ext4/inode.c Auto-merging fs/ext4/mballoc.c Auto-merging fs/ext4/move_extent.c Merge made by recursive. fs/ext4/extents.c | 82 +++++++++++++++++++++++++++++++++++-------------- fs/ext4/fsync.c | 2 +- fs/ext4/ialloc.c | 81 ++++++++++++++++++++++-------------------------- fs/ext4/inode.c | 12 ++++++- fs/ext4/ioctl.c | 2 + fs/ext4/mballoc.c | 34 +++++++++++--------- fs/ext4/move_extent.c | 1 + fs/ext4/resize.c | 3 +- fs/ext4/super.c | 20 ++++++------ fs/ext4/symlink.c | 2 + fs/jbd2/transaction.c | 5 +-- 11 files changed, 145 insertions(+), 99 deletions(-) Merging fatfs/master $ git merge fatfs/master Merge made by recursive. fs/fat/dir.c | 17 ++++++----------- fs/fat/inode.c | 6 ++---- 2 files changed, 8 insertions(+), 15 deletions(-) Merging fuse/for-next $ git merge fuse/for-next Already up-to-date. Merging gfs2/master $ git merge gfs2/master Auto-merging fs/gfs2/bmap.c Auto-merging fs/gfs2/export.c Merge made by recursive. Documentation/filesystems/gfs2.txt | 12 ++-- fs/gfs2/aops.c | 8 ++- fs/gfs2/bmap.c | 17 ++++--- fs/gfs2/dir.c | 2 +- fs/gfs2/export.c | 2 +- fs/gfs2/glock.c | 3 + fs/gfs2/inode.c | 101 ++++++++++++++++++++++++++++++++--- fs/gfs2/inode.h | 5 +- fs/gfs2/main.c | 2 +- fs/gfs2/ops_fstype.c | 2 +- fs/gfs2/rgrp.c | 58 +++++++++++++++----- 11 files changed, 166 insertions(+), 46 deletions(-) Merging jfs/next $ git merge jfs/next Already up-to-date. Merging logfs/master $ git merge logfs/master Merge made by recursive. fs/logfs/inode.c | 2 +- fs/logfs/readwrite.c | 4 +++- fs/logfs/super.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) Merging nfs/linux-next $ git merge nfs/linux-next Merge made by recursive. fs/nfs/client.c | 55 ++- fs/nfs/delegation.c | 86 +++-- fs/nfs/dir.c | 62 +++- fs/nfs/file.c | 15 +- fs/nfs/getroot.c | 191 ++++------ fs/nfs/inode.c | 58 +++- fs/nfs/internal.h | 4 +- fs/nfs/namespace.c | 20 +- fs/nfs/nfs3acl.c | 23 +- fs/nfs/nfs3proc.c | 128 ++++--- fs/nfs/nfs3xdr.c | 2 +- fs/nfs/nfs4_fs.h | 4 +- fs/nfs/nfs4namespace.c | 12 +- fs/nfs/nfs4proc.c | 99 +++-- fs/nfs/nfs4state.c | 15 +- fs/nfs/nfs4xdr.c | 22 +- fs/nfs/nfsroot.c | 14 +- fs/nfs/proc.c | 144 ++++--- fs/nfs/super.c | 129 ++++++- fs/nfs/unlink.c | 4 +- include/linux/nfs_fs.h | 14 + include/linux/nfs_fs_sb.h | 1 - include/linux/nfs_xdr.h | 7 +- include/linux/sunrpc/gss_api.h | 2 + include/linux/sunrpc/gss_krb5.h | 183 +++++++++- include/linux/sunrpc/xprt.h | 3 +- net/sunrpc/auth_gss/Makefile | 2 +- net/sunrpc/auth_gss/auth_gss.c | 22 +- net/sunrpc/auth_gss/gss_krb5_crypto.c | 697 ++++++++++++++++++++++++++++++++- net/sunrpc/auth_gss/gss_krb5_keys.c | 335 ++++++++++++++++ net/sunrpc/auth_gss/gss_krb5_mech.c | 582 +++++++++++++++++++++++++-- net/sunrpc/auth_gss/gss_krb5_seal.c | 155 ++++++-- net/sunrpc/auth_gss/gss_krb5_seqnum.c | 83 ++++- net/sunrpc/auth_gss/gss_krb5_unseal.c | 113 +++++- net/sunrpc/auth_gss/gss_krb5_wrap.c | 404 ++++++++++++++++--- net/sunrpc/auth_gss/gss_mech_switch.c | 14 + net/sunrpc/auth_gss/svcauth_gss.c | 15 + net/sunrpc/clnt.c | 19 +- net/sunrpc/sched.c | 13 +- net/sunrpc/xdr.c | 1 + net/sunrpc/xprt.c | 40 +- net/sunrpc/xprtrdma/transport.c | 29 +- net/sunrpc/xprtsock.c | 32 +-- 43 files changed, 3177 insertions(+), 676 deletions(-) create mode 100644 net/sunrpc/auth_gss/gss_krb5_keys.c Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Merge made by recursive. fs/nfsd/export.c | 44 +++++++----- fs/nfsd/nfs4callback.c | 129 +++++++++++++++++++++++------------- fs/nfsd/nfs4proc.c | 44 +++++++++---- fs/nfsd/nfs4state.c | 156 ++++++++++++++++++-------------------------- fs/nfsd/nfs4xdr.c | 2 +- fs/nfsd/nfsctl.c | 64 +++++++++++++----- fs/nfsd/nfsd.h | 6 +- fs/nfsd/state.h | 30 ++++++-- fs/nfsd/vfs.c | 8 ++- fs/nfsd/vfs.h | 1 + fs/nfsd/xdr4.h | 5 +- include/linux/nfsd/nfsfh.h | 4 +- net/sunrpc/cache.c | 45 ++++++++----- net/sunrpc/svc_xprt.c | 2 +- 14 files changed, 314 insertions(+), 226 deletions(-) Merging nilfs2/for-next $ git merge nilfs2/for-next Auto-merging fs/nilfs2/super.c Merge made by recursive. Documentation/filesystems/nilfs2.txt | 4 +- fs/nilfs2/alloc.c | 154 +++++++++++++++++++++++++++++++++- fs/nilfs2/alloc.h | 7 ++ fs/nilfs2/btree.c | 91 ++++---------------- fs/nilfs2/btree.h | 23 +++++- fs/nilfs2/recovery.c | 2 + fs/nilfs2/segbuf.c | 70 +++++++++------- fs/nilfs2/segbuf.h | 10 ++- fs/nilfs2/segment.c | 157 +++++++++------------------------- fs/nilfs2/segment.h | 6 +- fs/nilfs2/super.c | 145 +++++++++++++++++-------------- fs/nilfs2/the_nilfs.c | 10 ++- include/linux/nilfs2_fs.h | 17 ++-- 13 files changed, 387 insertions(+), 309 deletions(-) Merging ocfs2/linux-next $ git merge ocfs2/linux-next Merge made by recursive. Documentation/filesystems/ocfs2.txt | 7 + fs/ocfs2/Makefile | 1 + fs/ocfs2/alloc.c | 196 ++------- fs/ocfs2/aops.c | 3 + fs/ocfs2/buffer_head_io.c | 2 + fs/ocfs2/cluster/masklog.c | 1 + fs/ocfs2/cluster/masklog.h | 1 + fs/ocfs2/cluster/tcp.c | 3 + fs/ocfs2/dir.c | 53 +-- fs/ocfs2/dlm/dlmast.c | 9 +- fs/ocfs2/dlm/dlmconvert.c | 4 +- fs/ocfs2/dlm/dlmdomain.c | 25 +- fs/ocfs2/dlm/dlmlock.c | 4 +- fs/ocfs2/dlm/dlmmaster.c | 12 +- fs/ocfs2/dlm/dlmrecovery.c | 27 +- fs/ocfs2/dlm/dlmunlock.c | 3 +- fs/ocfs2/dlmfs/dlmfs.c | 14 +- fs/ocfs2/file.c | 29 +- fs/ocfs2/inode.c | 88 ++-- fs/ocfs2/inode.h | 4 + fs/ocfs2/journal.c | 26 +- fs/ocfs2/journal.h | 3 +- fs/ocfs2/localalloc.c | 271 ++++++++---- fs/ocfs2/localalloc.h | 3 + fs/ocfs2/namei.c | 120 ++--- fs/ocfs2/ocfs2.h | 15 + fs/ocfs2/ocfs2_fs.h | 8 - fs/ocfs2/quota_global.c | 4 +- fs/ocfs2/quota_local.c | 50 +-- fs/ocfs2/refcounttree.c | 25 +- fs/ocfs2/reservations.c | 847 +++++++++++++++++++++++++++++++++++ fs/ocfs2/reservations.h | 159 +++++++ fs/ocfs2/resize.c | 13 +- fs/ocfs2/suballoc.c | 75 +--- fs/ocfs2/suballoc.h | 2 + fs/ocfs2/super.c | 65 +++- fs/ocfs2/xattr.c | 55 +-- 37 files changed, 1588 insertions(+), 639 deletions(-) create mode 100644 fs/ocfs2/reservations.c create mode 100644 fs/ocfs2/reservations.h $ git am -3 ../patches/ocfs2__update_gfp_slab.h_includes Applying: ocfs2: update gfp/slab.h includes $ git reset HEAD^ Unstaged changes after reset: M fs/ocfs2/reservations.c $ git add . $ git commit -v -a --amend [master e1af323] Merge remote branch 'ocfs2/linux-next' 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 Resolved 'fs/9p/vfs_super.c' using previous resolution. Auto-merging fs/9p/vfs_dir.c Auto-merging fs/9p/vfs_inode.c Auto-merging fs/9p/vfs_super.c CONFLICT (content): Merge conflict in fs/9p/vfs_super.c Auto-merging net/9p/client.c Auto-merging net/9p/protocol.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f5bd15d] Merge remote branch 'v9fs/for-next' $ git diff -M --stat --summary HEAD^.. fs/9p/v9fs_vfs.h | 2 + fs/9p/vfs_dir.c | 8 +++++ fs/9p/vfs_file.c | 11 ++++++ fs/9p/vfs_inode.c | 78 ++++++++++++++++++++++++++++++++++++++++------ fs/9p/vfs_super.c | 55 ++++++++++++++++++++++++++++++++- include/net/9p/9p.h | 33 ++++++++++++++++++++ include/net/9p/client.h | 2 + net/9p/client.c | 70 +++++++++++++++++++++++++++++++++++++++++- net/9p/protocol.c | 6 ++- 9 files changed, 249 insertions(+), 16 deletions(-) Merging ubifs/linux-next $ git merge ubifs/linux-next Already up-to-date. Merging xfs/master $ git merge xfs/master Auto-merging fs/xfs/linux-2.6/xfs_aops.c Auto-merging fs/xfs/linux-2.6/xfs_buf.c Auto-merging fs/xfs/linux-2.6/xfs_ioctl.c Auto-merging fs/xfs/linux-2.6/xfs_ioctl32.c Auto-merging fs/xfs/linux-2.6/xfs_iops.c Auto-merging fs/xfs/linux-2.6/xfs_super.c Auto-merging fs/xfs/linux-2.6/xfs_sync.c Auto-merging fs/xfs/quota/xfs_qm_syscalls.c Auto-merging fs/xfs/xfs_log.c Merge made by recursive. fs/xfs/linux-2.6/xfs_aops.c | 231 +++++++----- fs/xfs/linux-2.6/xfs_buf.c | 27 +- fs/xfs/linux-2.6/xfs_buf.h | 2 +- fs/xfs/linux-2.6/xfs_file.c | 2 + fs/xfs/linux-2.6/xfs_ioctl.c | 4 + fs/xfs/linux-2.6/xfs_ioctl32.c | 4 + fs/xfs/linux-2.6/xfs_iops.c | 5 +- fs/xfs/linux-2.6/xfs_super.c | 10 +- fs/xfs/linux-2.6/xfs_sync.c | 91 ++---- fs/xfs/linux-2.6/xfs_trace.c | 4 +- fs/xfs/linux-2.6/xfs_trace.h | 150 ++++++++- fs/xfs/quota/xfs_dquot.c | 193 +++++------ fs/xfs/quota/xfs_dquot.h | 35 +-- fs/xfs/quota/xfs_dquot_item.c | 30 +- fs/xfs/quota/xfs_qm.c | 609 ++++++++++++-------------------- fs/xfs/quota/xfs_qm.h | 23 +- fs/xfs/quota/xfs_qm_stats.c | 2 +- fs/xfs/quota/xfs_qm_syscalls.c | 152 ++++----- fs/xfs/quota/xfs_quota_priv.h | 102 ------ fs/xfs/quota/xfs_trans_dquot.c | 29 +- fs/xfs/xfs_bmap.c | 2 +- fs/xfs/xfs_buf_item.c | 55 ++-- fs/xfs/xfs_buf_item.h | 2 +- fs/xfs/xfs_error.c | 30 +- fs/xfs/xfs_error.h | 9 +- fs/xfs/xfs_extfree_item.c | 18 +- fs/xfs/xfs_inode.c | 2 + fs/xfs/xfs_inode_item.c | 21 +- fs/xfs/xfs_iomap.c | 123 ++----- fs/xfs/xfs_iomap.h | 47 +--- fs/xfs/xfs_log.c | 702 +++++++++++++++++++++++-------------- fs/xfs/xfs_log.h | 13 + fs/xfs/xfs_log_priv.h | 12 +- fs/xfs/xfs_log_recover.c | 311 ++++++++--------- fs/xfs/xfs_mount.c | 7 - fs/xfs/xfs_quota.h | 3 - fs/xfs/xfs_trans.c | 760 +++++++++++++++++++--------------------- fs/xfs/xfs_trans.h | 14 +- fs/xfs/xfs_trans_buf.c | 187 +++-------- 39 files changed, 1905 insertions(+), 2118 deletions(-) Merging vfs/for-next $ git merge vfs/for-next Resolved 'fs/cifs/file.c' using previous resolution. Resolved 'fs/namei.c' using previous resolution. Resolved 'fs/nfs/inode.c' using previous resolution. Resolved 'fs/nfsd/nfs4xdr.c' using previous resolution. Resolved 'fs/nfsd/vfs.c' using previous resolution. Resolved 'fs/ufs/inode.c' using previous resolution. Resolved 'fs/xfs/linux-2.6/xfs_super.c' using previous resolution. Resolved 'security/tomoyo/realpath.c' using previous resolution. Auto-merging arch/s390/hypfs/inode.c Auto-merging drivers/infiniband/core/uverbs.h Auto-merging drivers/infiniband/core/uverbs_cmd.c 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/affs/inode.c Auto-merging fs/afs/internal.h Auto-merging fs/afs/super.c Auto-merging fs/autofs4/dev-ioctl.c Auto-merging fs/autofs4/inode.c Auto-merging fs/btrfs/ctree.h Auto-merging fs/btrfs/inode.c Auto-merging fs/cifs/file.c CONFLICT (content): Merge conflict in fs/cifs/file.c Auto-merging fs/dcache.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/file.c Auto-merging fs/ext4/inode.c Auto-merging fs/fat/inode.c Auto-merging fs/fs-writeback.c Auto-merging fs/gfs2/super.c Auto-merging fs/hpfs/dir.c Auto-merging fs/hpfs/inode.c Auto-merging fs/jfs/inode.c Auto-merging fs/jfs/jfs_inode.h Auto-merging fs/libfs.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 CONFLICT (content): Merge conflict in fs/nfs/inode.c Auto-merging fs/nfs/internal.h 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 CONFLICT (content): Merge conflict in fs/nfsd/vfs.c Auto-merging fs/nilfs2/dir.c Auto-merging fs/ntfs/dir.c Auto-merging fs/ntfs/file.c Auto-merging fs/ntfs/super.c Auto-merging fs/omfs/inode.c Auto-merging fs/open.c Auto-merging fs/proc/base.c Auto-merging fs/proc/generic.c Auto-merging fs/reiserfs/inode.c Auto-merging fs/super.c Auto-merging fs/ubifs/file.c Auto-merging fs/udf/balloc.c Auto-merging fs/udf/inode.c Auto-merging fs/udf/namei.c Auto-merging fs/udf/symlink.c Auto-merging fs/udf/udfdecl.h 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 Auto-merging include/linux/mount.h Auto-merging kernel/audit_tree.c Auto-merging kernel/sysctl_binary.c 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 ae167d3] 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 Auto-merging drivers/pci/pci.c Merge made by recursive. Documentation/ABI/testing/sysfs-bus-pci | 40 +++++++++++++++++++++++++ arch/x86/include/asm/pci_x86.h | 2 +- arch/x86/pci/common.c | 2 +- arch/x86/pci/direct.c | 16 +++++----- arch/x86/pci/mmconfig_32.c | 8 ++-- arch/x86/pci/numaq_32.c | 8 ++-- arch/x86/pci/pcbios.c | 8 ++-- drivers/pci/Kconfig | 2 +- drivers/pci/access.c | 34 +++++++++++----------- drivers/pci/pci-sysfs.c | 37 +++++++++++++++++++++++ drivers/pci/pci.c | 2 - drivers/pci/slot.c | 48 +++++++++++++++++++++++++++++++ include/linux/ioport.h | 4 ++- kernel/resource.c | 16 +++++++++- 14 files changed, 183 insertions(+), 44 deletions(-) Merging hid/for-next $ git merge hid/for-next Merge made by recursive. Documentation/ABI/testing/sysfs-driver-hid-picolcd | 43 + .../ABI/testing/sysfs-driver-hid-roccat-kone | 111 + Documentation/ABI/testing/sysfs-wacom | 10 + drivers/hid/Kconfig | 86 +- drivers/hid/Makefile | 4 + drivers/hid/hid-3m-pct.c | 31 +- drivers/hid/hid-cando.c | 272 ++ drivers/hid/hid-cherry.c | 1 + drivers/hid/hid-core.c | 57 +- drivers/hid/hid-egalax.c | 281 +++ drivers/hid/hid-ids.h | 18 + drivers/hid/hid-lg.c | 9 + drivers/hid/hid-ntrig.c | 72 +- drivers/hid/hid-picolcd.c | 2631 ++++++++++++++++++++ drivers/hid/hid-roccat-kone.c | 1007 ++++++++ drivers/hid/hid-roccat-kone.h | 214 ++ drivers/hid/hid-sony.c | 2 +- drivers/hid/hid-topseed.c | 38 +- drivers/hid/hid-wacom.c | 230 ++- drivers/hid/hidraw.c | 48 +- drivers/hid/usbhid/hid-core.c | 33 +- drivers/hid/usbhid/hiddev.c | 19 +- drivers/hid/usbhid/usbkbd.c | 1 + include/linux/hid.h | 10 + 24 files changed, 5088 insertions(+), 140 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-picolcd create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-kone create mode 100644 Documentation/ABI/testing/sysfs-wacom create mode 100644 drivers/hid/hid-cando.c create mode 100644 drivers/hid/hid-egalax.c create mode 100644 drivers/hid/hid-picolcd.c create mode 100644 drivers/hid/hid-roccat-kone.c create mode 100644 drivers/hid/hid-roccat-kone.h Merging quilt/i2c $ git merge quilt/i2c Merge made by recursive. Documentation/i2c/busses/i2c-i801 | 8 +- Documentation/i2c/writing-clients | 5 + drivers/i2c/algos/i2c-algo-pca.c | 36 ++-- drivers/i2c/busses/i2c-gpio.c | 2 +- drivers/i2c/busses/i2c-i801.c | 59 ++++--- drivers/i2c/busses/i2c-parport.c | 2 +- drivers/i2c/busses/i2c-stub.c | 9 +- drivers/i2c/busses/scx200_acb.c | 2 +- drivers/i2c/i2c-core.c | 319 +++++++++++++++++++++---------------- drivers/i2c/i2c-dev.c | 36 ++-- drivers/misc/eeprom/at24.c | 59 ++++++-- include/linux/i2c.h | 2 + include/linux/pm_runtime.h | 7 + 13 files changed, 331 insertions(+), 215 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. Documentation/hwmon/lm63 | 7 + Documentation/hwmon/sysfs-interface | 13 ++- drivers/acpi/osl.c | 9 ++ drivers/hwmon/Kconfig | 11 +- drivers/hwmon/adm1031.c | 68 +++++++++- drivers/hwmon/applesmc.c | 38 +++++ drivers/hwmon/asc7621.c | 63 +++++----- drivers/hwmon/asus_atk0110.c | 7 + drivers/hwmon/f71882fg.c | 170 +++++++++++++++++------- drivers/hwmon/lm63.c | 16 ++- drivers/hwmon/lm90.c | 3 +- drivers/hwmon/tmp401.c | 255 +++++++++++++++++------------------ include/linux/acpi.h | 2 + 13 files changed, 438 insertions(+), 224 deletions(-) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Merge made by recursive. Documentation/SubmitChecklist | 12 ++++++++ Documentation/development-process/2.Process | 29 +++++++++++++------ Documentation/development-process/7.AdvancedTopics | 2 +- 3 files changed, 33 insertions(+), 10 deletions(-) Merging v4l-dvb/master $ git merge v4l-dvb/master Removing drivers/media/IR/ir-keymaps.c Removing drivers/media/video/font.h Merge made by recursive. Documentation/DocBook/media-entities.tmpl | 11 + Documentation/DocBook/v4l/compat.xml | 126 +- Documentation/DocBook/v4l/controls.xml | 36 +- Documentation/DocBook/v4l/dev-event.xml | 31 + Documentation/DocBook/v4l/io.xml | 8 +- Documentation/DocBook/v4l/pixfmt.xml | 12 + Documentation/DocBook/v4l/v4l2.xml | 3 + Documentation/DocBook/v4l/videodev2.h.xml | 10 + Documentation/DocBook/v4l/vidioc-dqevent.xml | 131 + Documentation/DocBook/v4l/vidioc-queryctrl.xml | 2 +- Documentation/DocBook/v4l/vidioc-reqbufs.xml | 2 +- .../DocBook/v4l/vidioc-subscribe-event.xml | 133 + Documentation/video4linux/CARDLIST.cx88 | 1 + Documentation/video4linux/CARDLIST.em28xx | 4 +- Documentation/video4linux/CARDLIST.saa7134 | 1 + Documentation/video4linux/extract_xc3028.pl | 817 +++++- Documentation/video4linux/gspca.txt | 5 + Documentation/video4linux/sh_mobile_ceu_camera.txt | 80 +- Documentation/video4linux/v4l2-framework.txt | 143 +- drivers/input/evdev.c | 39 + drivers/input/input.c | 263 ++- drivers/media/IR/Kconfig | 59 + drivers/media/IR/Makefile | 14 +- drivers/media/IR/imon.c | 2398 ++++++++++++++ drivers/media/IR/ir-core-priv.h | 126 + drivers/media/IR/ir-functions.c | 1 + drivers/media/IR/ir-jvc-decoder.c | 320 ++ drivers/media/IR/ir-keymaps.c | 3494 -------------------- drivers/media/IR/ir-keytable.c | 687 ++-- drivers/media/IR/ir-nec-decoder.c | 328 ++ drivers/media/IR/ir-raw-event.c | 251 ++ drivers/media/IR/ir-rc5-decoder.c | 324 ++ drivers/media/IR/ir-rc6-decoder.c | 419 +++ drivers/media/IR/ir-sony-decoder.c | 312 ++ drivers/media/IR/ir-sysfs.c | 202 +- drivers/media/IR/keymaps/Kconfig | 15 + drivers/media/IR/keymaps/Makefile | 67 + drivers/media/IR/keymaps/rc-adstech-dvb-t-pci.c | 89 + drivers/media/IR/keymaps/rc-apac-viewcomp.c | 80 + drivers/media/IR/keymaps/rc-asus-pc39.c | 91 + drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600.c | 69 + drivers/media/IR/keymaps/rc-avermedia-a16d.c | 75 + drivers/media/IR/keymaps/rc-avermedia-cardbus.c | 97 + drivers/media/IR/keymaps/rc-avermedia-dvbt.c | 78 + .../media/IR/keymaps/rc-avermedia-m135a-rm-jx.c | 90 + drivers/media/IR/keymaps/rc-avermedia.c | 86 + drivers/media/IR/keymaps/rc-avertv-303.c | 85 + drivers/media/IR/keymaps/rc-behold-columbus.c | 108 + drivers/media/IR/keymaps/rc-behold.c | 141 + drivers/media/IR/keymaps/rc-budget-ci-old.c | 92 + drivers/media/IR/keymaps/rc-cinergy-1400.c | 84 + drivers/media/IR/keymaps/rc-cinergy.c | 78 + drivers/media/IR/keymaps/rc-dm1105-nec.c | 76 + drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c | 78 + drivers/media/IR/keymaps/rc-dntv-live-dvbt-pro.c | 97 + drivers/media/IR/keymaps/rc-em-terratec.c | 69 + drivers/media/IR/keymaps/rc-empty.c | 44 + drivers/media/IR/keymaps/rc-encore-enltv-fm53.c | 81 + drivers/media/IR/keymaps/rc-encore-enltv.c | 112 + drivers/media/IR/keymaps/rc-encore-enltv2.c | 90 + drivers/media/IR/keymaps/rc-evga-indtube.c | 61 + drivers/media/IR/keymaps/rc-eztv.c | 96 + drivers/media/IR/keymaps/rc-flydvb.c | 77 + drivers/media/IR/keymaps/rc-flyvideo.c | 70 + drivers/media/IR/keymaps/rc-fusionhdtv-mce.c | 98 + drivers/media/IR/keymaps/rc-gadmei-rm008z.c | 81 + drivers/media/IR/keymaps/rc-genius-tvgo-a11mce.c | 84 + drivers/media/IR/keymaps/rc-gotview7135.c | 79 + drivers/media/IR/keymaps/rc-hauppauge-new.c | 100 + drivers/media/IR/keymaps/rc-imon-mce.c | 142 + drivers/media/IR/keymaps/rc-imon-pad.c | 156 + drivers/media/IR/keymaps/rc-iodata-bctv7e.c | 88 + drivers/media/IR/keymaps/rc-kaiomy.c | 87 + drivers/media/IR/keymaps/rc-kworld-315u.c | 83 + .../media/IR/keymaps/rc-kworld-plus-tv-analog.c | 99 + drivers/media/IR/keymaps/rc-manli.c | 135 + drivers/media/IR/keymaps/rc-msi-tvanywhere-plus.c | 123 + drivers/media/IR/keymaps/rc-msi-tvanywhere.c | 69 + drivers/media/IR/keymaps/rc-nebula.c | 96 + .../media/IR/keymaps/rc-nec-terratec-cinergy-xs.c | 105 + drivers/media/IR/keymaps/rc-norwood.c | 85 + drivers/media/IR/keymaps/rc-npgtech.c | 80 + drivers/media/IR/keymaps/rc-pctv-sedna.c | 80 + drivers/media/IR/keymaps/rc-pinnacle-color.c | 94 + drivers/media/IR/keymaps/rc-pinnacle-grey.c | 89 + drivers/media/IR/keymaps/rc-pinnacle-pctv-hd.c | 73 + drivers/media/IR/keymaps/rc-pixelview-mk12.c | 83 + drivers/media/IR/keymaps/rc-pixelview-new.c | 83 + drivers/media/IR/keymaps/rc-pixelview.c | 82 + .../media/IR/keymaps/rc-powercolor-real-angel.c | 81 + drivers/media/IR/keymaps/rc-proteus-2309.c | 69 + drivers/media/IR/keymaps/rc-purpletv.c | 81 + drivers/media/IR/keymaps/rc-pv951.c | 78 + drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c | 103 + drivers/media/IR/keymaps/rc-rc5-tv.c | 81 + .../media/IR/keymaps/rc-real-audio-220-32-keys.c | 78 + drivers/media/IR/keymaps/rc-tbs-nec.c | 73 + drivers/media/IR/keymaps/rc-terratec-cinergy-xs.c | 92 + drivers/media/IR/keymaps/rc-tevii-nec.c | 88 + drivers/media/IR/keymaps/rc-tt-1500.c | 82 + drivers/media/IR/keymaps/rc-videomate-s350.c | 85 + drivers/media/IR/keymaps/rc-videomate-tv-pvr.c | 87 + drivers/media/IR/keymaps/rc-winfast-usbii-deluxe.c | 82 + drivers/media/IR/keymaps/rc-winfast.c | 102 + drivers/media/IR/rc-map.c | 83 + 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/dm1105/dm1105.c | 25 +- drivers/media/dvb/dvb-core/dvb_demux.c | 11 +- drivers/media/dvb/dvb-usb/a800.c | 6 +- drivers/media/dvb/dvb-usb/af9005-remote.c | 16 +- drivers/media/dvb/dvb-usb/af9005.c | 8 +- drivers/media/dvb/dvb-usb/af9005.h | 4 +- drivers/media/dvb/dvb-usb/af9015.c | 43 +- drivers/media/dvb/dvb-usb/af9015.h | 18 +- drivers/media/dvb/dvb-usb/anysee.c | 6 +- drivers/media/dvb/dvb-usb/az6027.c | 59 +- drivers/media/dvb/dvb-usb/cinergyT2-core.c | 6 +- drivers/media/dvb/dvb-usb/cxusb.c | 46 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 54 +- drivers/media/dvb/dvb-usb/dibusb-common.c | 4 +- drivers/media/dvb/dvb-usb/dibusb-mb.c | 8 +- drivers/media/dvb/dvb-usb/dibusb-mc.c | 2 +- drivers/media/dvb/dvb-usb/dibusb.h | 2 +- drivers/media/dvb/dvb-usb/digitv.c | 6 +- drivers/media/dvb/dvb-usb/dtt200u.c | 18 +- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 8 +- drivers/media/dvb/dvb-usb/dvb-usb-urb.c | 2 + drivers/media/dvb/dvb-usb/dvb-usb.h | 7 + drivers/media/dvb/dvb-usb/dw2102.c | 44 +- drivers/media/dvb/dvb-usb/m920x.c | 18 +- drivers/media/dvb/dvb-usb/nova-t-usb2.c | 18 +- drivers/media/dvb/dvb-usb/opera1.c | 16 +- drivers/media/dvb/dvb-usb/vp702x.c | 12 +- drivers/media/dvb/dvb-usb/vp7045.c | 12 +- 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/dib8000.h | 1 + drivers/media/dvb/frontends/ds3000.c | 2 +- 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_input.c | 4 +- drivers/media/dvb/mantis/mantis_vp1041.c | 10 +- drivers/media/dvb/ngene/ngene-core.c | 53 +- drivers/media/dvb/pt1/pt1.c | 271 ++- drivers/media/dvb/pt1/va1j5jf8007s.c | 32 +- drivers/media/dvb/pt1/va1j5jf8007s.h | 8 +- drivers/media/dvb/pt1/va1j5jf8007t.c | 31 +- drivers/media/dvb/pt1/va1j5jf8007t.h | 8 +- drivers/media/dvb/ttpci/budget-ci.c | 52 +- drivers/media/dvb/ttpci/budget.c | 50 +- drivers/media/video/Kconfig | 50 +- drivers/media/video/Makefile | 12 +- drivers/media/video/ak881x.c | 368 ++ drivers/media/video/arv.c | 524 ++-- drivers/media/video/au0828/au0828-video.c | 2 +- drivers/media/video/bt8xx/bttv-driver.c | 4 +- drivers/media/video/bt8xx/bttv-input.c | 30 +- drivers/media/video/bw-qcam.c | 452 ++-- drivers/media/video/c-qcam.c | 483 ++-- drivers/media/video/cx18/cx18-av-core.c | 33 +- drivers/media/video/cx18/cx18-av-core.h | 19 + drivers/media/video/cx18/cx18-cards.c | 4 +- drivers/media/video/cx18/cx18-cards.h | 4 +- drivers/media/video/cx18/cx18-i2c.c | 2 +- drivers/media/video/cx231xx/cx231xx-audio.c | 2 +- drivers/media/video/cx231xx/cx231xx-core.c | 13 +- drivers/media/video/cx231xx/cx231xx-input.c | 52 +- drivers/media/video/cx231xx/cx231xx-video.c | 5 +- drivers/media/video/cx231xx/cx231xx.h | 2 +- drivers/media/video/cx2341x.c | 14 - drivers/media/video/cx23885/cimax2.c | 12 +- drivers/media/video/cx23885/cx23885-417.c | 2 +- drivers/media/video/cx23885/cx23885-input.c | 8 +- drivers/media/video/cx23885/cx23885-video.c | 4 +- drivers/media/video/cx88/cx88-core.c | 3 +- drivers/media/video/cx88/cx88-dvb.c | 2 +- drivers/media/video/cx88/cx88-input.c | 149 +- drivers/media/video/cx88/cx88-video.c | 20 +- drivers/media/video/cx88/cx88.h | 8 +- drivers/media/video/davinci/dm644x_ccdc.c | 131 +- drivers/media/video/davinci/dm644x_ccdc_regs.h | 10 +- drivers/media/video/davinci/isif_regs.h | 2 +- drivers/media/video/davinci/vpfe_capture.c | 81 +- drivers/media/video/davinci/vpif_display.c | 2 +- drivers/media/video/em28xx/em28xx-audio.c | 2 +- drivers/media/video/em28xx/em28xx-cards.c | 56 +- drivers/media/video/em28xx/em28xx-core.c | 12 +- drivers/media/video/em28xx/em28xx-dvb.c | 1 + drivers/media/video/em28xx/em28xx-input.c | 29 +- drivers/media/video/em28xx/em28xx-video.c | 61 +- drivers/media/video/em28xx/em28xx.h | 7 +- drivers/media/video/et61x251/et61x251_core.c | 6 +- drivers/media/video/font.h | 407 --- drivers/media/video/gspca/Kconfig | 6 - drivers/media/video/gspca/cpia1.c | 36 +- drivers/media/video/gspca/gspca.c | 120 +- drivers/media/video/gspca/gspca.h | 6 +- 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 | 319 +- drivers/media/video/gspca/sonixj.c | 585 +++- drivers/media/video/gspca/spca561.c | 58 +- drivers/media/video/gspca/stv06xx/stv06xx.c | 2 - drivers/media/video/gspca/t613.c | 172 +- drivers/media/video/gspca/vc032x.c | 747 +++-- drivers/media/video/gspca/zc3xx.c | 95 +- drivers/media/video/ir-kbd-i2c.c | 28 +- drivers/media/video/ivtv/ivtv-driver.c | 5 +- drivers/media/video/ivtv/ivtv-driver.h | 10 + drivers/media/video/ivtv/ivtv-fileops.c | 53 +- drivers/media/video/ivtv/ivtv-i2c.c | 6 +- drivers/media/video/ivtv/ivtv-ioctl.c | 110 +- drivers/media/video/ivtv/ivtv-irq.c | 23 +- drivers/media/video/ivtv/ivtv-streams.c | 12 +- drivers/media/video/ivtv/ivtv-vbi.c | 2 +- drivers/media/video/ivtv/ivtvfb.c | 2 +- drivers/media/video/mem2mem_testdev.c | 1049 ++++++ drivers/media/video/meye.c | 78 +- drivers/media/video/meye.h | 10 +- drivers/media/video/mt9t031.c | 66 +- drivers/media/video/mt9v022.c | 2 +- drivers/media/video/mx1_camera.c | 4 +- drivers/media/video/mx3_camera.c | 4 +- drivers/media/video/omap/Kconfig | 11 + drivers/media/video/omap/Makefile | 7 + drivers/media/video/omap/omap_vout.c | 2643 +++++++++++++++ drivers/media/video/omap/omap_voutdef.h | 147 + drivers/media/video/omap/omap_voutlib.c | 293 ++ drivers/media/video/omap/omap_voutlib.h | 34 + drivers/media/video/omap24xxcam.c | 4 +- drivers/media/video/ov511.c | 9 +- drivers/media/video/ov7670.c | 286 ++- drivers/media/video/ov9640.c | 6 +- drivers/media/video/pms.c | 18 - drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 22 +- drivers/media/video/pwc/Kconfig | 2 +- drivers/media/video/pxa_camera.c | 4 +- drivers/media/video/rj54n1cb0c.c | 18 +- drivers/media/video/s2255drv.c | 1160 ++++--- drivers/media/video/saa7115.c | 31 +- drivers/media/video/saa7134/saa7134-alsa.c | 2 - drivers/media/video/saa7134/saa7134-cards.c | 39 + drivers/media/video/saa7134/saa7134-core.c | 22 +- drivers/media/video/saa7134/saa7134-input.c | 281 ++- drivers/media/video/saa7134/saa7134-reg.h | 24 +- drivers/media/video/saa7134/saa7134-video.c | 11 +- drivers/media/video/saa7134/saa7134.h | 5 +- drivers/media/video/sh_mobile_ceu_camera.c | 615 ++-- drivers/media/video/sh_vou.c | 1476 +++++++++ drivers/media/video/sn9c102/sn9c102_core.c | 6 +- drivers/media/video/sn9c102/sn9c102_devtable.h | 18 +- drivers/media/video/sn9c102/sn9c102_hv7131d.c | 2 +- drivers/media/video/soc_camera.c | 21 +- drivers/media/video/tlg2300/pd-dvb.c | 6 +- drivers/media/video/tlg2300/pd-main.c | 7 +- drivers/media/video/tlg2300/pd-radio.c | 21 +- drivers/media/video/tlg2300/pd-video.c | 18 +- drivers/media/video/tvp514x.c | 13 + drivers/media/video/usbvideo/quickcam_messenger.c | 3 +- drivers/media/video/usbvision/usbvision-video.c | 77 - drivers/media/video/usbvision/usbvision.h | 1 - drivers/media/video/uvc/uvc_ctrl.c | 20 + drivers/media/video/uvc/uvc_driver.c | 18 + drivers/media/video/uvc/uvc_queue.c | 8 +- drivers/media/video/v4l2-common.c | 79 +- drivers/media/video/v4l2-compat-ioctl32.c | 3 + drivers/media/video/v4l2-dev.c | 4 + drivers/media/video/v4l2-device.c | 11 + drivers/media/video/v4l2-event.c | 292 ++ drivers/media/video/v4l2-fh.c | 79 + drivers/media/video/v4l2-ioctl.c | 103 +- drivers/media/video/v4l2-mem2mem.c | 633 ++++ drivers/media/video/videobuf-core.c | 214 +- drivers/media/video/videobuf-dma-contig.c | 115 +- drivers/media/video/videobuf-dma-sg.c | 375 +-- drivers/media/video/videobuf-dvb.c | 2 +- drivers/media/video/videobuf-vmalloc.c | 176 +- drivers/media/video/vivi.c | 805 ++--- drivers/media/video/w9966.c | 1149 ++++---- drivers/media/video/zc0301/zc0301_core.c | 6 +- drivers/media/video/zc0301/zc0301_sensor.h | 2 +- drivers/media/video/zoran/zoran.h | 24 +- drivers/media/video/zoran/zoran_driver.c | 16 +- drivers/media/video/zr364xx.c | 4 +- drivers/staging/Kconfig | 2 + drivers/staging/Makefile | 1 + drivers/staging/cx25821/cx25821-alsa.c | 102 +- drivers/staging/cx25821/cx25821-audio-upstream.c | 146 +- drivers/staging/cx25821/cx25821-audups11.c | 78 +- drivers/staging/cx25821/cx25821-core.c | 160 +- drivers/staging/cx25821/cx25821-gpio.c | 25 +- drivers/staging/cx25821/cx25821-i2c.c | 12 +- drivers/staging/cx25821/cx25821-medusa-video.c | 207 +- drivers/staging/cx25821/cx25821-video-upstream.c | 120 +- drivers/staging/cx25821/cx25821-video.c | 134 +- drivers/staging/cx25821/cx25821-video.h | 78 +- drivers/staging/cx25821/cx25821-video0.c | 82 +- drivers/staging/cx25821/cx25821-video1.c | 82 +- drivers/staging/cx25821/cx25821-video2.c | 82 +- drivers/staging/cx25821/cx25821-video3.c | 82 +- drivers/staging/cx25821/cx25821-video4.c | 82 +- drivers/staging/cx25821/cx25821-video5.c | 82 +- drivers/staging/cx25821/cx25821-video6.c | 82 +- drivers/staging/cx25821/cx25821-video7.c | 82 +- drivers/staging/cx25821/cx25821-videoioctl.c | 78 +- drivers/staging/cx25821/cx25821-vidups10.c | 78 +- drivers/staging/cx25821/cx25821-vidups9.c | 78 +- drivers/staging/tm6000/Kconfig | 32 + drivers/staging/tm6000/Makefile | 17 + drivers/staging/tm6000/README | 21 + drivers/staging/tm6000/tm6000-alsa.c | 414 +++ drivers/staging/tm6000/tm6000-cards.c | 901 +++++ drivers/staging/tm6000/tm6000-core.c | 602 ++++ drivers/staging/tm6000/tm6000-dvb.c | 346 ++ drivers/staging/tm6000/tm6000-i2c.c | 370 +++ 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 | 1557 +++++++++ drivers/staging/tm6000/tm6000.h | 300 ++ include/linux/input.h | 40 +- include/linux/meye.h | 12 +- include/linux/videodev2.h | 73 +- include/media/ak881x.h | 25 + include/media/davinci/vpfe_capture.h | 2 + include/media/ir-common.h | 74 +- include/media/ir-core.h | 142 +- include/media/ir-kbd-i2c.h | 6 +- include/media/rc-map.h | 121 + include/media/sh_vou.h | 34 + include/media/soc_camera.h | 12 +- include/media/v4l2-chip-ident.h | 127 +- include/media/v4l2-common.h | 19 + include/media/v4l2-dev.h | 5 + include/media/v4l2-event.h | 67 + include/media/v4l2-fh.h | 65 + include/media/v4l2-ioctl.h | 7 + include/media/v4l2-mem2mem.h | 201 ++ include/media/v4l2-subdev.h | 2 + include/media/videobuf-core.h | 35 +- include/media/videobuf-dma-sg.h | 27 +- include/media/videobuf-vmalloc.h | 12 +- 351 files changed, 34992 insertions(+), 10964 deletions(-) create mode 100644 Documentation/DocBook/v4l/dev-event.xml create mode 100644 Documentation/DocBook/v4l/vidioc-dqevent.xml create mode 100644 Documentation/DocBook/v4l/vidioc-subscribe-event.xml create mode 100644 drivers/media/IR/imon.c create mode 100644 drivers/media/IR/ir-core-priv.h create mode 100644 drivers/media/IR/ir-jvc-decoder.c delete mode 100644 drivers/media/IR/ir-keymaps.c create mode 100644 drivers/media/IR/ir-nec-decoder.c create mode 100644 drivers/media/IR/ir-raw-event.c create mode 100644 drivers/media/IR/ir-rc5-decoder.c create mode 100644 drivers/media/IR/ir-rc6-decoder.c create mode 100644 drivers/media/IR/ir-sony-decoder.c create mode 100644 drivers/media/IR/keymaps/Kconfig create mode 100644 drivers/media/IR/keymaps/Makefile create mode 100644 drivers/media/IR/keymaps/rc-adstech-dvb-t-pci.c create mode 100644 drivers/media/IR/keymaps/rc-apac-viewcomp.c create mode 100644 drivers/media/IR/keymaps/rc-asus-pc39.c create mode 100644 drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600.c create mode 100644 drivers/media/IR/keymaps/rc-avermedia-a16d.c create mode 100644 drivers/media/IR/keymaps/rc-avermedia-cardbus.c create mode 100644 drivers/media/IR/keymaps/rc-avermedia-dvbt.c create mode 100644 drivers/media/IR/keymaps/rc-avermedia-m135a-rm-jx.c create mode 100644 drivers/media/IR/keymaps/rc-avermedia.c create mode 100644 drivers/media/IR/keymaps/rc-avertv-303.c create mode 100644 drivers/media/IR/keymaps/rc-behold-columbus.c create mode 100644 drivers/media/IR/keymaps/rc-behold.c create mode 100644 drivers/media/IR/keymaps/rc-budget-ci-old.c create mode 100644 drivers/media/IR/keymaps/rc-cinergy-1400.c create mode 100644 drivers/media/IR/keymaps/rc-cinergy.c create mode 100644 drivers/media/IR/keymaps/rc-dm1105-nec.c create mode 100644 drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c create mode 100644 drivers/media/IR/keymaps/rc-dntv-live-dvbt-pro.c create mode 100644 drivers/media/IR/keymaps/rc-em-terratec.c create mode 100644 drivers/media/IR/keymaps/rc-empty.c create mode 100644 drivers/media/IR/keymaps/rc-encore-enltv-fm53.c create mode 100644 drivers/media/IR/keymaps/rc-encore-enltv.c create mode 100644 drivers/media/IR/keymaps/rc-encore-enltv2.c create mode 100644 drivers/media/IR/keymaps/rc-evga-indtube.c create mode 100644 drivers/media/IR/keymaps/rc-eztv.c create mode 100644 drivers/media/IR/keymaps/rc-flydvb.c create mode 100644 drivers/media/IR/keymaps/rc-flyvideo.c create mode 100644 drivers/media/IR/keymaps/rc-fusionhdtv-mce.c create mode 100644 drivers/media/IR/keymaps/rc-gadmei-rm008z.c create mode 100644 drivers/media/IR/keymaps/rc-genius-tvgo-a11mce.c create mode 100644 drivers/media/IR/keymaps/rc-gotview7135.c create mode 100644 drivers/media/IR/keymaps/rc-hauppauge-new.c create mode 100644 drivers/media/IR/keymaps/rc-imon-mce.c create mode 100644 drivers/media/IR/keymaps/rc-imon-pad.c create mode 100644 drivers/media/IR/keymaps/rc-iodata-bctv7e.c create mode 100644 drivers/media/IR/keymaps/rc-kaiomy.c create mode 100644 drivers/media/IR/keymaps/rc-kworld-315u.c create mode 100644 drivers/media/IR/keymaps/rc-kworld-plus-tv-analog.c create mode 100644 drivers/media/IR/keymaps/rc-manli.c create mode 100644 drivers/media/IR/keymaps/rc-msi-tvanywhere-plus.c create mode 100644 drivers/media/IR/keymaps/rc-msi-tvanywhere.c create mode 100644 drivers/media/IR/keymaps/rc-nebula.c create mode 100644 drivers/media/IR/keymaps/rc-nec-terratec-cinergy-xs.c create mode 100644 drivers/media/IR/keymaps/rc-norwood.c create mode 100644 drivers/media/IR/keymaps/rc-npgtech.c create mode 100644 drivers/media/IR/keymaps/rc-pctv-sedna.c create mode 100644 drivers/media/IR/keymaps/rc-pinnacle-color.c create mode 100644 drivers/media/IR/keymaps/rc-pinnacle-grey.c create mode 100644 drivers/media/IR/keymaps/rc-pinnacle-pctv-hd.c create mode 100644 drivers/media/IR/keymaps/rc-pixelview-mk12.c create mode 100644 drivers/media/IR/keymaps/rc-pixelview-new.c create mode 100644 drivers/media/IR/keymaps/rc-pixelview.c create mode 100644 drivers/media/IR/keymaps/rc-powercolor-real-angel.c create mode 100644 drivers/media/IR/keymaps/rc-proteus-2309.c create mode 100644 drivers/media/IR/keymaps/rc-purpletv.c create mode 100644 drivers/media/IR/keymaps/rc-pv951.c create mode 100644 drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c create mode 100644 drivers/media/IR/keymaps/rc-rc5-tv.c create mode 100644 drivers/media/IR/keymaps/rc-real-audio-220-32-keys.c create mode 100644 drivers/media/IR/keymaps/rc-tbs-nec.c create mode 100644 drivers/media/IR/keymaps/rc-terratec-cinergy-xs.c create mode 100644 drivers/media/IR/keymaps/rc-tevii-nec.c create mode 100644 drivers/media/IR/keymaps/rc-tt-1500.c create mode 100644 drivers/media/IR/keymaps/rc-videomate-s350.c create mode 100644 drivers/media/IR/keymaps/rc-videomate-tv-pvr.c create mode 100644 drivers/media/IR/keymaps/rc-winfast-usbii-deluxe.c create mode 100644 drivers/media/IR/keymaps/rc-winfast.c create mode 100644 drivers/media/IR/rc-map.c create mode 100644 drivers/media/video/ak881x.c delete mode 100644 drivers/media/video/font.h create mode 100644 drivers/media/video/mem2mem_testdev.c create mode 100644 drivers/media/video/omap/Kconfig create mode 100644 drivers/media/video/omap/Makefile create mode 100644 drivers/media/video/omap/omap_vout.c create mode 100644 drivers/media/video/omap/omap_voutdef.h create mode 100644 drivers/media/video/omap/omap_voutlib.c create mode 100644 drivers/media/video/omap/omap_voutlib.h create mode 100644 drivers/media/video/sh_vou.c create mode 100644 drivers/media/video/v4l2-event.c create mode 100644 drivers/media/video/v4l2-fh.c create mode 100644 drivers/media/video/v4l2-mem2mem.c 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 create mode 100644 include/media/ak881x.h create mode 100644 include/media/rc-map.h create mode 100644 include/media/sh_vou.h create mode 100644 include/media/v4l2-event.h create mode 100644 include/media/v4l2-fh.h create mode 100644 include/media/v4l2-mem2mem.h $ git am -3 ../patches/v4l-dvb__update_gfp_slab.h_includes Applying: v4l-dvb: update gfp/slab.h includes $ git reset HEAD^ Unstaged changes after reset: M drivers/staging/tm6000/tm6000-alsa.c M drivers/staging/tm6000/tm6000-cards.c M drivers/staging/tm6000/tm6000-core.c M drivers/staging/tm6000/tm6000-dvb.c $ git add . $ git commit -v -a --amend [master 01e3655] Merge remote branch 'v4l-dvb/master' Merging kbuild/for-next $ git merge kbuild/for-next Auto-merging .gitignore 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/sh/include/asm/cache.h 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. .gitignore | 1 + Documentation/.gitignore | 7 + Documentation/kbuild/kbuild.txt | 6 +- Documentation/kbuild/kconfig-language.txt | 2 +- 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/.gitignore | 3 + 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/gen_initramfs_list.sh | 3 +- scripts/genksyms/genksyms.c | 4 +- scripts/headerdep.pl | 3 +- 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/gconf.c | 113 +-- scripts/kconfig/gconf.glade | 26 +- scripts/kconfig/lkc.h | 7 +- scripts/kconfig/lkc_proto.h | 6 +- scripts/kconfig/lxdialog/inputbox.c | 4 +- scripts/kconfig/lxdialog/menubox.c | 22 +- scripts/kconfig/mconf.c | 36 +- scripts/kconfig/menu.c | 28 +- scripts/kconfig/nconf.c | 1568 +++++++++++++++++++++++++++++ scripts/kconfig/nconf.gui.c | 617 ++++++++++++ scripts/kconfig/nconf.h | 95 ++ scripts/kconfig/symbol.c | 30 +- scripts/kconfig/util.c | 2 + scripts/kconfig/zconf.tab.c_shipped | 25 +- scripts/kconfig/zconf.y | 25 +- 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 +- 113 files changed, 3025 insertions(+), 540 deletions(-) create mode 100644 Documentation/.gitignore create mode 100644 arch/x86/.gitignore 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 Merge made by recursive. drivers/ide/ide-dma.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) Merging libata/NEXT $ git merge libata/NEXT Merge made by recursive. Documentation/DocBook/libata.tmpl | 6 +- drivers/ata/Kconfig | 8 + drivers/ata/Makefile | 3 +- drivers/ata/ahci.c | 2542 +++---------------------------------- drivers/ata/ahci.h | 333 +++++ drivers/ata/ahci_platform.c | 192 +++ drivers/ata/libahci.c | 2110 ++++++++++++++++++++++++++++++ drivers/ata/libata-core.c | 37 +- drivers/ata/libata-pmp.c | 32 +- drivers/ata/libata-sff.c | 94 -- drivers/ata/pata_mpc52xx.c | 78 +- include/linux/ahci_platform.h | 29 + include/linux/libata.h | 12 +- 13 files changed, 2931 insertions(+), 2545 deletions(-) create mode 100644 drivers/ata/ahci.h create mode 100644 drivers/ata/ahci_platform.c create mode 100644 drivers/ata/libahci.c create mode 100644 include/linux/ahci_platform.h Merging infiniband/for-next $ git merge infiniband/for-next Auto-merging drivers/infiniband/core/uverbs_main.c Merge made by recursive. drivers/infiniband/Kconfig | 1 + drivers/infiniband/Makefile | 1 + drivers/infiniband/core/cma.c | 70 +- drivers/infiniband/core/ucm.c | 3 +- drivers/infiniband/core/ucma.c | 4 +- drivers/infiniband/core/user_mad.c | 12 +- drivers/infiniband/core/uverbs_main.c | 11 +- drivers/infiniband/hw/amso1100/c2.h | 2 +- drivers/infiniband/hw/amso1100/c2_alloc.c | 4 +- drivers/infiniband/hw/amso1100/c2_cq.c | 4 +- drivers/infiniband/hw/amso1100/c2_mq.h | 2 +- drivers/infiniband/hw/amso1100/c2_provider.h | 2 +- drivers/infiniband/hw/amso1100/c2_rnic.c | 12 +- drivers/infiniband/hw/cxgb3/cxio_hal.c | 12 +- drivers/infiniband/hw/cxgb3/cxio_hal.h | 2 +- drivers/infiniband/hw/cxgb3/cxio_wr.h | 4 +- drivers/infiniband/hw/cxgb3/iwch.c | 2 - drivers/infiniband/hw/cxgb3/iwch_cm.c | 133 +- drivers/infiniband/hw/cxgb4/Kconfig | 18 + drivers/infiniband/hw/cxgb4/Makefile | 5 + drivers/infiniband/hw/cxgb4/cm.c | 2330 +++++++++++++++++++++++++ drivers/infiniband/hw/cxgb4/cq.c | 882 ++++++++++ drivers/infiniband/hw/cxgb4/device.c | 520 ++++++ drivers/infiniband/hw/cxgb4/ev.c | 193 ++ drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 743 ++++++++ drivers/infiniband/hw/cxgb4/mem.c | 811 +++++++++ drivers/infiniband/hw/cxgb4/provider.c | 518 ++++++ drivers/infiniband/hw/cxgb4/qp.c | 1575 +++++++++++++++++ drivers/infiniband/hw/cxgb4/resource.c | 417 +++++ drivers/infiniband/hw/cxgb4/t4.h | 536 ++++++ drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 829 +++++++++ drivers/infiniband/hw/cxgb4/user.h | 66 + drivers/infiniband/hw/mlx4/cq.c | 8 + drivers/infiniband/hw/mlx4/main.c | 1 + drivers/infiniband/hw/mlx4/qp.c | 50 +- drivers/infiniband/hw/mthca/mthca_allocator.c | 8 +- drivers/infiniband/hw/mthca/mthca_eq.c | 6 +- drivers/infiniband/hw/mthca/mthca_provider.h | 2 +- drivers/infiniband/hw/nes/nes_hw.c | 12 +- drivers/infiniband/hw/nes/nes_nic.c | 16 +- drivers/infiniband/hw/nes/nes_utils.c | 10 - drivers/infiniband/hw/nes/nes_verbs.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 20 + include/linux/mlx4/device.h | 4 +- include/linux/mlx4/qp.h | 7 + include/rdma/ib_verbs.h | 7 + 46 files changed, 9688 insertions(+), 189 deletions(-) create mode 100644 drivers/infiniband/hw/cxgb4/Kconfig create mode 100644 drivers/infiniband/hw/cxgb4/Makefile create mode 100644 drivers/infiniband/hw/cxgb4/cm.c create mode 100644 drivers/infiniband/hw/cxgb4/cq.c create mode 100644 drivers/infiniband/hw/cxgb4/device.c create mode 100644 drivers/infiniband/hw/cxgb4/ev.c create mode 100644 drivers/infiniband/hw/cxgb4/iw_cxgb4.h create mode 100644 drivers/infiniband/hw/cxgb4/mem.c create mode 100644 drivers/infiniband/hw/cxgb4/provider.c create mode 100644 drivers/infiniband/hw/cxgb4/qp.c create mode 100644 drivers/infiniband/hw/cxgb4/resource.c create mode 100644 drivers/infiniband/hw/cxgb4/t4.h create mode 100644 drivers/infiniband/hw/cxgb4/t4fw_ri_api.h create mode 100644 drivers/infiniband/hw/cxgb4/user.h Merging acpi/test $ git merge acpi/test Auto-merging arch/x86/pci/acpi.c Merge made by recursive. Documentation/acpi/apei/einj.txt | 49 +++ Documentation/kernel-parameters.txt | 9 +- arch/ia64/include/asm/acpi.h | 1 - arch/ia64/pci/pci.c | 5 +- arch/x86/include/asm/acpi.h | 2 - arch/x86/kernel/acpi/boot.c | 23 +- arch/x86/lguest/boot.c | 1 - arch/x86/pci/acpi.c | 5 +- drivers/acpi/Kconfig | 2 + drivers/acpi/Makefile | 3 + drivers/acpi/acpi_pad.c | 2 +- drivers/acpi/acpica/Makefile | 2 +- drivers/acpi/acpica/acevents.h | 7 +- drivers/acpi/acpica/acglobal.h | 18 + drivers/acpi/acpica/acinterp.h | 7 + drivers/acpi/acpica/aclocal.h | 5 +- drivers/acpi/acpica/actables.h | 4 + drivers/acpi/acpica/dsfield.c | 2 +- drivers/acpi/acpica/dsmethod.c | 2 +- drivers/acpi/acpica/dsmthdat.c | 10 +- drivers/acpi/acpica/dsobject.c | 14 +- drivers/acpi/acpica/dsopcode.c | 13 +- drivers/acpi/acpica/dswexec.c | 6 +- drivers/acpi/acpica/dswstate.c | 10 +- drivers/acpi/acpica/evevent.c | 2 +- drivers/acpi/acpica/evgpe.c | 165 +++++++--- drivers/acpi/acpica/evgpeblk.c | 147 +++++---- drivers/acpi/acpica/evmisc.c | 2 +- drivers/acpi/acpica/evxface.c | 24 +- drivers/acpi/acpica/evxfevnt.c | 191 +++++++----- drivers/acpi/acpica/exconvrt.c | 4 +- drivers/acpi/acpica/excreate.c | 4 +- drivers/acpi/acpica/exdebug.c | 261 ++++++++++++++++ drivers/acpi/acpica/exfield.c | 2 +- drivers/acpi/acpica/exfldio.c | 16 +- drivers/acpi/acpica/exmisc.c | 8 +- drivers/acpi/acpica/exmutex.c | 46 ++-- drivers/acpi/acpica/exnames.c | 4 +- drivers/acpi/acpica/exoparg1.c | 16 +- drivers/acpi/acpica/exoparg2.c | 37 +-- drivers/acpi/acpica/exoparg3.c | 4 +- drivers/acpi/acpica/exoparg6.c | 4 +- drivers/acpi/acpica/exprep.c | 4 +- drivers/acpi/acpica/exregion.c | 17 +- drivers/acpi/acpica/exresnte.c | 4 +- drivers/acpi/acpica/exresolv.c | 11 +- drivers/acpi/acpica/exresop.c | 8 +- drivers/acpi/acpica/exstore.c | 218 +------------- drivers/acpi/acpica/exsystem.c | 2 +- drivers/acpi/acpica/hwregs.c | 6 +- drivers/acpi/acpica/hwsleep.c | 2 +- drivers/acpi/acpica/hwvalid.c | 2 +- drivers/acpi/acpica/nsaccess.c | 2 +- drivers/acpi/acpica/nsdump.c | 4 +- drivers/acpi/acpica/nsnames.c | 2 +- drivers/acpi/acpica/nssearch.c | 2 +- drivers/acpi/acpica/nsutils.c | 4 +- drivers/acpi/acpica/psargs.c | 4 +- drivers/acpi/acpica/psloop.c | 3 +- drivers/acpi/acpica/psxface.c | 5 + drivers/acpi/acpica/rscreate.c | 14 +- drivers/acpi/acpica/rslist.c | 6 +- drivers/acpi/acpica/rsmisc.c | 4 +- drivers/acpi/acpica/tbfadt.c | 16 +- drivers/acpi/acpica/tbutils.c | 82 +++++- drivers/acpi/acpica/tbxface.c | 62 +++- drivers/acpi/acpica/tbxfroot.c | 6 +- drivers/acpi/acpica/utalloc.c | 2 +- drivers/acpi/acpica/utdelete.c | 6 +- drivers/acpi/acpica/uteval.c | 2 +- drivers/acpi/acpica/utglobal.c | 1 + drivers/acpi/acpica/utmisc.c | 6 +- drivers/acpi/acpica/utmutex.c | 4 +- drivers/acpi/acpica/utobject.c | 8 +- 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/bus.c | 39 +++- drivers/acpi/pci_root.c | 67 +++-- drivers/acpi/power_meter.c | 2 +- drivers/acpi/sbshc.c | 2 +- drivers/acpi/scan.c | 2 +- drivers/acpi/sleep.c | 16 +- drivers/acpi/system.c | 5 +- drivers/acpi/tables.c | 4 +- drivers/acpi/video.c | 118 +++++++- drivers/pnp/pnpacpi/rsparser.c | 26 +-- include/acpi/acexcep.h | 2 +- include/acpi/acoutput.h | 2 + include/acpi/acpi_bus.h | 2 +- include/acpi/acpi_drivers.h | 3 +- include/acpi/acpixf.h | 15 +- include/acpi/actbl2.h | 27 ++ include/acpi/actypes.h | 42 ++-- include/acpi/apei.h | 13 + include/acpi/atomicio.h | 10 + include/acpi/video.h | 16 + 101 files changed, 2990 insertions(+), 765 deletions(-) create mode 100644 Documentation/acpi/apei/einj.txt create mode 100644 drivers/acpi/acpica/exdebug.c 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 include/acpi/apei.h create mode 100644 include/acpi/atomicio.h $ git am -3 ../patches/acpi__update_gfp_slab.h_includes Applying: acpi: update gfp/slab.h includes $ git reset HEAD^ Unstaged changes after reset: M drivers/acpi/apei/apei-base.c M drivers/acpi/atomicio.c $ git add . $ git commit -v -a --amend [master d819d2e] Merge remote branch 'acpi/test' Merging ieee1394/for-next $ git merge ieee1394/for-next Auto-merging drivers/firewire/core-cdev.c Auto-merging drivers/firewire/ohci.c Merge made by recursive. drivers/firewire/core-card.c | 11 +- drivers/firewire/core-cdev.c | 8 +- drivers/firewire/core-transaction.c | 26 ++++- drivers/firewire/core.h | 5 + drivers/firewire/ohci.c | 188 ++++++++++++++++++++++++++++------- drivers/firewire/ohci.h | 10 ++- drivers/ieee1394/dv1394.c | 11 +- drivers/ieee1394/raw1394.c | 3 +- drivers/ieee1394/video1394.c | 5 +- include/linux/firewire.h | 2 - 10 files changed, 209 insertions(+), 60 deletions(-) Merging ubi/linux-next $ git merge ubi/linux-next Already up-to-date. Merging kvm/linux-next $ git merge kvm/linux-next Auto-merging MAINTAINERS Removing arch/powerpc/kvm/book3s_64_emulate.c Removing arch/x86/include/asm/ds.h Auto-merging arch/x86/kernel/cpu/intel.c Removing arch/x86/kernel/ds.c Removing arch/x86/kernel/ds_selftest.c Removing arch/x86/kernel/ds_selftest.h Auto-merging arch/x86/kernel/process_64.c Removing kernel/trace/trace_hw_branches.c Removing tools/perf/util/string.h Merge made by recursive. Documentation/kprobes.txt | 10 +- Documentation/kvm/api.txt | 164 ++- Documentation/kvm/mmu.txt | 302 ++++ Documentation/trace/kprobetrace.txt | 4 +- MAINTAINERS | 10 +- arch/Kconfig | 9 +- arch/ia64/kvm/kvm-ia64.c | 8 +- arch/powerpc/include/asm/asm-compat.h | 2 + arch/powerpc/include/asm/kvm.h | 10 + arch/powerpc/include/asm/kvm_asm.h | 2 + arch/powerpc/include/asm/kvm_book3s.h | 157 ++- .../asm/kvm_book3s_32.h} | 36 +- .../asm/kvm_book3s_64.h} | 22 +- .../asm/{kvm_book3s_64_asm.h => kvm_book3s_asm.h} | 25 +- arch/powerpc/include/asm/kvm_booke.h | 96 ++ arch/powerpc/include/asm/kvm_fpu.h | 85 ++ arch/powerpc/include/asm/kvm_host.h | 38 +- arch/powerpc/include/asm/kvm_ppc.h | 97 +- arch/powerpc/include/asm/mmu_context.h | 2 + arch/powerpc/include/asm/paca.h | 10 +- arch/powerpc/include/asm/processor.h | 3 + arch/powerpc/include/asm/reg.h | 10 + arch/powerpc/kernel/asm-offsets.c | 102 +- arch/powerpc/kernel/head_32.S | 14 + arch/powerpc/kernel/head_64.S | 4 +- arch/powerpc/kernel/ppc_ksyms.c | 4 + arch/powerpc/kvm/Kconfig | 24 +- arch/powerpc/kvm/Makefile | 20 +- arch/powerpc/kvm/book3s.c | 489 +++++-- arch/powerpc/kvm/book3s_32_mmu.c | 54 +- arch/powerpc/kvm/book3s_32_mmu_host.c | 483 ++++++ arch/powerpc/kvm/book3s_32_sr.S | 143 ++ arch/powerpc/kvm/book3s_64_emulate.c | 348 ----- arch/powerpc/kvm/book3s_64_mmu.c | 36 +- arch/powerpc/kvm/book3s_64_mmu_host.c | 102 +- arch/powerpc/kvm/book3s_64_slb.S | 183 +-- arch/powerpc/kvm/book3s_emulate.c | 573 +++++++ .../kvm/{book3s_64_exports.c => book3s_exports.c} | 0 ...{book3s_64_interrupts.S => book3s_interrupts.S} | 204 ++-- arch/powerpc/kvm/book3s_paired_singles.c | 1289 ++++++++++++++++ ...{book3s_64_rmhandlers.S => book3s_rmhandlers.S} | 135 ++- arch/powerpc/kvm/book3s_segment.S | 259 ++++ arch/powerpc/kvm/booke.c | 6 + arch/powerpc/kvm/emulate.c | 55 +- arch/powerpc/kvm/fpu.S | 273 ++++ arch/powerpc/kvm/powerpc.c | 110 ++- arch/powerpc/mm/mmu_context_hash32.c | 29 +- arch/s390/kvm/kvm-s390.c | 4 +- arch/s390/kvm/kvm-s390.h | 2 +- arch/x86/Kconfig | 3 + arch/x86/Kconfig.cpu | 20 - arch/x86/Kconfig.debug | 9 - arch/x86/include/asm/apic.h | 13 +- arch/x86/include/asm/ds.h | 302 ---- arch/x86/include/asm/insn.h | 2 + arch/x86/include/asm/kprobes.h | 2 +- arch/x86/include/asm/kvm.h | 17 +- arch/x86/include/asm/kvm_emulate.h | 46 +- arch/x86/include/asm/kvm_host.h | 79 +- arch/x86/include/asm/msr-index.h | 15 +- arch/x86/include/asm/perf_event.h | 76 +- arch/x86/include/asm/perf_event_p4.h | 794 ++++++++++ arch/x86/include/asm/processor.h | 35 +- arch/x86/include/asm/ptrace-abi.h | 57 +- arch/x86/include/asm/ptrace.h | 6 - arch/x86/include/asm/svm.h | 9 +- arch/x86/include/asm/thread_info.h | 8 +- arch/x86/kernel/Makefile | 2 - arch/x86/kernel/cpu/intel.c | 2 - arch/x86/kernel/cpu/perf_event.c | 560 ++++---- arch/x86/kernel/cpu/perf_event_amd.c | 46 +- arch/x86/kernel/cpu/perf_event_intel.c | 354 +++-- arch/x86/kernel/cpu/perf_event_intel_ds.c | 664 +++++++++ arch/x86/kernel/cpu/perf_event_intel_lbr.c | 218 +++ arch/x86/kernel/cpu/perf_event_p4.c | 834 +++++++++++ arch/x86/kernel/cpu/perf_event_p6.c | 31 +- arch/x86/kernel/ds.c | 1437 ------------------ arch/x86/kernel/ds_selftest.c | 408 ----- arch/x86/kernel/ds_selftest.h | 15 - arch/x86/kernel/dumpstack.c | 5 - arch/x86/kernel/kprobes.c | 16 +- arch/x86/kernel/process.c | 18 +- arch/x86/kernel/process_32.c | 8 - arch/x86/kernel/process_64.c | 8 - arch/x86/kernel/ptrace.c | 382 ----- arch/x86/kernel/step.c | 46 +- arch/x86/kernel/traps.c | 4 +- arch/x86/kvm/emulate.c | 1247 ++++++++++++---- arch/x86/kvm/i8259.c | 53 +- arch/x86/kvm/irq.h | 1 + arch/x86/kvm/kvm_timer.h | 4 +- arch/x86/kvm/mmu.c | 189 ++-- arch/x86/kvm/mmutrace.h | 13 +- arch/x86/kvm/paging_tmpl.h | 37 +- arch/x86/kvm/svm.c | 939 ++++++++---- arch/x86/kvm/timer.c | 3 +- arch/x86/kvm/trace.h | 165 ++- arch/x86/kvm/vmx.c | 287 ++-- arch/x86/kvm/x86.c | 1548 ++++++++------------ arch/x86/kvm/x86.h | 10 + arch/x86/lib/Makefile | 2 +- arch/x86/oprofile/op_model_ppro.c | 4 +- include/linux/ftrace.h | 12 - include/linux/kvm.h | 26 + include/linux/kvm_host.h | 14 +- include/linux/mm.h | 4 - include/linux/perf_event.h | 51 +- include/linux/ptrace.h | 12 - include/linux/sched.h | 9 - include/trace/events/kvm.h | 1 - include/trace/ftrace.h | 23 +- kernel/fork.c | 3 - kernel/perf_event.c | 283 +++- kernel/ptrace.c | 1 - kernel/sched.c | 43 - kernel/trace/Kconfig | 11 - kernel/trace/Makefile | 1 - kernel/trace/trace.h | 20 +- kernel/trace/trace_entries.h | 12 - kernel/trace/trace_hw_branches.c | 312 ---- kernel/trace/trace_kprobe.c | 535 ++++--- kernel/trace/trace_selftest.c | 57 - mm/mlock.c | 41 - tools/perf/Documentation/perf-bench.txt | 6 +- tools/perf/Documentation/perf-kvm.txt | 67 + tools/perf/Documentation/perf-probe.txt | 18 +- tools/perf/Documentation/perf-record.txt | 4 +- tools/perf/Documentation/perf-sched.txt | 4 +- tools/perf/Makefile | 340 +++-- tools/perf/bench/mem-memcpy.c | 3 +- tools/perf/bench/sched-messaging.c | 4 +- tools/perf/bench/sched-pipe.c | 2 +- tools/perf/builtin-annotate.c | 57 +- tools/perf/builtin-buildid-cache.c | 2 +- tools/perf/builtin-buildid-list.c | 6 +- tools/perf/builtin-diff.c | 10 +- tools/perf/builtin-help.c | 2 +- tools/perf/builtin-kmem.c | 16 +- tools/perf/builtin-kvm.c | 144 ++ tools/perf/builtin-lock.c | 2 +- tools/perf/builtin-probe.c | 279 ++--- tools/perf/builtin-record.c | 498 +++++-- tools/perf/builtin-report.c | 99 +- tools/perf/builtin-sched.c | 8 +- tools/perf/builtin-stat.c | 155 ++- tools/perf/builtin-timechart.c | 5 +- tools/perf/builtin-top.c | 290 +++-- tools/perf/builtin-trace.c | 77 +- tools/perf/builtin.h | 1 + tools/perf/command-list.txt | 1 + tools/perf/perf-archive.sh | 3 + tools/perf/perf.c | 6 +- tools/perf/perf.h | 8 +- .../perl/Perf-Trace-Util/lib/Perf/Trace/Util.pm | 6 + tools/perf/scripts/perl/bin/failed-syscalls-record | 2 +- tools/perf/scripts/perl/bin/failed-syscalls-report | 8 +- tools/perf/scripts/perl/bin/rw-by-file-record | 3 +- tools/perf/scripts/perl/bin/rw-by-file-report | 8 +- tools/perf/scripts/perl/bin/rw-by-pid-record | 2 +- tools/perf/scripts/perl/bin/rw-by-pid-report | 2 +- tools/perf/scripts/perl/bin/rwtop-record | 2 + tools/perf/scripts/perl/bin/rwtop-report | 23 + tools/perf/scripts/perl/bin/wakeup-latency-record | 2 +- tools/perf/scripts/perl/bin/wakeup-latency-report | 2 +- tools/perf/scripts/perl/bin/workqueue-stats-record | 2 +- tools/perf/scripts/perl/bin/workqueue-stats-report | 2 +- tools/perf/scripts/perl/rwtop.pl | 177 +++ .../python/Perf-Trace-Util/lib/Perf/Trace/Util.py | 3 + .../python/bin/failed-syscalls-by-pid-record | 2 +- .../python/bin/failed-syscalls-by-pid-report | 8 +- tools/perf/scripts/python/bin/sctop-record | 2 + tools/perf/scripts/python/bin/sctop-report | 24 + .../python/bin/syscall-counts-by-pid-record | 2 +- .../python/bin/syscall-counts-by-pid-report | 8 +- .../perf/scripts/python/bin/syscall-counts-record | 2 +- .../perf/scripts/python/bin/syscall-counts-report | 8 +- tools/perf/scripts/python/sctop.py | 78 + tools/perf/util/PERF-VERSION-GEN | 6 +- tools/perf/util/build-id.c | 2 +- tools/perf/util/cache.h | 14 + tools/perf/util/callchain.c | 110 +- tools/perf/util/callchain.h | 6 +- tools/perf/util/color.c | 48 + tools/perf/util/color.h | 4 + tools/perf/util/debug.c | 8 +- tools/perf/util/debug.h | 30 +- tools/perf/util/event.c | 324 +++-- tools/perf/util/event.h | 49 +- tools/perf/util/header.c | 524 ++++++- tools/perf/util/header.h | 41 +- tools/perf/util/hist.c | 219 ++- tools/perf/util/hist.h | 15 +- tools/perf/util/include/linux/compiler.h | 2 + tools/perf/util/include/linux/kernel.h | 9 +- tools/perf/util/map.c | 426 ++++++- tools/perf/util/map.h | 121 ++- tools/perf/util/newt.c | 725 +++++++++ tools/perf/util/parse-events.c | 21 +- tools/perf/util/parse-options.c | 7 + tools/perf/util/parse-options.h | 4 +- tools/perf/util/probe-event.c | 1574 +++++++++++++++----- tools/perf/util/probe-event.h | 130 ++- tools/perf/util/probe-finder.c | 990 ++++++++++--- tools/perf/util/probe-finder.h | 65 +- tools/perf/util/session.c | 325 +++-- tools/perf/util/session.h | 50 +- tools/perf/util/sort.c | 145 +- tools/perf/util/sort.h | 30 +- tools/perf/util/string.c | 45 +- tools/perf/util/string.h | 18 - tools/perf/util/symbol.c | 494 +++++-- tools/perf/util/symbol.h | 74 +- tools/perf/util/thread.c | 242 +--- tools/perf/util/thread.h | 53 +- tools/perf/util/trace-event-info.c | 24 + tools/perf/util/trace-event-parse.c | 53 +- tools/perf/util/trace-event-read.c | 89 +- tools/perf/util/trace-event.h | 7 +- tools/perf/util/util.h | 21 + virt/kvm/assigned-dev.c | 8 +- virt/kvm/coalesced_mmio.c | 6 +- virt/kvm/iommu.c | 4 +- virt/kvm/kvm_main.c | 56 +- 223 files changed, 18747 insertions(+), 9537 deletions(-) create mode 100644 Documentation/kvm/mmu.txt copy arch/powerpc/{kvm/book3s_64_exports.c => include/asm/kvm_book3s_32.h} (53%) copy arch/powerpc/{kvm/book3s_64_exports.c => include/asm/kvm_book3s_64.h} (64%) rename arch/powerpc/include/asm/{kvm_book3s_64_asm.h => kvm_book3s_asm.h} (82%) create mode 100644 arch/powerpc/include/asm/kvm_booke.h create mode 100644 arch/powerpc/include/asm/kvm_fpu.h create mode 100644 arch/powerpc/kvm/book3s_32_mmu_host.c create mode 100644 arch/powerpc/kvm/book3s_32_sr.S delete mode 100644 arch/powerpc/kvm/book3s_64_emulate.c create mode 100644 arch/powerpc/kvm/book3s_emulate.c rename arch/powerpc/kvm/{book3s_64_exports.c => book3s_exports.c} (100%) rename arch/powerpc/kvm/{book3s_64_interrupts.S => book3s_interrupts.S} (62%) create mode 100644 arch/powerpc/kvm/book3s_paired_singles.c rename arch/powerpc/kvm/{book3s_64_rmhandlers.S => book3s_rmhandlers.S} (62%) create mode 100644 arch/powerpc/kvm/book3s_segment.S create mode 100644 arch/powerpc/kvm/fpu.S delete mode 100644 arch/x86/include/asm/ds.h create mode 100644 arch/x86/include/asm/perf_event_p4.h create mode 100644 arch/x86/kernel/cpu/perf_event_intel_ds.c create mode 100644 arch/x86/kernel/cpu/perf_event_intel_lbr.c create mode 100644 arch/x86/kernel/cpu/perf_event_p4.c delete mode 100644 arch/x86/kernel/ds.c delete mode 100644 arch/x86/kernel/ds_selftest.c delete mode 100644 arch/x86/kernel/ds_selftest.h delete mode 100644 kernel/trace/trace_hw_branches.c create mode 100644 tools/perf/Documentation/perf-kvm.txt create mode 100644 tools/perf/builtin-kvm.c create mode 100644 tools/perf/scripts/perl/bin/rwtop-record create mode 100644 tools/perf/scripts/perl/bin/rwtop-report create mode 100644 tools/perf/scripts/perl/rwtop.pl create mode 100644 tools/perf/scripts/python/bin/sctop-record create mode 100644 tools/perf/scripts/python/bin/sctop-report create mode 100644 tools/perf/scripts/python/sctop.py create mode 100644 tools/perf/util/newt.c delete mode 100644 tools/perf/util/string.h $ git am -3 ../patches/0001-kvm-powerpc-use-of-kzalloc-kfree-requires-including-.patch Applying: kvm: powerpc: use of kzalloc/kfree requires including slab.h $ git reset HEAD^ Unstaged changes after reset: M arch/powerpc/kvm/book3s.c $ git add . $ git commit -v -a --amend [master b9e0c88] Merge remote branch 'kvm/linux-next' Merging dlm/next $ git merge dlm/next Merge made by recursive. fs/dlm/lock.c | 5 +-- fs/dlm/user.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 75 insertions(+), 18 deletions(-) Merging ibft/master $ git merge ibft/master Merge made by recursive. drivers/firmware/Kconfig | 9 + drivers/firmware/Makefile | 1 + drivers/firmware/iscsi_boot_sysfs.c | 481 +++++++++++++++++++++++ drivers/firmware/iscsi_ibft.c | 726 +++++++++++++---------------------- drivers/firmware/iscsi_ibft_find.c | 55 ++- include/linux/iscsi_boot_sysfs.h | 123 ++++++ include/linux/iscsi_ibft.h | 12 +- 7 files changed, 923 insertions(+), 484 deletions(-) create mode 100644 drivers/firmware/iscsi_boot_sysfs.c create mode 100644 include/linux/iscsi_boot_sysfs.h Merging scsi/master $ git merge scsi/master Auto-merging MAINTAINERS Auto-merging drivers/s390/scsi/zfcp_fsf.c Auto-merging drivers/scsi/bnx2i/bnx2i_init.c Auto-merging drivers/scsi/iscsi_tcp.c Auto-merging drivers/scsi/qla4xxx/ql4_mbx.c Auto-merging drivers/scsi/scsi_debug.c Auto-merging drivers/scsi/sd.c Auto-merging include/trace/ftrace.h Merge made by recursive. MAINTAINERS | 23 +- drivers/message/fusion/mptbase.c | 177 ++- drivers/message/fusion/mptbase.h | 5 +- drivers/message/fusion/mptctl.c | 181 +- drivers/message/fusion/mptfc.c | 22 +- drivers/message/fusion/mptsas.c | 55 +- drivers/message/fusion/mptsas.h | 2 +- drivers/message/fusion/mptscsih.c | 27 +- drivers/message/fusion/mptspi.c | 10 + drivers/s390/scsi/zfcp_aux.c | 7 +- drivers/s390/scsi/zfcp_def.h | 19 +- drivers/s390/scsi/zfcp_erp.c | 2 +- drivers/s390/scsi/zfcp_ext.h | 6 +- drivers/s390/scsi/zfcp_fc.c | 4 +- drivers/s390/scsi/zfcp_fsf.c | 246 +-- drivers/s390/scsi/zfcp_fsf.h | 11 +- drivers/s390/scsi/zfcp_qdio.c | 108 +- drivers/s390/scsi/zfcp_qdio.h | 104 + drivers/s390/scsi/zfcp_scsi.c | 23 +- drivers/scsi/3w-9xxx.c | 24 +- drivers/scsi/3w-9xxx.h | 9 +- drivers/scsi/3w-xxxx.c | 23 +- drivers/scsi/3w-xxxx.h | 8 +- drivers/scsi/Makefile | 1 + drivers/scsi/a2091.c | 309 ++-- drivers/scsi/a2091.h | 42 +- drivers/scsi/a3000.c | 285 ++-- drivers/scsi/a3000.h | 46 +- drivers/scsi/bfa/bfa_cb_ioim_macros.h | 29 - drivers/scsi/bfa/bfa_ioim.c | 22 +- drivers/scsi/bfa/bfa_os_inc.h | 23 +- drivers/scsi/bfa/bfad.c | 21 +- drivers/scsi/bfa/bfad_attr.c | 201 ++ drivers/scsi/bfa/bfad_drv.h | 4 +- drivers/scsi/bfa/bfad_im.c | 67 +- drivers/scsi/bfa/bfad_im.h | 6 +- drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- drivers/scsi/bnx2i/bnx2i_init.c | 11 +- drivers/scsi/cxgb3i/cxgb3i_init.c | 4 +- drivers/scsi/device_handler/scsi_dh_emc.c | 2 - drivers/scsi/fcoe/fcoe.c | 109 +- drivers/scsi/fcoe/libfcoe.c | 95 +- drivers/scsi/fnic/fnic.h | 4 +- drivers/scsi/fnic/fnic_fcs.c | 2 +- drivers/scsi/fnic/fnic_main.c | 2 +- drivers/scsi/gdth.c | 2 +- drivers/scsi/gvp11.c | 565 +++--- drivers/scsi/gvp11.h | 36 +- drivers/scsi/hpsa.c | 8 - drivers/scsi/hpsa_cmd.h | 15 - drivers/scsi/ibmvscsi/ibmvfc.c | 8 +- drivers/scsi/ibmvscsi/ibmvfc.h | 1 + drivers/scsi/iscsi_tcp.c | 6 +- drivers/scsi/iscsi_tcp.h | 1 - drivers/scsi/libfc/fc_disc.c | 6 +- drivers/scsi/libfc/fc_exch.c | 45 +- drivers/scsi/libfc/fc_fcp.c | 93 +- drivers/scsi/libfc/fc_libfc.h | 6 +- drivers/scsi/libfc/fc_lport.c | 31 +- drivers/scsi/libfc/fc_npiv.c | 3 + drivers/scsi/libfc/fc_rport.c | 195 +- drivers/scsi/libiscsi_tcp.c | 2 +- drivers/scsi/lpfc/lpfc.h | 4 + drivers/scsi/lpfc/lpfc_attr.c | 20 +- drivers/scsi/lpfc/lpfc_bsg.c | 498 ++++- drivers/scsi/lpfc/lpfc_bsg.h | 3 +- drivers/scsi/lpfc/lpfc_crtn.h | 1 + drivers/scsi/lpfc/lpfc_disc.h | 1 + drivers/scsi/lpfc/lpfc_els.c | 24 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 79 +- drivers/scsi/lpfc/lpfc_hw.h | 190 +- drivers/scsi/lpfc/lpfc_hw4.h | 60 +- drivers/scsi/lpfc/lpfc_init.c | 213 ++- drivers/scsi/lpfc/lpfc_mbox.c | 69 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 99 +- drivers/scsi/lpfc/lpfc_scsi.c | 149 +- drivers/scsi/lpfc/lpfc_sli.c | 269 ++- drivers/scsi/lpfc/lpfc_sli.h | 4 + drivers/scsi/lpfc/lpfc_sli4.h | 5 +- drivers/scsi/lpfc/lpfc_version.h | 2 +- drivers/scsi/lpfc/lpfc_vport.c | 4 +- drivers/scsi/mpt2sas/Kconfig | 2 +- drivers/scsi/mpt2sas/mpi/mpi2.h | 2 +- drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 2 +- drivers/scsi/mpt2sas/mpi/mpi2_history.txt | 2 +- drivers/scsi/mpt2sas/mpi/mpi2_init.h | 2 +- drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 2 +- drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 2 +- drivers/scsi/mpt2sas/mpt2sas_base.c | 90 +- drivers/scsi/mpt2sas/mpt2sas_base.h | 36 +- drivers/scsi/mpt2sas/mpt2sas_config.c | 8 +- drivers/scsi/mpt2sas/mpt2sas_ctl.c | 46 +- drivers/scsi/mpt2sas/mpt2sas_ctl.h | 2 +- drivers/scsi/mpt2sas/mpt2sas_debug.h | 2 +- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 1055 +++++---- drivers/scsi/mpt2sas/mpt2sas_transport.c | 89 +- drivers/scsi/mvme147.c | 169 +- drivers/scsi/mvme147.h | 4 +- drivers/scsi/mvsas/mv_64xx.c | 25 +- drivers/scsi/mvsas/mv_94xx.c | 10 + drivers/scsi/mvsas/mv_init.c | 19 +- drivers/scsi/mvsas/mv_sas.c | 201 ++- drivers/scsi/mvsas/mv_sas.h | 11 +- drivers/scsi/pm8001/pm8001_hwi.c | 1 - drivers/scsi/pm8001/pm8001_sas.c | 4 +- drivers/scsi/pmcraid.c | 6 - drivers/scsi/qla2xxx/Makefile | 3 +- drivers/scsi/qla2xxx/qla_attr.c | 743 +------ drivers/scsi/qla2xxx/qla_bsg.c | 1208 ++++++++++ drivers/scsi/qla2xxx/qla_bsg.h | 135 ++ drivers/scsi/qla2xxx/qla_dbg.c | 3 + drivers/scsi/qla2xxx/qla_def.h | 186 +- drivers/scsi/qla2xxx/qla_fw.h | 59 + drivers/scsi/qla2xxx/qla_gbl.h | 102 +- drivers/scsi/qla2xxx/qla_gs.c | 2 +- drivers/scsi/qla2xxx/qla_init.c | 403 +++- drivers/scsi/qla2xxx/qla_inline.h | 5 +- drivers/scsi/qla2xxx/qla_iocb.c | 74 +- drivers/scsi/qla2xxx/qla_isr.c | 42 +- drivers/scsi/qla2xxx/qla_mbx.c | 256 ++- drivers/scsi/qla2xxx/qla_nx.c | 3635 +++++++++++++++++++++++++++++ drivers/scsi/qla2xxx/qla_nx.h | 888 +++++++ drivers/scsi/qla2xxx/qla_os.c | 372 +++- drivers/scsi/qla2xxx/qla_sup.c | 149 ++- drivers/scsi/qla4xxx/ql4_def.h | 48 +- drivers/scsi/qla4xxx/ql4_fw.h | 46 +- drivers/scsi/qla4xxx/ql4_glbl.h | 8 +- drivers/scsi/qla4xxx/ql4_init.c | 374 +++- drivers/scsi/qla4xxx/ql4_iocb.c | 2 +- drivers/scsi/qla4xxx/ql4_isr.c | 23 +- drivers/scsi/qla4xxx/ql4_mbx.c | 337 ++- drivers/scsi/qla4xxx/ql4_os.c | 135 +- drivers/scsi/qla4xxx/ql4_version.h | 3 +- drivers/scsi/scsi.c | 6 + drivers/scsi/scsi_debug.c | 89 +- drivers/scsi/scsi_error.c | 19 +- drivers/scsi/scsi_scan.c | 3 +- drivers/scsi/scsi_sysfs.c | 7 +- drivers/scsi/scsi_trace.c | 284 +++ drivers/scsi/scsi_transport_fc.c | 30 +- drivers/scsi/sd.c | 25 +- drivers/scsi/wd33c93.c | 6 - drivers/scsi/wd33c93.h | 1 - include/linux/ftrace_event.h | 3 + include/scsi/Kbuild | 1 - include/scsi/fc/fc_fcp.h | 1 + include/scsi/libfc.h | 26 +- include/scsi/libfcoe.h | 10 +- include/scsi/scsi.h | 3 + include/scsi/scsi_transport_fc.h | 2 +- include/trace/events/scsi.h | 345 +++ include/trace/ftrace.h | 3 + kernel/trace/trace_output.c | 16 + 153 files changed, 13251 insertions(+), 3762 deletions(-) create mode 100644 drivers/scsi/qla2xxx/qla_bsg.c create mode 100644 drivers/scsi/qla2xxx/qla_bsg.h create mode 100644 drivers/scsi/qla2xxx/qla_nx.c create mode 100644 drivers/scsi/qla2xxx/qla_nx.h create mode 100644 drivers/scsi/scsi_trace.c create mode 100644 include/trace/events/scsi.h Merging async_tx/next $ git merge async_tx/next Auto-merging drivers/dma/Kconfig Auto-merging drivers/dma/at_hdmac.c Auto-merging drivers/dma/dmaengine.c Auto-merging drivers/dma/fsldma.c Auto-merging drivers/dma/ioat/dma.c Auto-merging drivers/dma/ioat/dma_v2.c Auto-merging drivers/dma/ioat/dma_v3.c Auto-merging drivers/dma/iop-adma.c Auto-merging drivers/dma/mpc512x_dma.c Auto-merging drivers/dma/mv_xor.c Auto-merging drivers/dma/ppc4xx/adma.c Auto-merging drivers/dma/shdma.c Auto-merging drivers/dma/txx9dmac.c Auto-merging drivers/mmc/host/atmel-mci.c Auto-merging drivers/serial/sh-sci.c Auto-merging sound/soc/txx9/txx9aclc.c Merge made by recursive. arch/arm/mach-u300/include/mach/coh901318.h | 21 - arch/arm/plat-nomadik/include/plat/ste_dma40.h | 239 +++ drivers/dma/Kconfig | 14 + drivers/dma/Makefile | 2 + drivers/dma/at_hdmac.c | 34 +- drivers/dma/coh901318.c | 262 ++- drivers/dma/dmaengine.c | 4 +- drivers/dma/dw_dmac.c | 23 +- drivers/dma/fsldma.c | 28 +- drivers/dma/ioat/dma.c | 12 +- drivers/dma/ioat/dma.h | 18 +- drivers/dma/ioat/dma_v2.c | 2 +- drivers/dma/ioat/dma_v3.c | 20 +- drivers/dma/iop-adma.c | 39 +- drivers/dma/ipu/ipu_idmac.c | 32 +- drivers/dma/mpc512x_dma.c | 13 +- drivers/dma/mv_xor.c | 25 +- drivers/dma/ppc4xx/adma.c | 19 +- drivers/dma/shdma.c | 26 +- drivers/dma/ste_dma40.c | 2718 ++++++++++++++++++++++++ drivers/dma/ste_dma40_ll.c | 454 ++++ drivers/dma/ste_dma40_ll.h | 354 +++ drivers/dma/timb_dma.c | 859 ++++++++ drivers/dma/txx9dmac.c | 22 +- drivers/mmc/host/atmel-mci.c | 2 +- drivers/serial/sh-sci.c | 2 +- drivers/video/mx3fb.c | 3 +- include/linux/amba/dma.h | 49 + include/linux/dmaengine.h | 66 +- include/linux/timb_dma.h | 55 + sound/soc/txx9/txx9aclc.c | 6 +- 31 files changed, 5151 insertions(+), 272 deletions(-) create mode 100644 arch/arm/plat-nomadik/include/plat/ste_dma40.h create mode 100644 drivers/dma/ste_dma40.c create mode 100644 drivers/dma/ste_dma40_ll.c create mode 100644 drivers/dma/ste_dma40_ll.h create mode 100644 drivers/dma/timb_dma.c create mode 100644 include/linux/amba/dma.h create mode 100644 include/linux/timb_dma.h Merging net/master $ git merge net/master Resolved 'drivers/scsi/iscsi_tcp.c' using previous resolution. Auto-merging MAINTAINERS Auto-merging drivers/infiniband/hw/nes/nes_nic.c Removing drivers/net/pppol2tp.c Removing drivers/net/stmmac/dwmac100.c Auto-merging drivers/net/wireless/ath/ar9170/usb.c Removing drivers/net/wireless/ath/ath9k/phy.c Removing drivers/net/wireless/wl12xx/wl1271_spi.h Auto-merging drivers/scsi/fcoe/fcoe.c Auto-merging drivers/scsi/iscsi_tcp.c CONFLICT (content): Merge conflict in drivers/scsi/iscsi_tcp.c Auto-merging include/linux/fs.h Removing net/core/dev_mcast.c Auto-merging net/sunrpc/xprt.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 17c3da8] Merge remote branch 'net/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 | 39 + Documentation/networking/caif/Linux-CAIF.txt | 212 ++ Documentation/networking/caif/README | 109 + Documentation/networking/l2tp.txt | 247 ++- Documentation/networking/x25-iface.txt | 16 +- Documentation/rfkill.txt | 44 +- MAINTAINERS | 9 +- arch/arm/mach-pxa/icontrol.c | 9 +- arch/arm/mach-pxa/zeus.c | 4 +- arch/microblaze/include/asm/system.h | 11 + arch/mips/sibyte/swarm/platform.c | 54 + drivers/atm/atmtcp.c | 6 +- drivers/atm/eni.c | 2 +- drivers/atm/he.c | 4 +- drivers/infiniband/hw/nes/nes_nic.c | 7 +- drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 15 +- drivers/isdn/i4l/isdn_x25iface.c | 17 +- drivers/media/dvb/dvb-core/dvb_net.c | 14 +- drivers/net/3c503.c | 42 +- drivers/net/3c505.c | 7 +- drivers/net/3c523.c | 7 +- drivers/net/3c527.c | 6 +- drivers/net/3c59x.c | 4 +- drivers/net/7990.c | 6 +- drivers/net/8139cp.c | 6 +- drivers/net/8139too.c | 6 +- drivers/net/82596.c | 6 +- drivers/net/Kconfig | 25 +- drivers/net/Makefile | 3 +- drivers/net/a2065.c | 6 +- drivers/net/acenic.c | 42 +- drivers/net/acenic.h | 6 +- drivers/net/amd8111e.c | 6 +- drivers/net/arm/am79c961a.c | 6 +- drivers/net/arm/at91_ether.c | 6 +- drivers/net/arm/ixp4xx_eth.c | 8 +- drivers/net/arm/ks8695net.c | 10 +- drivers/net/arm/w90p910_ether.c | 1 - drivers/net/at1700.c | 6 +- drivers/net/atl1c/atl1c_main.c | 7 +- drivers/net/atl1e/atl1e_main.c | 9 +- drivers/net/atlx/atl1.c | 4 +- drivers/net/atlx/atl2.c | 7 +- drivers/net/atlx/atlx.c | 6 +- drivers/net/atp.c | 6 +- drivers/net/au1000_eth.c | 259 +- drivers/net/au1000_eth.h | 4 +- drivers/net/b44.c | 6 +- drivers/net/bcm63xx_enet.c | 12 +- drivers/net/benet/be.h | 11 +- drivers/net/benet/be_cmds.c | 14 +- drivers/net/benet/be_cmds.h | 2 +- drivers/net/benet/be_ethtool.c | 2 +- drivers/net/benet/be_hw.h | 3 + drivers/net/benet/be_main.c | 305 ++- drivers/net/bfin_mac.c | 6 +- drivers/net/bmac.c | 12 +- drivers/net/bnx2.c | 45 +- drivers/net/bnx2.h | 6 +- drivers/net/bnx2x.h | 66 +- drivers/net/bnx2x_link.c | 12 +- drivers/net/bnx2x_main.c | 1874 +++++++++++--- drivers/net/bnx2x_reg.h | 27 +- drivers/net/bonding/bond_ipv6.c | 9 +- drivers/net/bonding/bond_main.c | 176 +- drivers/net/bonding/bonding.h | 2 +- drivers/net/caif/Kconfig | 17 + drivers/net/caif/Makefile | 12 + drivers/net/caif/caif_serial.c | 449 ++++ drivers/net/can/at91_can.c | 3 - drivers/net/can/bfin_can.c | 1 - drivers/net/can/mcp251x.c | 15 +- drivers/net/can/mscan/mpc5xxx_can.c | 1 - drivers/net/can/mscan/mscan.c | 1 - drivers/net/can/sja1000/Kconfig | 4 +- drivers/net/can/sja1000/ems_pci.c | 1 - drivers/net/can/sja1000/kvaser_pci.c | 1 - drivers/net/can/sja1000/plx_pci.c | 154 ++- drivers/net/can/sja1000/sja1000.c | 1 - drivers/net/can/sja1000/sja1000_isa.c | 1 - drivers/net/can/sja1000/sja1000_of_platform.c | 1 - drivers/net/can/sja1000/sja1000_platform.c | 45 +- drivers/net/can/ti_hecc.c | 1 - drivers/net/cassini.c | 12 +- drivers/net/chelsio/pm3393.c | 7 +- drivers/net/chelsio/sge.c | 58 +- drivers/net/cpmac.c | 16 +- drivers/net/cris/eth_v10.c | 6 +- drivers/net/cxgb3/sge.c | 20 +- drivers/net/cxgb3/xgmac.c | 8 +- drivers/net/cxgb4/cxgb4.h | 4 +- drivers/net/cxgb4/cxgb4_main.c | 23 +- drivers/net/cxgb4/sge.c | 11 +- drivers/net/cxgb4/t4_hw.c | 86 +- drivers/net/cxgb4/t4_msg.h | 1 + drivers/net/davinci_emac.c | 7 +- drivers/net/declance.c | 6 +- drivers/net/defxx.c | 6 +- drivers/net/depca.c | 6 +- drivers/net/dl2k.c | 6 +- drivers/net/dm9000.c | 6 +- drivers/net/dnet.c | 2 +- drivers/net/e100.c | 189 +- drivers/net/e1000/e1000.h | 37 +- drivers/net/e1000/e1000_ethtool.c | 77 +- drivers/net/e1000/e1000_hw.c | 356 ++-- drivers/net/e1000/e1000_hw.h | 1 + drivers/net/e1000/e1000_main.c | 360 ++-- drivers/net/e1000/e1000_osdep.h | 14 - drivers/net/e1000/e1000_param.c | 94 +- drivers/net/e1000e/82571.c | 2 +- drivers/net/e1000e/e1000.h | 24 +- drivers/net/e1000e/ethtool.c | 30 +- drivers/net/e1000e/ich8lan.c | 6 +- drivers/net/e1000e/lib.c | 21 +- drivers/net/e1000e/netdev.c | 655 ++++- drivers/net/e1000e/param.c | 16 +- drivers/net/eepro.c | 10 +- drivers/net/eexpress.c | 6 +- drivers/net/ehea/ehea.h | 2 +- drivers/net/ehea/ehea_main.c | 66 +- drivers/net/ehea/ehea_qmr.c | 43 +- drivers/net/ehea/ehea_qmr.h | 14 +- drivers/net/enic/cq_enet_desc.h | 12 +- drivers/net/enic/enic.h | 4 +- drivers/net/enic/enic_main.c | 11 +- drivers/net/enic/vnic_dev.c | 52 +- drivers/net/enic/vnic_dev.h | 3 + drivers/net/enic/vnic_rq.c | 4 +- drivers/net/enic/vnic_wq.c | 4 +- drivers/net/epic100.c | 6 +- drivers/net/ethoc.c | 6 +- drivers/net/ewrk3.c | 9 +- drivers/net/fealnx.c | 6 +- drivers/net/fec.c | 1138 ++------- drivers/net/fec_mpc52xx.c | 7 +- drivers/net/forcedeth.c | 45 +- drivers/net/fs_enet/mac-fcc.c | 6 +- drivers/net/fs_enet/mac-fec.c | 6 +- drivers/net/fs_enet/mac-scc.c | 6 +- drivers/net/gianfar.c | 191 ++- drivers/net/gianfar.h | 8 +- drivers/net/greth.c | 7 +- drivers/net/hamachi.c | 8 +- drivers/net/hamradio/baycom_ser_fdx.c | 2 +- drivers/net/hp100.c | 6 +- drivers/net/ibm_newemac/core.c | 12 +- drivers/net/ibmlana.c | 8 +- drivers/net/ibmveth.c | 6 +- drivers/net/igb/e1000_82575.c | 33 +- drivers/net/igb/e1000_82575.h | 9 +- drivers/net/igb/e1000_defines.h | 5 +- drivers/net/igb/e1000_hw.h | 17 +- drivers/net/igb/e1000_mac.c | 27 +- drivers/net/igb/igb.h | 5 +- drivers/net/igb/igb_ethtool.c | 58 +- drivers/net/igb/igb_main.c | 567 ++++- drivers/net/igbvf/netdev.c | 82 +- drivers/net/ioc3-eth.c | 6 +- drivers/net/ipg.c | 11 +- drivers/net/ipg.h | 109 +- drivers/net/irda/Kconfig | 6 + drivers/net/irda/Makefile | 1 + drivers/net/irda/ali-ircc.c | 32 +- drivers/net/irda/irda-usb.c | 2 +- drivers/net/irda/sh_irda.c | 865 +++++++ drivers/net/irda/sh_sir.c | 12 +- drivers/net/irda/vlsi_ir.c | 4 +- drivers/net/iseries_veth.c | 6 +- drivers/net/ixgb/ixgb.h | 8 +- drivers/net/ixgb/ixgb_ee.c | 14 +- drivers/net/ixgb/ixgb_hw.c | 147 +- drivers/net/ixgb/ixgb_hw.h | 12 - drivers/net/ixgb/ixgb_main.c | 107 +- drivers/net/ixgb/ixgb_osdep.h | 16 +- drivers/net/ixgb/ixgb_param.c | 31 +- drivers/net/ixgbe/ixgbe_82599.c | 7 +- drivers/net/ixgbe/ixgbe_common.c | 16 +- drivers/net/ixgbe/ixgbe_common.h | 5 +- drivers/net/ixgbe/ixgbe_ethtool.c | 138 +- drivers/net/ixgbe/ixgbe_main.c | 596 ++++- drivers/net/ixgbe/ixgbe_phy.c | 4 +- drivers/net/ixgbe/ixgbe_type.h | 3 +- drivers/net/ixgbevf/defines.h | 12 +- drivers/net/ixgbevf/ixgbevf_main.c | 103 +- drivers/net/ixgbevf/vf.c | 27 +- drivers/net/ixgbevf/vf.h | 4 +- drivers/net/jme.c | 6 +- drivers/net/korina.c | 12 +- drivers/net/ks8842.c | 61 +- drivers/net/ks8851.c | 94 +- drivers/net/ks8851_mll.c | 63 +- drivers/net/ksz884x.c | 83 +- drivers/net/lib82596.c | 6 +- drivers/net/lib8390.c | 18 +- drivers/net/ll_temac.h | 14 +- drivers/net/ll_temac_main.c | 157 +- drivers/net/lp486e.c | 6 +- drivers/net/macb.c | 7 +- drivers/net/mace.c | 6 +- drivers/net/macmace.c | 6 +- drivers/net/macvlan.c | 13 +- drivers/net/macvtap.c | 19 +- drivers/net/mlx4/en_netdev.c | 53 +- drivers/net/mlx4/mlx4_en.h | 3 +- drivers/net/mv643xx_eth.c | 6 +- drivers/net/myri10ge/myri10ge.c | 54 +- drivers/net/natsemi.c | 6 +- drivers/net/netxen/netxen_nic.h | 1 - drivers/net/netxen/netxen_nic_ethtool.c | 6 + drivers/net/netxen/netxen_nic_hw.c | 12 +- drivers/net/netxen/netxen_nic_init.c | 164 ++- drivers/net/netxen/netxen_nic_main.c | 29 +- drivers/net/ni52.c | 6 +- drivers/net/niu.c | 57 +- drivers/net/niu.h | 7 +- drivers/net/octeon/octeon_mgmt.c | 7 +- drivers/net/pci-skeleton.c | 6 +- drivers/net/pcmcia/3c589_cs.c | 286 ++- drivers/net/pcmcia/axnet_cs.c | 6 +- drivers/net/pcmcia/fmvj18x_cs.c | 6 +- drivers/net/pcmcia/nmclan_cs.c | 6 +- drivers/net/pcmcia/smc91c92_cs.c | 6 +- drivers/net/pcmcia/xirc2ps_cs.c | 6 +- drivers/net/pcnet32.c | 6 +- drivers/net/phy/bcm63xx.c | 8 + drivers/net/phy/broadcom.c | 16 + drivers/net/phy/cicada.c | 8 + drivers/net/phy/davicom.c | 9 + drivers/net/phy/et1011c.c | 7 + drivers/net/phy/icplus.c | 7 + drivers/net/phy/lxt.c | 8 + drivers/net/phy/marvell.c | 13 + drivers/net/phy/mdio-bitbang.c | 60 +- drivers/net/phy/mdio_bus.c | 4 +- drivers/net/phy/micrel.c | 9 + drivers/net/phy/national.c | 7 + drivers/net/phy/phy_device.c | 12 + drivers/net/phy/qsemi.c | 7 + drivers/net/phy/realtek.c | 7 + drivers/net/phy/smsc.c | 11 + drivers/net/phy/ste10Xp.c | 8 + drivers/net/phy/vitesse.c | 8 + drivers/net/ppp_generic.c | 19 + drivers/net/pppoe.c | 2 +- drivers/net/pppol2tp.c | 2680 -------------------- drivers/net/ps3_gelic_net.c | 10 +- drivers/net/ps3_gelic_wireless.c | 69 +- drivers/net/qla3xxx.c | 66 +- drivers/net/qla3xxx.h | 8 +- drivers/net/qlcnic/qlcnic.h | 25 +- drivers/net/qlcnic/qlcnic_ethtool.c | 24 + drivers/net/qlcnic/qlcnic_hdr.h | 37 +- drivers/net/qlcnic/qlcnic_hw.c | 131 +- drivers/net/qlcnic/qlcnic_init.c | 49 +- drivers/net/qlcnic/qlcnic_main.c | 197 +- drivers/net/qlge/qlge.h | 8 +- drivers/net/qlge/qlge_dbg.c | 4 +- drivers/net/qlge/qlge_main.c | 64 +- drivers/net/r6040.c | 37 +- drivers/net/r8169.c | 158 +- drivers/net/s2io.c | 12 +- drivers/net/s6gmac.c | 1 - drivers/net/sb1250-mac.c | 271 +-- drivers/net/sc92031.c | 6 +- drivers/net/sfc/efx.c | 137 +- drivers/net/sfc/efx.h | 4 +- drivers/net/sfc/ethtool.c | 6 +- drivers/net/sfc/falcon.c | 16 +- drivers/net/sfc/falcon_xmac.c | 22 +- drivers/net/sfc/mcdi.c | 32 +- drivers/net/sfc/mcdi_mac.c | 25 +- drivers/net/sfc/mcdi_pcol.h | 71 +- drivers/net/sfc/mcdi_phy.c | 152 ++- drivers/net/sfc/net_driver.h | 76 +- drivers/net/sfc/nic.c | 114 +- drivers/net/sfc/nic.h | 3 + drivers/net/sfc/selftest.c | 8 +- drivers/net/sfc/selftest.h | 4 +- drivers/net/sfc/siena.c | 19 + drivers/net/sfc/tx.c | 61 +- drivers/net/sfc/workarounds.h | 2 +- drivers/net/sis190.c | 6 +- drivers/net/sis900.c | 14 +- drivers/net/skfp/fplustm.c | 2 +- drivers/net/skfp/pcmplc.c | 4 +- drivers/net/skfp/skfddi.c | 12 +- drivers/net/skfp/srf.c | 2 +- drivers/net/skge.c | 14 +- drivers/net/sky2.c | 160 +- drivers/net/sky2.h | 41 +- drivers/net/smc911x.c | 19 +- drivers/net/smc9194.c | 53 +- drivers/net/smc91x.c | 10 +- drivers/net/smsc911x.c | 6 +- drivers/net/smsc9420.c | 6 +- drivers/net/sonic.c | 6 +- drivers/net/spider_net.c | 6 +- drivers/net/starfire.c | 10 +- drivers/net/stmmac/Makefile | 2 +- drivers/net/stmmac/common.h | 21 +- drivers/net/stmmac/dwmac100.c | 538 ---- drivers/net/stmmac/dwmac100.h | 5 + drivers/net/stmmac/dwmac1000.h | 12 - drivers/net/stmmac/dwmac1000_core.c | 33 +- drivers/net/stmmac/dwmac1000_dma.c | 336 +--- drivers/net/stmmac/dwmac100_core.c | 201 ++ drivers/net/stmmac/dwmac100_dma.c | 138 + drivers/net/stmmac/dwmac_dma.h | 1 + drivers/net/stmmac/dwmac_lib.c | 7 + drivers/net/stmmac/enh_desc.c | 342 +++ drivers/net/stmmac/norm_desc.c | 240 ++ drivers/net/stmmac/stmmac.h | 10 +- drivers/net/stmmac/stmmac_main.c | 10 +- drivers/net/sun3_82586.c | 6 +- drivers/net/sunbmac.c | 6 +- drivers/net/sundance.c | 6 +- drivers/net/sungem.c | 6 +- drivers/net/sunhme.c | 12 +- drivers/net/sunlance.c | 6 +- drivers/net/sunqe.c | 6 +- drivers/net/sunvnet.c | 8 +- drivers/net/tc35815.c | 6 +- drivers/net/tehuti.c | 9 +- drivers/net/tg3.c | 839 +++---- drivers/net/tg3.h | 17 +- drivers/net/tlan.c | 10 +- drivers/net/tokenring/3c359.c | 112 +- drivers/net/tokenring/ibmtr.c | 12 +- drivers/net/tokenring/lanstreamer.c | 58 +- drivers/net/tokenring/olympic.c | 74 +- drivers/net/tokenring/tms380tr.c | 16 +- drivers/net/tsi108_eth.c | 16 +- drivers/net/tulip/de2104x.c | 12 +- drivers/net/tulip/de4x5.c | 14 +- drivers/net/tulip/dmfe.c | 12 +- drivers/net/tulip/tulip_core.c | 27 +- drivers/net/tulip/uli526x.c | 6 +- drivers/net/tulip/winbond-840.c | 12 +- drivers/net/tulip/xircom_cb.c | 6 +- drivers/net/tun.c | 21 +- drivers/net/typhoon.c | 6 +- drivers/net/ucc_geth.c | 10 +- drivers/net/usb/asix.c | 16 +- drivers/net/usb/catc.c | 6 +- drivers/net/usb/cdc_ether.c | 113 +- drivers/net/usb/dm9601.c | 6 +- drivers/net/usb/mcs7830.c | 6 +- drivers/net/usb/smsc75xx.c | 6 +- drivers/net/usb/smsc95xx.c | 6 +- drivers/net/usb/usbnet.c | 15 +- drivers/net/via-rhine.c | 6 +- drivers/net/via-velocity.c | 120 +- drivers/net/via-velocity.h | 77 +- drivers/net/virtio_net.c | 57 +- drivers/net/vmxnet3/vmxnet3_drv.c | 7 +- drivers/net/vxge/vxge-config.c | 24 +- drivers/net/vxge/vxge-config.h | 34 +- drivers/net/vxge/vxge-ethtool.c | 5 +- drivers/net/vxge/vxge-main.c | 241 +- drivers/net/vxge/vxge-main.h | 6 + drivers/net/vxge/vxge-traffic.c | 53 +- drivers/net/vxge/vxge-traffic.h | 50 +- drivers/net/vxge/vxge-version.h | 4 +- drivers/net/wan/cycx_x25.c | 13 +- drivers/net/wan/hdlc_x25.c | 12 +- drivers/net/wan/lapbether.c | 12 +- drivers/net/wan/pc300_drv.c | 2 +- drivers/net/wan/pc300_tty.c | 2 +- drivers/net/wan/sdla.c | 2 +- drivers/net/wan/x25_asy.c | 12 +- drivers/net/wimax/i2400m/tx.c | 2 +- drivers/net/wireless/Kconfig | 85 +- drivers/net/wireless/adm8211.c | 12 +- drivers/net/wireless/airo.c | 37 +- drivers/net/wireless/ath/Kconfig | 2 +- drivers/net/wireless/ath/ar9170/cmd.h | 2 +- drivers/net/wireless/ath/ar9170/eeprom.h | 4 +- drivers/net/wireless/ath/ar9170/hw.h | 1 + drivers/net/wireless/ath/ar9170/main.c | 27 +- drivers/net/wireless/ath/ar9170/usb.c | 10 + drivers/net/wireless/ath/ath.h | 27 +- drivers/net/wireless/ath/ath5k/Makefile | 1 + drivers/net/wireless/ath/ath5k/ani.c | 744 ++++++ drivers/net/wireless/ath/ath5k/ani.h | 104 + drivers/net/wireless/ath/ath5k/ath5k.h | 313 +-- drivers/net/wireless/ath/ath5k/attach.c | 7 +- drivers/net/wireless/ath/ath5k/base.c | 315 ++- drivers/net/wireless/ath/ath5k/base.h | 39 +- drivers/net/wireless/ath/ath5k/caps.c | 9 +- drivers/net/wireless/ath/ath5k/debug.c | 382 +++ drivers/net/wireless/ath/ath5k/debug.h | 4 + drivers/net/wireless/ath/ath5k/desc.c | 19 +- drivers/net/wireless/ath/ath5k/desc.h | 35 +- drivers/net/wireless/ath/ath5k/eeprom.c | 4 +- drivers/net/wireless/ath/ath5k/eeprom.h | 88 +- drivers/net/wireless/ath/ath5k/pcu.c | 379 +--- drivers/net/wireless/ath/ath5k/phy.c | 75 +- drivers/net/wireless/ath/ath5k/qcu.c | 17 - drivers/net/wireless/ath/ath5k/reg.h | 42 +- drivers/net/wireless/ath/ath5k/reset.c | 38 +- drivers/net/wireless/ath/ath9k/Kconfig | 21 + drivers/net/wireless/ath/ath9k/Makefile | 26 +- drivers/net/wireless/ath/ath9k/ahb.c | 1 + drivers/net/wireless/ath/ath9k/ani.c | 208 +-- drivers/net/wireless/ath/ath9k/ar5008_initvals.h | 742 ++++++ drivers/net/wireless/ath/ath9k/ar5008_phy.c | 1375 ++++++++++ drivers/net/wireless/ath/ath9k/ar9001_initvals.h | 1254 +++++++++ drivers/net/wireless/ath/ath9k/ar9002_calib.c | 1000 ++++++++ drivers/net/wireless/ath/ath9k/ar9002_hw.c | 593 +++++ .../ath/ath9k/{initvals.h => ar9002_initvals.h} | 2288 ++--------------- drivers/net/wireless/ath/ath9k/ar9002_mac.c | 480 ++++ drivers/net/wireless/ath/ath9k/ar9002_phy.c | 539 ++++ drivers/net/wireless/ath/ath9k/ar9002_phy.h | 572 +++++ drivers/net/wireless/ath/ath9k/ar9003_calib.c | 802 ++++++ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 1856 ++++++++++++++ drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 323 +++ drivers/net/wireless/ath/ath9k/ar9003_hw.c | 205 ++ drivers/net/wireless/ath/ath9k/ar9003_initvals.h | 1793 +++++++++++++ drivers/net/wireless/ath/ath9k/ar9003_mac.c | 611 +++++ drivers/net/wireless/ath/ath9k/ar9003_mac.h | 120 + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 1142 +++++++++ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 847 +++++++ drivers/net/wireless/ath/ath9k/ath9k.h | 28 +- drivers/net/wireless/ath/ath9k/beacon.c | 40 +- drivers/net/wireless/ath/ath9k/calib.c | 1023 +-------- drivers/net/wireless/ath/ath9k/calib.h | 19 +- drivers/net/wireless/ath/ath9k/common.c | 342 +++- drivers/net/wireless/ath/ath9k/common.h | 17 +- drivers/net/wireless/ath/ath9k/debug.c | 61 +- drivers/net/wireless/ath/ath9k/debug.h | 13 +- drivers/net/wireless/ath/ath9k/eeprom.c | 9 +- drivers/net/wireless/ath/ath9k/eeprom.h | 22 +- drivers/net/wireless/ath/ath9k/eeprom_4k.c | 19 +- drivers/net/wireless/ath/ath9k/eeprom_9287.c | 11 +- drivers/net/wireless/ath/ath9k/eeprom_def.c | 13 +- drivers/net/wireless/ath/ath9k/gpio.c | 17 +- drivers/net/wireless/ath/ath9k/hif_usb.c | 989 ++++++++ drivers/net/wireless/ath/ath9k/hif_usb.h | 105 + drivers/net/wireless/ath/ath9k/htc.h | 463 ++++ drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 274 ++ drivers/net/wireless/ath/ath9k/htc_drv_init.c | 819 ++++++ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 1737 +++++++++++++ drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 699 +++++ drivers/net/wireless/ath/ath9k/htc_hst.c | 476 ++++ drivers/net/wireless/ath/ath9k/htc_hst.h | 246 ++ drivers/net/wireless/ath/ath9k/hw-ops.h | 280 ++ drivers/net/wireless/ath/ath9k/hw.c | 1868 +++----------- drivers/net/wireless/ath/ath9k/hw.h | 267 ++- drivers/net/wireless/ath/ath9k/init.c | 86 +- drivers/net/wireless/ath/ath9k/mac.c | 569 ++--- drivers/net/wireless/ath/ath9k/mac.h | 93 +- drivers/net/wireless/ath/ath9k/main.c | 138 +- drivers/net/wireless/ath/ath9k/pci.c | 2 + drivers/net/wireless/ath/ath9k/phy.c | 978 ------- drivers/net/wireless/ath/ath9k/phy.h | 596 +----- drivers/net/wireless/ath/ath9k/rc.c | 21 +- drivers/net/wireless/ath/ath9k/rc.h | 11 +- drivers/net/wireless/ath/ath9k/recv.c | 534 +++- drivers/net/wireless/ath/ath9k/reg.h | 183 ++- drivers/net/wireless/ath/ath9k/virtual.c | 2 +- drivers/net/wireless/ath/ath9k/wmi.c | 333 +++ drivers/net/wireless/ath/ath9k/wmi.h | 139 + drivers/net/wireless/ath/ath9k/xmit.c | 589 +++-- drivers/net/wireless/ath/debug.h | 1 + drivers/net/wireless/ath/hw.c | 4 +- drivers/net/wireless/ath/regd.c | 3 +- drivers/net/wireless/b43/b43.h | 1 + drivers/net/wireless/b43/main.c | 5 +- drivers/net/wireless/b43/phy_n.c | 479 +++- drivers/net/wireless/b43/phy_n.h | 21 +- drivers/net/wireless/b43/tables_nphy.c | 20 +- drivers/net/wireless/b43/tables_nphy.h | 37 +- drivers/net/wireless/ipw2x00/ipw2100.c | 48 +- drivers/net/wireless/ipw2x00/ipw2200.c | 188 +- drivers/net/wireless/ipw2x00/libipw.h | 14 +- drivers/net/wireless/ipw2x00/libipw_module.c | 13 +- drivers/net/wireless/iwlwifi/Makefile | 5 +- drivers/net/wireless/iwlwifi/iwl-1000.c | 94 +- drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 7 +- drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 91 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 145 +- drivers/net/wireless/iwlwifi/iwl-3945.h | 4 +- drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 24 - drivers/net/wireless/iwlwifi/iwl-4965.c | 100 +- drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 33 - drivers/net/wireless/iwlwifi/iwl-5000.c | 1419 +---------- drivers/net/wireless/iwlwifi/iwl-6000.c | 233 ++- drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 834 ++++++ drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h | 56 + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 276 ++ drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 118 + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 307 +++ drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1502 +++++++++++ drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 186 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 8 +- drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 1333 ++++++++++ drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 416 +++ drivers/net/wireless/iwlwifi/iwl-agn.c | 478 ++-- drivers/net/wireless/iwlwifi/iwl-agn.h | 177 ++ drivers/net/wireless/iwlwifi/iwl-calib.c | 2 +- drivers/net/wireless/iwlwifi/iwl-commands.h | 110 +- drivers/net/wireless/iwlwifi/iwl-core.c | 827 ++----- drivers/net/wireless/iwlwifi/iwl-core.h | 74 +- drivers/net/wireless/iwlwifi/iwl-csr.h | 1 + drivers/net/wireless/iwlwifi/iwl-debug.h | 2 + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 852 +------ drivers/net/wireless/iwlwifi/iwl-dev.h | 196 +- drivers/net/wireless/iwlwifi/iwl-devtrace.c | 1 + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 49 +- drivers/net/wireless/iwlwifi/iwl-hcmd.c | 4 +- drivers/net/wireless/iwlwifi/iwl-helpers.h | 3 + drivers/net/wireless/iwlwifi/iwl-io.h | 2 +- drivers/net/wireless/iwlwifi/iwl-led.c | 2 +- drivers/net/wireless/iwlwifi/iwl-power.c | 10 +- drivers/net/wireless/iwlwifi/iwl-prph.h | 94 +- drivers/net/wireless/iwlwifi/iwl-rx.c | 823 +------ drivers/net/wireless/iwlwifi/iwl-scan.c | 508 +---- drivers/net/wireless/iwlwifi/iwl-sta.c | 691 +++--- drivers/net/wireless/iwlwifi/iwl-sta.h | 22 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 1074 +-------- drivers/net/wireless/iwlwifi/iwl3945-base.c | 263 +-- drivers/net/wireless/iwmc3200wifi/Kconfig | 9 +- drivers/net/wireless/iwmc3200wifi/Makefile | 5 + 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 | 79 +- drivers/net/wireless/iwmc3200wifi/trace.c | 3 + drivers/net/wireless/iwmc3200wifi/trace.h | 283 +++ drivers/net/wireless/iwmc3200wifi/tx.c | 12 +- drivers/net/wireless/iwmc3200wifi/umac.h | 2 +- drivers/net/wireless/libertas/assoc.c | 22 +- drivers/net/wireless/libertas/debugfs.c | 2 +- drivers/net/wireless/libertas/dev.h | 1 + drivers/net/wireless/libertas/if_sdio.c | 125 +- drivers/net/wireless/libertas/main.c | 13 +- drivers/net/wireless/libertas/rx.c | 50 +- drivers/net/wireless/libertas/wext.c | 4 + drivers/net/wireless/libertas_tf/main.c | 14 +- drivers/net/wireless/mac80211_hwsim.c | 73 +- drivers/net/wireless/mwl8k.c | 24 +- drivers/net/wireless/orinoco/Kconfig | 13 +- drivers/net/wireless/orinoco/Makefile | 3 + drivers/net/wireless/orinoco/cfg.c | 88 +- drivers/net/wireless/orinoco/hw.c | 39 +- drivers/net/wireless/orinoco/hw.h | 1 - drivers/net/wireless/orinoco/main.h | 12 - drivers/net/wireless/orinoco/orinoco.h | 2 + drivers/net/wireless/orinoco/orinoco_cs.c | 79 +- drivers/net/wireless/orinoco/scan.c | 4 +- drivers/net/wireless/orinoco/wext.c | 267 +-- drivers/net/wireless/p54/main.c | 1 + drivers/net/wireless/p54/p54pci.c | 26 +- drivers/net/wireless/p54/txrx.c | 2 +- drivers/net/wireless/prism54/islpci_dev.c | 16 +- drivers/net/wireless/prism54/islpci_eth.c | 8 +- drivers/net/wireless/prism54/islpci_mgt.c | 8 +- drivers/net/wireless/prism54/oid_mgt.c | 2 +- drivers/net/wireless/ray_cs.c | 236 +- drivers/net/wireless/rndis_wlan.c | 370 +++- drivers/net/wireless/rt2x00/rt2400pci.c | 4 + drivers/net/wireless/rt2x00/rt2500pci.c | 4 + drivers/net/wireless/rt2x00/rt2500usb.c | 9 +- drivers/net/wireless/rt2x00/rt2800.h | 108 +- drivers/net/wireless/rt2x00/rt2800lib.c | 467 +++- drivers/net/wireless/rt2x00/rt2800pci.c | 158 +- drivers/net/wireless/rt2x00/rt2800usb.c | 102 +- drivers/net/wireless/rt2x00/rt2x00.h | 32 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 3 +- drivers/net/wireless/rt2x00/rt2x00pci.h | 3 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 3 +- drivers/net/wireless/rt2x00/rt2x00usb.c | 3 +- drivers/net/wireless/rt2x00/rt2x00usb.h | 3 +- drivers/net/wireless/rt2x00/rt61pci.c | 14 + drivers/net/wireless/rt2x00/rt73usb.c | 6 +- drivers/net/wireless/rtl818x/Kconfig | 88 + drivers/net/wireless/rtl818x/rtl8180_dev.c | 6 +- drivers/net/wireless/rtl818x/rtl8187_dev.c | 4 +- drivers/net/wireless/wl12xx/Kconfig | 24 + drivers/net/wireless/wl12xx/Makefile | 6 +- drivers/net/wireless/wl12xx/wl1251.h | 2 + drivers/net/wireless/wl12xx/wl1251_boot.c | 3 +- drivers/net/wireless/wl12xx/wl1251_io.h | 20 + drivers/net/wireless/wl12xx/wl1251_main.c | 71 +- drivers/net/wireless/wl12xx/wl1251_ps.c | 8 +- drivers/net/wireless/wl12xx/wl1251_reg.h | 7 + drivers/net/wireless/wl12xx/wl1251_sdio.c | 144 +- drivers/net/wireless/wl12xx/wl1251_spi.c | 2 +- drivers/net/wireless/wl12xx/wl1271.h | 59 +- drivers/net/wireless/wl12xx/wl1271_acx.c | 179 ++- drivers/net/wireless/wl12xx/wl1271_acx.h | 157 +- drivers/net/wireless/wl12xx/wl1271_boot.c | 26 +- drivers/net/wireless/wl12xx/wl1271_boot.h | 7 +- drivers/net/wireless/wl12xx/wl1271_cmd.c | 335 ++-- drivers/net/wireless/wl12xx/wl1271_cmd.h | 27 +- drivers/net/wireless/wl12xx/wl1271_conf.h | 488 +++- drivers/net/wireless/wl12xx/wl1271_debugfs.c | 12 +- drivers/net/wireless/wl12xx/wl1271_event.c | 69 +- drivers/net/wireless/wl12xx/wl1271_event.h | 8 + drivers/net/wireless/wl12xx/wl1271_init.c | 57 +- drivers/net/wireless/wl12xx/wl1271_io.c | 87 +- drivers/net/wireless/wl12xx/wl1271_io.h | 135 +- drivers/net/wireless/wl12xx/wl1271_main.c | 1215 +++++---- drivers/net/wireless/wl12xx/wl1271_ps.c | 7 +- drivers/net/wireless/wl12xx/wl1271_rx.c | 94 +- drivers/net/wireless/wl12xx/wl1271_rx.h | 2 +- drivers/net/wireless/wl12xx/wl1271_sdio.c | 291 +++ drivers/net/wireless/wl12xx/wl1271_spi.c | 315 ++- drivers/net/wireless/wl12xx/wl1271_spi.h | 96 - drivers/net/wireless/wl12xx/wl1271_testmode.c | 1 - drivers/net/wireless/wl12xx/wl1271_tx.c | 133 +- drivers/net/wireless/wl12xx/wl1271_tx.h | 9 +- drivers/net/wireless/wl3501_cs.c | 52 +- drivers/net/wireless/zd1201.c | 6 +- drivers/net/wireless/zd1211rw/zd_mac.c | 13 +- drivers/net/xilinx_emaclite.c | 1 - drivers/net/yellowfin.c | 12 +- drivers/s390/net/qeth_l2_main.c | 5 +- drivers/s390/net/qeth_l3_main.c | 2 +- drivers/scsi/fcoe/fcoe.c | 18 +- drivers/scsi/iscsi_tcp.c | 4 +- drivers/ssb/driver_chipcommon.c | 1 + drivers/staging/arlan/arlan-main.c | 9 +- drivers/staging/et131x/et131x_netdev.c | 6 +- drivers/staging/slicoss/slicoss.c | 6 +- drivers/staging/vt6655/device_main.c | 6 +- drivers/staging/vt6656/main_usb.c | 6 +- drivers/staging/wavelan/wavelan.c | 10 +- drivers/staging/wavelan/wavelan_cs.c | 12 +- drivers/staging/winbond/wbusb.c | 6 +- drivers/staging/wlags49_h2/wl_netdev.c | 12 +- drivers/vhost/net.c | 4 +- drivers/vhost/vhost.c | 11 +- fs/fcntl.c | 66 +- include/linux/Kbuild | 1 + include/linux/caif/caif_socket.h | 165 ++ include/linux/caif/if_caif.h | 34 + include/linux/can/dev.h | 1 + include/linux/can/platform/mcp251x.h | 4 +- include/linux/dcbnl.h | 2 - include/linux/ethtool.h | 116 +- include/linux/filter.h | 3 +- include/linux/fs.h | 12 +- include/linux/genetlink.h | 8 + include/linux/ieee80211.h | 4 +- include/linux/if_arp.h | 1 + include/linux/if_ether.h | 1 + include/linux/if_link.h | 33 + include/linux/if_packet.h | 1 + include/linux/if_pppol2tp.h | 16 +- include/linux/if_pppox.h | 9 + include/linux/if_x25.h | 26 + include/linux/in6.h | 5 +- include/linux/ipv6.h | 16 +- include/linux/ks8842.h | 34 + include/linux/l2tp.h | 163 ++ include/linux/mmc/sdio.h | 2 + include/linux/mod_devicetable.h | 26 + include/linux/mroute.h | 20 +- include/linux/net.h | 14 +- include/linux/netdevice.h | 282 ++- include/linux/nl80211.h | 58 + include/linux/notifier.h | 9 +- include/linux/pci_regs.h | 3 + include/linux/phy.h | 13 +- include/linux/ppp_channel.h | 3 + include/linux/rculist.h | 42 + include/linux/rtnetlink.h | 6 + include/linux/skbuff.h | 13 +- include/linux/snmp.h | 2 + include/linux/socket.h | 5 +- include/linux/spi/wl12xx.h | 2 + include/linux/stmmac.h | 1 + include/linux/tipc.h | 30 +- include/linux/tty.h | 4 +- include/linux/wireless.h | 4 +- include/net/af_unix.h | 20 +- include/net/caif/caif_dev.h | 103 + include/net/caif/caif_device.h | 55 + include/net/caif/caif_layer.h | 283 +++ include/net/caif/cfcnfg.h | 140 + include/net/caif/cfctrl.h | 139 + include/net/caif/cffrml.h | 16 + include/net/caif/cfmuxl.h | 22 + include/net/caif/cfpkt.h | 274 ++ include/net/caif/cfserl.h | 12 + include/net/caif/cfsrvl.h | 56 + include/net/cfg80211.h | 32 +- include/net/dn_fib.h | 4 - include/net/dst.h | 15 - include/net/fib_rules.h | 3 +- include/net/flow.h | 23 +- include/net/icmp.h | 11 - include/net/if_inet6.h | 13 +- include/net/inet6_connection_sock.h | 2 +- include/net/inet_connection_sock.h | 5 +- include/net/inet_sock.h | 1 + include/net/inet_timewait_sock.h | 4 +- include/net/ip.h | 3 +- include/net/ip6_fib.h | 29 +- include/net/ip6_route.h | 4 +- include/net/ipv6.h | 10 +- include/net/iw_handler.h | 2 +- include/net/mac80211.h | 87 +- include/net/mld.h | 75 + include/net/netns/generic.h | 9 +- include/net/netns/ipv4.h | 14 +- include/net/pkt_sched.h | 2 +- include/net/raw.h | 13 + include/net/sch_generic.h | 1 + include/net/sctp/sctp.h | 4 +- include/net/sctp/sm.h | 2 +- include/net/sctp/structs.h | 66 +- include/net/snmp.h | 31 +- include/net/sock.h | 171 +- include/net/tcp.h | 13 +- include/net/transp_v6.h | 3 +- include/net/x25device.h | 1 + include/net/xfrm.h | 19 +- net/802/garp.c | 4 +- net/8021q/vlan.c | 8 +- net/8021q/vlan_dev.c | 14 +- net/Kconfig | 8 + net/Makefile | 2 + net/appletalk/ddp.c | 2 +- net/atm/common.c | 30 +- net/atm/proc.c | 10 +- net/atm/signaling.c | 2 +- net/atm/svc.c | 62 +- net/ax25/af_ax25.c | 8 +- net/bluetooth/af_bluetooth.c | 6 +- net/bluetooth/bnep/core.c | 8 +- net/bluetooth/bnep/netdev.c | 20 +- net/bluetooth/cmtp/cmtp.h | 2 +- net/bluetooth/cmtp/core.c | 4 +- net/bluetooth/hidp/core.c | 10 +- net/bluetooth/hidp/hidp.h | 4 +- net/bluetooth/l2cap.c | 4 +- net/bluetooth/rfcomm/sock.c | 8 +- net/bluetooth/sco.c | 4 +- net/bridge/Kconfig | 6 +- net/bridge/br_device.c | 45 +- net/bridge/br_forward.c | 16 +- net/bridge/br_if.c | 6 + net/bridge/br_input.c | 6 +- net/bridge/br_multicast.c | 656 +++++- net/bridge/br_notify.c | 4 + net/bridge/br_private.h | 24 +- net/caif/Kconfig | 48 + net/caif/Makefile | 26 + net/caif/caif_config_util.c | 87 + net/caif/caif_dev.c | 418 +++ net/caif/caif_socket.c | 1252 +++++++++ net/caif/cfcnfg.c | 471 ++++ net/caif/cfctrl.c | 693 +++++ net/caif/cfdbgl.c | 40 + net/caif/cfdgml.c | 108 + net/caif/cffrml.c | 151 ++ net/caif/cfmuxl.c | 251 ++ net/caif/cfpkt_skbuff.c | 571 +++++ net/caif/cfrfml.c | 108 + net/caif/cfserl.c | 192 ++ net/caif/cfsrvl.c | 192 ++ net/caif/cfutill.c | 115 + net/caif/cfveil.c | 107 + net/caif/cfvidl.c | 65 + net/caif/chnl_net.c | 467 ++++ net/core/Makefile | 2 +- net/core/datagram.c | 16 +- net/core/dev.c | 1302 +++++------ net/core/dev_addr_lists.c | 741 ++++++ net/core/dev_mcast.c | 232 -- net/core/dst.c | 45 +- net/core/ethtool.c | 148 +- net/core/fib_rules.c | 31 +- net/core/filter.c | 7 + net/core/flow.c | 405 ++-- net/core/net-sysfs.c | 318 +++- net/core/net_namespace.c | 95 +- net/core/pktgen.c | 58 +- net/core/rtnetlink.c | 69 +- net/core/skbuff.c | 10 +- net/core/sock.c | 71 +- net/core/stream.c | 22 +- net/core/sysctl_net_core.c | 68 + net/dccp/ccids/ccid3.c | 2 +- net/dccp/dccp.h | 4 +- net/dccp/input.c | 2 +- net/dccp/ipv4.c | 2 +- net/dccp/ipv6.c | 7 +- net/dccp/output.c | 18 +- net/dccp/proto.c | 2 +- net/dccp/timer.c | 4 +- net/decnet/af_decnet.c | 32 +- net/decnet/dn_dev.c | 12 +- net/decnet/dn_rules.c | 22 +- net/dsa/slave.c | 14 +- net/ethernet/eth.c | 4 +- net/ipv4/Kconfig | 22 + net/ipv4/af_inet.c | 49 +- net/ipv4/devinet.c | 4 +- net/ipv4/fib_rules.c | 22 +- net/ipv4/icmp.c | 5 +- net/ipv4/igmp.c | 4 +- net/ipv4/inet_connection_sock.c | 4 +- net/ipv4/ip_output.c | 4 +- net/ipv4/ip_sockglue.c | 20 +- net/ipv4/ipconfig.c | 2 +- net/ipv4/ipmr.c | 912 +++++-- net/ipv4/netfilter/ipt_CLUSTERIP.c | 4 +- net/ipv4/proc.c | 1 + net/ipv4/raw.c | 2 +- net/ipv4/route.c | 29 +- net/ipv4/tcp.c | 19 +- net/ipv4/tcp_input.c | 7 +- net/ipv4/tcp_ipv4.c | 37 +- net/ipv4/tcp_minisocks.c | 1 + net/ipv4/tcp_output.c | 14 +- net/ipv4/tcp_timer.c | 8 +- net/ipv4/udp.c | 31 +- net/ipv4/xfrm4_policy.c | 22 - net/ipv6/addrconf.c | 805 +++--- net/ipv6/af_inet6.c | 3 + net/ipv6/datagram.c | 108 +- net/ipv6/fib6_rules.c | 3 +- net/ipv6/icmp.c | 7 +- net/ipv6/inet6_connection_sock.c | 4 +- net/ipv6/ip6_fib.c | 16 +- net/ipv6/ip6_flowlabel.c | 3 +- net/ipv6/ip6_output.c | 37 +- net/ipv6/ipv6_sockglue.c | 86 +- net/ipv6/mcast.c | 139 +- net/ipv6/netfilter/ip6t_hbh.c | 4 +- net/ipv6/proc.c | 1 + net/ipv6/raw.c | 14 +- net/ipv6/tcp_ipv6.c | 64 +- net/ipv6/udp.c | 30 +- net/ipv6/xfrm6_policy.c | 31 - net/irda/af_irda.c | 14 +- net/irda/ircomm/ircomm_param.c | 2 +- net/iucv/af_iucv.c | 21 +- net/l2tp/Kconfig | 107 + net/l2tp/Makefile | 12 + net/l2tp/l2tp_core.c | 1666 ++++++++++++ net/l2tp/l2tp_core.h | 304 +++ net/l2tp/l2tp_debugfs.c | 341 +++ net/l2tp/l2tp_eth.c | 334 +++ net/l2tp/l2tp_ip.c | 679 +++++ net/l2tp/l2tp_netlink.c | 840 ++++++ net/l2tp/l2tp_ppp.c | 1837 ++++++++++++++ net/llc/af_llc.c | 12 +- net/llc/llc_core.c | 6 - net/mac80211/Kconfig | 17 +- net/mac80211/agg-rx.c | 80 +- net/mac80211/agg-tx.c | 16 +- net/mac80211/cfg.c | 46 + net/mac80211/debugfs_netdev.c | 12 + net/mac80211/debugfs_sta.c | 14 +- net/mac80211/driver-ops.h | 17 +- net/mac80211/driver-trace.h | 275 ++ net/mac80211/ht.c | 3 +- net/mac80211/ibss.c | 16 +- net/mac80211/ieee80211_i.h | 29 +- net/mac80211/iface.c | 124 +- net/mac80211/key.c | 1 + net/mac80211/main.c | 7 +- net/mac80211/mesh.c | 4 +- net/mac80211/mesh.h | 2 - net/mac80211/mesh_hwmp.c | 4 +- net/mac80211/mesh_plink.c | 2 +- net/mac80211/mlme.c | 186 ++- net/mac80211/pm.c | 2 +- net/mac80211/rc80211_minstrel.c | 2 +- net/mac80211/rc80211_minstrel.h | 11 + net/mac80211/rc80211_minstrel_debugfs.c | 41 +- net/mac80211/rx.c | 100 +- net/mac80211/scan.c | 73 +- net/mac80211/sta_info.c | 88 +- net/mac80211/sta_info.h | 12 +- net/mac80211/status.c | 14 +- net/mac80211/tx.c | 16 +- net/mac80211/util.c | 11 +- net/mac80211/work.c | 7 +- net/netfilter/ipvs/ip_vs_sync.c | 2 +- net/netlink/af_netlink.c | 2 +- net/netlink/genetlink.c | 6 +- net/netrom/af_netrom.c | 8 +- net/packet/af_packet.c | 69 +- net/phonet/pep.c | 8 +- net/phonet/pn_dev.c | 23 +- net/phonet/socket.c | 2 +- net/rds/af_rds.c | 11 +- net/rds/cong.c | 2 - net/rds/ib_cm.c | 3 +- net/rds/ib_rdma.c | 5 +- net/rds/ib_recv.c | 4 +- net/rds/ib_send.c | 20 +- net/rds/iw_cm.c | 4 +- net/rds/iw_recv.c | 4 +- net/rds/iw_send.c | 3 +- net/rds/loop.c | 7 - net/rds/rdma.c | 4 +- net/rds/rdma_transport.c | 5 +- net/rds/rds.h | 4 +- net/rds/recv.c | 2 +- net/rds/send.c | 40 +- net/rds/tcp_recv.c | 1 + net/rds/tcp_send.c | 4 +- net/rds/threads.c | 2 +- net/rfkill/core.c | 53 +- net/rose/af_rose.c | 8 +- net/rxrpc/af_rxrpc.c | 12 +- net/rxrpc/ar-recvmsg.c | 6 +- net/sched/act_api.c | 45 +- net/sched/cls_api.c | 30 +- net/sched/cls_u32.c | 4 +- net/sched/sch_api.c | 112 +- net/sched/sch_generic.c | 17 +- net/sched/sch_sfq.c | 10 +- net/sctp/Kconfig | 12 + net/sctp/Makefile | 3 + net/sctp/associola.c | 13 +- net/sctp/chunk.c | 4 +- net/sctp/endpointola.c | 2 - net/sctp/ipv6.c | 27 +- net/sctp/output.c | 27 +- net/sctp/outqueue.c | 94 +- net/sctp/probe.c | 214 ++ net/sctp/protocol.c | 9 +- net/sctp/sm_make_chunk.c | 24 +- net/sctp/sm_sideeffect.c | 8 +- net/sctp/socket.c | 39 +- net/sctp/transport.c | 61 +- net/socket.c | 121 +- net/sunrpc/auth_gss/gss_spkm3_token.c | 2 +- net/sunrpc/bc_svc.c | 2 +- net/sunrpc/svcsock.c | 24 +- net/sunrpc/xprt.c | 2 +- net/tipc/bcast.c | 35 +- net/tipc/core.c | 2 +- net/tipc/link.c | 19 +- net/tipc/net.c | 4 +- net/tipc/node.c | 2 +- net/tipc/socket.c | 26 +- net/tipc/subscr.c | 15 +- net/unix/af_unix.c | 25 +- net/unix/garbage.c | 13 +- net/wimax/op-reset.c | 2 - net/wimax/op-state-get.c | 2 - net/wireless/core.h | 15 +- net/wireless/mlme.c | 52 +- net/wireless/nl80211.c | 153 ++- net/wireless/nl80211.h | 6 + net/wireless/reg.c | 6 +- net/wireless/sme.c | 31 +- net/wireless/util.c | 24 +- net/wireless/wext-core.c | 134 +- net/x25/af_x25.c | 8 +- net/x25/x25_dev.c | 36 +- net/xfrm/xfrm_hash.h | 3 +- net/xfrm/xfrm_policy.c | 847 ++++--- net/xfrm/xfrm_state.c | 5 +- net/xfrm/xfrm_user.c | 10 +- scripts/mod/file2alias.c | 26 + 972 files changed, 71986 insertions(+), 31629 deletions(-) create mode 100644 Documentation/ABI/obsolete/sysfs-class-rfkill create mode 100644 Documentation/ABI/stable/sysfs-class-rfkill create mode 100644 Documentation/networking/caif/Linux-CAIF.txt create mode 100644 Documentation/networking/caif/README create mode 100644 drivers/net/caif/Kconfig create mode 100644 drivers/net/caif/Makefile create mode 100644 drivers/net/caif/caif_serial.c create mode 100644 drivers/net/irda/sh_irda.c delete mode 100644 drivers/net/pppol2tp.c delete mode 100644 drivers/net/stmmac/dwmac100.c create mode 100644 drivers/net/stmmac/dwmac100_core.c create mode 100644 drivers/net/stmmac/dwmac100_dma.c create mode 100644 drivers/net/stmmac/enh_desc.c create mode 100644 drivers/net/stmmac/norm_desc.c create mode 100644 drivers/net/wireless/ath/ath5k/ani.c create mode 100644 drivers/net/wireless/ath/ath5k/ani.h create mode 100644 drivers/net/wireless/ath/ath9k/ar5008_initvals.h create mode 100644 drivers/net/wireless/ath/ath9k/ar5008_phy.c create mode 100644 drivers/net/wireless/ath/ath9k/ar9001_initvals.h create mode 100644 drivers/net/wireless/ath/ath9k/ar9002_calib.c create mode 100644 drivers/net/wireless/ath/ath9k/ar9002_hw.c rename drivers/net/wireless/ath/ath9k/{initvals.h => ar9002_initvals.h} (77%) create mode 100644 drivers/net/wireless/ath/ath9k/ar9002_mac.c create mode 100644 drivers/net/wireless/ath/ath9k/ar9002_phy.c create mode 100644 drivers/net/wireless/ath/ath9k/ar9002_phy.h create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_calib.c create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_eeprom.h create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_hw.c create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_initvals.h create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_mac.c create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_mac.h create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_phy.c create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_phy.h create mode 100644 drivers/net/wireless/ath/ath9k/hif_usb.c create mode 100644 drivers/net/wireless/ath/ath9k/hif_usb.h create mode 100644 drivers/net/wireless/ath/ath9k/htc.h create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_beacon.c create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_init.c create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_main.c create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c create mode 100644 drivers/net/wireless/ath/ath9k/htc_hst.c create mode 100644 drivers/net/wireless/ath/ath9k/htc_hst.h create mode 100644 drivers/net/wireless/ath/ath9k/hw-ops.h delete mode 100644 drivers/net/wireless/ath/ath9k/phy.c create mode 100644 drivers/net/wireless/ath/ath9k/wmi.c create mode 100644 drivers/net/wireless/ath/ath9k/wmi.h create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-hw.h create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-ict.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-lib.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-tx.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-ucode.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/rtl818x/Kconfig create mode 100644 drivers/net/wireless/wl12xx/wl1271_sdio.c delete mode 100644 drivers/net/wireless/wl12xx/wl1271_spi.h create mode 100644 include/linux/caif/caif_socket.h create mode 100644 include/linux/caif/if_caif.h create mode 100644 include/linux/if_x25.h create mode 100644 include/linux/ks8842.h create mode 100644 include/linux/l2tp.h create mode 100644 include/net/caif/caif_dev.h create mode 100644 include/net/caif/caif_device.h create mode 100644 include/net/caif/caif_layer.h create mode 100644 include/net/caif/cfcnfg.h create mode 100644 include/net/caif/cfctrl.h create mode 100644 include/net/caif/cffrml.h create mode 100644 include/net/caif/cfmuxl.h create mode 100644 include/net/caif/cfpkt.h create mode 100644 include/net/caif/cfserl.h create mode 100644 include/net/caif/cfsrvl.h create mode 100644 include/net/mld.h create mode 100644 net/caif/Kconfig create mode 100644 net/caif/Makefile create mode 100644 net/caif/caif_config_util.c create mode 100644 net/caif/caif_dev.c create mode 100644 net/caif/caif_socket.c create mode 100644 net/caif/cfcnfg.c create mode 100644 net/caif/cfctrl.c create mode 100644 net/caif/cfdbgl.c create mode 100644 net/caif/cfdgml.c create mode 100644 net/caif/cffrml.c create mode 100644 net/caif/cfmuxl.c create mode 100644 net/caif/cfpkt_skbuff.c create mode 100644 net/caif/cfrfml.c create mode 100644 net/caif/cfserl.c create mode 100644 net/caif/cfsrvl.c create mode 100644 net/caif/cfutill.c create mode 100644 net/caif/cfveil.c create mode 100644 net/caif/cfvidl.c create mode 100644 net/caif/chnl_net.c create mode 100644 net/core/dev_addr_lists.c delete mode 100644 net/core/dev_mcast.c create mode 100644 net/l2tp/Kconfig create mode 100644 net/l2tp/Makefile create mode 100644 net/l2tp/l2tp_core.c create mode 100644 net/l2tp/l2tp_core.h create mode 100644 net/l2tp/l2tp_debugfs.c create mode 100644 net/l2tp/l2tp_eth.c create mode 100644 net/l2tp/l2tp_ip.c create mode 100644 net/l2tp/l2tp_netlink.c create mode 100644 net/l2tp/l2tp_ppp.c create mode 100644 net/sctp/probe.c Merging wireless/master $ git merge wireless/master Resolved 'drivers/net/wireless/libertas_tf/cmd.c' using previous resolution. Resolved 'drivers/net/wireless/libertas_tf/main.c' using previous resolution. Auto-merging MAINTAINERS Auto-merging drivers/net/wireless/ath/ar9170/main.c Auto-merging drivers/net/wireless/ath/ath5k/base.c Auto-merging drivers/net/wireless/ath/ath9k/hw.c Auto-merging drivers/net/wireless/b43/main.c Auto-merging drivers/net/wireless/b43legacy/main.c Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.c Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-rs.c Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c Auto-merging drivers/net/wireless/iwlwifi/iwl-core.c Auto-merging drivers/net/wireless/iwlwifi/iwl-debugfs.c Auto-merging drivers/net/wireless/iwlwifi/iwl-scan.c Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c Auto-merging drivers/net/wireless/iwmc3200wifi/debugfs.c Auto-merging drivers/net/wireless/iwmc3200wifi/sdio.c Auto-merging drivers/net/wireless/libertas/if_sdio.c Auto-merging drivers/net/wireless/libertas_tf/cmd.c CONFLICT (content): Merge conflict in drivers/net/wireless/libertas_tf/cmd.c Auto-merging drivers/net/wireless/libertas_tf/if_usb.c Auto-merging drivers/net/wireless/libertas_tf/main.c CONFLICT (content): Merge conflict in drivers/net/wireless/libertas_tf/main.c Auto-merging drivers/net/wireless/mac80211_hwsim.c Auto-merging drivers/net/wireless/mwl8k.c Auto-merging drivers/net/wireless/orinoco/fw.c Auto-merging drivers/net/wireless/orinoco/hw.c Auto-merging drivers/net/wireless/orinoco/main.c Auto-merging drivers/net/wireless/orinoco/wext.c Auto-merging drivers/net/wireless/p54/main.c Auto-merging drivers/net/wireless/p54/p54pci.c Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c Auto-merging drivers/net/wireless/rt2x00/rt2800usb.c Auto-merging drivers/net/wireless/rt2x00/rt2x00dev.c Auto-merging drivers/net/wireless/rtl818x/rtl8180_dev.c Auto-merging drivers/net/wireless/wl12xx/wl1251_main.c Auto-merging drivers/net/wireless/wl12xx/wl1251_rx.c Auto-merging drivers/net/wireless/wl12xx/wl1271_acx.c Auto-merging drivers/net/wireless/wl12xx/wl1271_boot.c Auto-merging drivers/net/wireless/wl12xx/wl1271_cmd.c Auto-merging drivers/net/wireless/wl12xx/wl1271_main.c Auto-merging drivers/ssb/main.c Auto-merging drivers/ssb/pci.c Auto-merging drivers/ssb/sprom.c Auto-merging include/net/mac80211.h Auto-merging net/mac80211/cfg.c Auto-merging net/mac80211/driver-ops.h Auto-merging net/mac80211/ibss.c Auto-merging net/mac80211/ieee80211_i.h Auto-merging net/mac80211/main.c Auto-merging net/mac80211/mlme.c Auto-merging net/mac80211/rx.c Auto-merging net/mac80211/scan.c Auto-merging net/mac80211/work.c Auto-merging net/wireless/core.c Auto-merging net/wireless/nl80211.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master cb476fa] Merge remote branch 'wireless/master' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 1 + drivers/net/wireless/Kconfig | 6 + drivers/net/wireless/at76c50x-usb.c | 1 + drivers/net/wireless/ath/ar9170/main.c | 4 +- drivers/net/wireless/ath/ath5k/base.c | 6 +- drivers/net/wireless/ath/ath9k/ani.c | 9 - drivers/net/wireless/ath/ath9k/ani.h | 1 - drivers/net/wireless/ath/ath9k/ar5008_initvals.h | 2 +- drivers/net/wireless/ath/ath9k/ar5008_phy.c | 5 +- drivers/net/wireless/ath/ath9k/ar9002_hw.c | 5 + drivers/net/wireless/ath/ath9k/ar9002_initvals.h | 8 +- drivers/net/wireless/ath/ath9k/ar9002_phy.c | 16 +- drivers/net/wireless/ath/ath9k/ar9003_calib.c | 3 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 8 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 2 +- drivers/net/wireless/ath/ath9k/ar9003_initvals.h | 265 ++-- drivers/net/wireless/ath/ath9k/ar9003_mac.c | 3 + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 16 +- drivers/net/wireless/ath/ath9k/common.c | 1 - drivers/net/wireless/ath/ath9k/eeprom.h | 3 +- drivers/net/wireless/ath/ath9k/eeprom_def.c | 2 + drivers/net/wireless/ath/ath9k/hif_usb.c | 149 +- drivers/net/wireless/ath/ath9k/hif_usb.h | 1 - drivers/net/wireless/ath/ath9k/htc.h | 2 + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 8 + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 84 +- drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 59 +- drivers/net/wireless/ath/ath9k/htc_hst.c | 5 +- drivers/net/wireless/ath/ath9k/hw.c | 27 +- drivers/net/wireless/ath/ath9k/hw.h | 8 +- drivers/net/wireless/ath/ath9k/mac.c | 10 +- drivers/net/wireless/ath/ath9k/main.c | 20 + drivers/net/wireless/ath/ath9k/wmi.c | 11 +- drivers/net/wireless/ath/ath9k/wmi.h | 4 +- drivers/net/wireless/ath/ath9k/xmit.c | 2 + drivers/net/wireless/b43/main.c | 21 +- drivers/net/wireless/b43/xmit.c | 1 - drivers/net/wireless/b43legacy/main.c | 21 +- drivers/net/wireless/b43legacy/xmit.c | 1 - drivers/net/wireless/iwlwifi/Makefile | 1 + drivers/net/wireless/iwlwifi/iwl-1000.c | 1 - drivers/net/wireless/iwlwifi/iwl-3945-debugfs.c | 500 ++++++ drivers/net/wireless/iwlwifi/iwl-3945-debugfs.h | 60 + drivers/net/wireless/iwlwifi/iwl-3945.c | 72 +- drivers/net/wireless/iwlwifi/iwl-3945.h | 2 + drivers/net/wireless/iwlwifi/iwl-5000.c | 73 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 73 +- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 23 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 10 +- drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 16 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 14 - drivers/net/wireless/iwlwifi/iwl-commands.h | 4 +- drivers/net/wireless/iwlwifi/iwl-core.c | 10 +- drivers/net/wireless/iwlwifi/iwl-core.h | 4 +- drivers/net/wireless/iwlwifi/iwl-debugfs.c | 18 +- drivers/net/wireless/iwlwifi/iwl-dev.h | 5 + drivers/net/wireless/iwlwifi/iwl-scan.c | 3 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 6 +- drivers/net/wireless/iwmc3200wifi/bus.h | 2 +- drivers/net/wireless/iwmc3200wifi/debug.h | 7 +- drivers/net/wireless/iwmc3200wifi/debugfs.c | 110 +-- drivers/net/wireless/iwmc3200wifi/sdio.c | 17 +- drivers/net/wireless/libertas/if_sdio.c | 4 +- drivers/net/wireless/libertas_tf/cmd.c | 203 ++- drivers/net/wireless/libertas_tf/deb_defs.h | 104 ++ drivers/net/wireless/libertas_tf/if_usb.c | 251 +++- drivers/net/wireless/libertas_tf/libertas_tf.h | 2 + drivers/net/wireless/libertas_tf/main.c | 92 +- drivers/net/wireless/mac80211_hwsim.c | 6 +- drivers/net/wireless/mwl8k.c | 6 +- drivers/net/wireless/orinoco/Kconfig | 7 + drivers/net/wireless/orinoco/Makefile | 1 + drivers/net/wireless/orinoco/airport.c | 8 +- drivers/net/wireless/orinoco/cfg.c | 2 +- drivers/net/wireless/orinoco/fw.c | 10 +- drivers/net/wireless/orinoco/hermes.c | 286 ++++- drivers/net/wireless/orinoco/hermes.h | 62 +- drivers/net/wireless/orinoco/hermes_dld.c | 243 +--- drivers/net/wireless/orinoco/hw.c | 63 +- drivers/net/wireless/orinoco/main.c | 137 +- drivers/net/wireless/orinoco/orinoco.h | 30 +- drivers/net/wireless/orinoco/orinoco_cs.c | 6 +- drivers/net/wireless/orinoco/orinoco_nortel.c | 2 +- drivers/net/wireless/orinoco/orinoco_pci.c | 2 +- drivers/net/wireless/orinoco/orinoco_plx.c | 2 +- drivers/net/wireless/orinoco/orinoco_tmd.c | 2 +- drivers/net/wireless/orinoco/orinoco_usb.c | 1800 ++++++++++++++++++++++ drivers/net/wireless/orinoco/spectrum_cs.c | 7 +- drivers/net/wireless/orinoco/wext.c | 6 +- drivers/net/wireless/p54/main.c | 3 +- drivers/net/wireless/p54/p54pci.c | 16 +- drivers/net/wireless/p54/txrx.c | 1 - drivers/net/wireless/rt2x00/rt2800.h | 7 +- drivers/net/wireless/rt2x00/rt2800lib.c | 84 +- drivers/net/wireless/rt2x00/rt2800pci.c | 4 - drivers/net/wireless/rt2x00/rt2800usb.c | 11 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 1 - drivers/net/wireless/rt2x00/rt2x00queue.h | 2 - drivers/net/wireless/rtl818x/rtl8180_dev.c | 3 +- drivers/net/wireless/wl12xx/wl1251_main.c | 2 +- drivers/net/wireless/wl12xx/wl1251_rx.c | 6 - drivers/net/wireless/wl12xx/wl1271_acx.c | 2 +- drivers/net/wireless/wl12xx/wl1271_boot.c | 8 +- drivers/net/wireless/wl12xx/wl1271_cmd.c | 14 +- drivers/net/wireless/wl12xx/wl1271_conf.h | 2 +- drivers/net/wireless/wl12xx/wl1271_main.c | 97 +- drivers/ssb/driver_chipcommon.c | 2 + drivers/ssb/main.c | 3 + drivers/ssb/pci.c | 14 +- drivers/ssb/sprom.c | 14 + include/linux/nl80211.h | 5 + include/linux/ssb/ssb.h | 4 + include/linux/ssb/ssb_driver_chipcommon.h | 15 + include/linux/ssb/ssb_regs.h | 239 ++-- include/net/cfg80211.h | 4 + include/net/mac80211.h | 21 +- net/mac80211/cfg.c | 18 +- net/mac80211/debugfs_sta.c | 65 +- net/mac80211/driver-ops.h | 5 +- net/mac80211/driver-trace.h | 9 +- net/mac80211/ibss.c | 21 +- net/mac80211/ieee80211_i.h | 3 +- net/mac80211/main.c | 19 +- net/mac80211/mlme.c | 21 + net/mac80211/rx.c | 2 - net/mac80211/scan.c | 53 +- net/mac80211/sta_info.c | 17 +- net/mac80211/status.c | 7 + net/mac80211/tx.c | 5 +- net/mac80211/work.c | 28 +- net/wireless/core.c | 3 +- net/wireless/nl80211.c | 4 + 132 files changed, 4707 insertions(+), 1333 deletions(-) create mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-debugfs.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-debugfs.h create mode 100644 drivers/net/wireless/libertas_tf/deb_defs.h create mode 100644 drivers/net/wireless/orinoco/orinoco_usb.c $ git am -3 ../patches/wireless__update_gfp_slab.h_includes Applying: wireless: update gfp/slab.h includes $ git reset HEAD^ Unstaged changes after reset: M drivers/net/wireless/ath/ath9k/htc.h M drivers/net/wireless/iwlwifi/iwl-agn-ict.c $ git add . $ git commit -v -a --amend [master 2303797] Merge remote branch 'wireless/master' Merging mtd/master $ git merge mtd/master Resolved 'drivers/mtd/mtdcore.c' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/arm/mach-ep93xx/ts72xx.c Auto-merging drivers/mtd/Makefile Auto-merging drivers/mtd/devices/block2mtd.c Auto-merging drivers/mtd/maps/bfin-async-flash.c Auto-merging drivers/mtd/maps/physmap_of.c Auto-merging drivers/mtd/maps/pismo.c Auto-merging drivers/mtd/mtdcore.c CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c Auto-merging drivers/mtd/mtdsuper.c Auto-merging drivers/mtd/nand/bcm_umi_nand.c Auto-merging drivers/mtd/nand/cafe_nand.c Auto-merging drivers/mtd/nand/davinci_nand.c Auto-merging drivers/mtd/nand/fsl_upm.c Auto-merging drivers/mtd/nand/mxc_nand.c Auto-merging drivers/mtd/nand/nomadik_nand.c Auto-merging drivers/mtd/nand/omap2.c Auto-merging drivers/mtd/nand/orion_nand.c Auto-merging drivers/mtd/nand/sh_flctl.c Auto-merging drivers/mtd/nand/tmio_nand.c Removing drivers/mtd/nand/ts7250.c Auto-merging drivers/mtd/onenand/omap2.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e95ba2d] 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 | 13 + drivers/mtd/Makefile | 1 + drivers/mtd/chips/cfi_cmdset_0001.c | 6 +- drivers/mtd/chips/cfi_cmdset_0002.c | 20 +- drivers/mtd/devices/Makefile | 2 +- drivers/mtd/devices/block2mtd.c | 4 +- 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.c | 7 +- drivers/mtd/maps/physmap_of.c | 2 +- drivers/mtd/maps/pismo.c | 8 +- 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 | 50 +- drivers/mtd/nand/Makefile | 9 +- 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 | 1284 ++++++++++++++++++++ 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 +- 73 files changed, 4958 insertions(+), 942 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 $ git am -3 ../patches/mtd__update_gfp_slab.h_includes Applying: mtd: update gfp/slab.h includes Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging drivers/mtd/mtdcore.c $ git reset HEAD^ Unstaged changes after reset: M drivers/mtd/mtdcore.c M drivers/mtd/nand/mpc5121_nfc.c M drivers/mtd/nand/r852.c $ git add . $ git commit -v -a --amend [master a14c478] Merge remote branch 'mtd/master' Merging crypto/master $ git merge crypto/master Recorded preimage for 'arch/arm/mach-omap2/devices.c' Auto-merging arch/arm/mach-omap2/devices.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/arm/mach-omap2/devices.c'. [master 9fe5aa1c] Merge remote branch 'crypto/master' $ git diff -M --stat --summary HEAD^.. arch/arm/mach-omap2/clock2420_data.c | 2 +- arch/arm/mach-omap2/clock2430_data.c | 2 +- arch/arm/mach-omap2/clock3xxx_data.c | 2 +- arch/arm/mach-omap2/devices.c | 58 ++- arch/arm/plat-omap/include/plat/omap34xx.h | 5 + arch/x86/crypto/aesni-intel_asm.S | 115 +++ arch/x86/crypto/aesni-intel_glue.c | 130 +++- arch/x86/include/asm/inst.h | 96 ++- crypto/algapi.c | 2 +- crypto/internal.h | 2 +- crypto/pcrypt.c | 11 +- crypto/tcrypt.c | 7 + crypto/tcrypt.h | 29 + crypto/testmgr.h | 64 ++- crypto/vmac.c | 75 +- drivers/crypto/Kconfig | 9 + drivers/crypto/Makefile | 2 + drivers/crypto/geode-aes.c | 36 +- drivers/crypto/mv_cesa.c | 688 ++++++++++++++-- drivers/crypto/mv_cesa.h | 40 +- drivers/crypto/omap-sham.c | 1259 ++++++++++++++++++++++++++++ kernel/padata.c | 56 +- 22 files changed, 2495 insertions(+), 195 deletions(-) create mode 100644 drivers/crypto/omap-sham.c Merging sound/for-next $ git merge sound/for-next Auto-merging arch/arm/mach-davinci/board-dm365-evm.c Auto-merging arch/arm/plat-omap/include/plat/mcbsp.h Removing sound/soc/codecs/ad1938.c Removing sound/soc/codecs/ad1938.h Removing sound/usb/usbaudio.c Merge made by recursive. Documentation/DocBook/writing-an-alsa-driver.tmpl | 27 +- Documentation/sound/alsa/ALSA-Configuration.txt | 10 + Documentation/sound/alsa/HD-Audio.txt | 4 +- arch/arm/mach-davinci/board-dm365-evm.c | 4 + arch/arm/plat-omap/include/plat/mcbsp.h | 6 + arch/arm/plat-omap/mcbsp.c | 55 + drivers/gpio/wm8994-gpio.c | 12 + drivers/mfd/Kconfig | 8 +- drivers/mfd/Makefile | 3 +- drivers/mfd/davinci_voicecodec.c | 190 + drivers/mfd/twl-core.c | 4 +- drivers/mfd/wm8994-core.c | 43 +- drivers/mfd/wm8994-irq.c | 310 ++ include/linux/i2c/twl.h | 6 +- include/linux/mfd/davinci_voicecodec.h | 126 + include/linux/mfd/wm8350/audio.h | 2 + include/linux/mfd/wm8994/core.h | 53 +- include/linux/mfd/wm8994/pdata.h | 1 + include/linux/usb/audio-v2.h | 366 ++ include/linux/usb/audio.h | 210 +- include/sound/info.h | 24 +- include/sound/jack.h | 8 + include/sound/soc-dai.h | 7 +- include/sound/soc-dapm.h | 5 +- include/sound/soc.h | 33 +- include/sound/tlv320dac33-plat.h | 1 + include/sound/uda134x.h | 1 + include/sound/version.h | 2 +- include/sound/wm8903.h | 249 ++ include/sound/wm8904.h | 110 +- include/sound/wm8960.h | 24 + sound/atmel/Kconfig | 2 +- sound/atmel/ac97c.c | 355 ++- sound/core/control.c | 5 + sound/core/info.c | 72 +- sound/core/jack.c | 71 +- sound/core/oss/mixer_oss.c | 5 + sound/core/oss/pcm_oss.c | 5 + sound/core/pcm_native.c | 49 +- sound/core/rawmidi.c | 5 + sound/core/seq/seq_clientmgr.c | 6 + sound/core/sound.c | 73 +- sound/core/timer.c | 6 + sound/drivers/opl4/opl4_proc.c | 83 +- sound/i2c/i2c.c | 18 +- sound/isa/gus/gus_mem_proc.c | 48 +- sound/isa/sb/es968.c | 2 +- sound/pci/Kconfig | 32 + sound/pci/Makefile | 1 + sound/pci/asihpi/Makefile | 5 + sound/pci/asihpi/asihpi.c | 3002 +++++++++++++++ sound/pci/asihpi/hpi.h | 2001 ++++++++++ sound/pci/asihpi/hpi6000.c | 1841 +++++++++ sound/pci/asihpi/hpi6000.h | 70 + sound/pci/asihpi/hpi6205.c | 2332 +++++++++++ sound/pci/asihpi/hpi6205.h | 93 + sound/pci/asihpi/hpi_internal.h | 1641 ++++++++ sound/pci/asihpi/hpicmn.c | 643 ++++ sound/pci/asihpi/hpicmn.h | 64 + sound/pci/asihpi/hpidebug.c | 225 ++ sound/pci/asihpi/hpidebug.h | 385 ++ sound/pci/asihpi/hpidspcd.c | 172 + sound/pci/asihpi/hpidspcd.h | 104 + sound/pci/asihpi/hpifunc.c | 3864 +++++++++++++++++++ sound/pci/asihpi/hpimsginit.c | 130 + sound/pci/asihpi/hpimsginit.h | 40 + sound/pci/asihpi/hpimsgx.c | 907 +++++ sound/pci/asihpi/hpimsgx.h | 36 + sound/pci/asihpi/hpioctl.c | 484 +++ sound/pci/asihpi/hpioctl.h | 38 + sound/pci/asihpi/hpios.c | 114 + sound/pci/asihpi/hpios.h | 178 + sound/pci/asihpi/hpipcida.h | 37 + sound/pci/cs4281.c | 40 +- sound/pci/cs46xx/cs46xx_lib.c | 19 +- sound/pci/emu10k1/emuproc.c | 51 +- sound/pci/es1968.c | 128 +- sound/pci/hda/hda_codec.c | 76 +- sound/pci/hda/hda_codec.h | 3 + sound/pci/hda/hda_intel.c | 24 +- sound/pci/hda/patch_analog.c | 21 +- sound/pci/hda/patch_conexant.c | 153 +- sound/pci/hda/patch_realtek.c | 233 +- sound/pci/ice1712/aureon.c | 89 +- sound/pci/maestro3.c | 138 +- sound/pci/mixart/mixart.c | 79 +- sound/ppc/tumbler.c | 12 +- sound/soc/atmel/atmel-pcm.c | 14 +- sound/soc/blackfin/Kconfig | 9 +- sound/soc/blackfin/Makefile | 4 +- .../blackfin/{bf5xx-ad1938.c => bf5xx-ad193x.c} | 66 +- sound/soc/blackfin/bf5xx-sport.h | 28 +- sound/soc/codecs/Kconfig | 12 +- sound/soc/codecs/Makefile | 8 +- sound/soc/codecs/ad1836.c | 2 +- sound/soc/codecs/ad1938.c | 522 --- sound/soc/codecs/ad1938.h | 100 - sound/soc/codecs/ad193x.c | 547 +++ sound/soc/codecs/ad193x.h | 81 + sound/soc/codecs/ak4104.c | 2 +- sound/soc/codecs/ak4535.c | 10 +- sound/soc/codecs/ak4642.c | 177 +- sound/soc/codecs/ak4671.c | 2 +- sound/soc/codecs/cq93vc.c | 299 ++ sound/soc/codecs/cq93vc.h | 29 + sound/soc/codecs/cs4270.c | 20 +- sound/soc/codecs/cx20442.c | 2 +- sound/soc/codecs/da7210.c | 157 +- sound/soc/codecs/ssm2602.c | 16 +- sound/soc/codecs/stac9766.c | 2 +- sound/soc/codecs/tlv320aic26.c | 14 +- sound/soc/codecs/tlv320aic3x.c | 91 +- sound/soc/codecs/tlv320dac33.c | 324 ++- sound/soc/codecs/twl4030.c | 102 +- sound/soc/codecs/twl6040.c | 1228 ++++++ sound/soc/codecs/twl6040.h | 141 + sound/soc/codecs/uda134x.c | 29 +- sound/soc/codecs/uda1380.c | 4 +- sound/soc/codecs/wm8350.c | 100 +- sound/soc/codecs/wm8350.h | 3 + sound/soc/codecs/wm8400.c | 16 +- sound/soc/codecs/wm8523.c | 10 +- sound/soc/codecs/wm8580.c | 4 +- sound/soc/codecs/wm8711.c | 6 +- sound/soc/codecs/wm8731.c | 16 +- sound/soc/codecs/wm8750.c | 347 +- sound/soc/codecs/wm8753.c | 8 +- sound/soc/codecs/wm8776.c | 6 +- sound/soc/codecs/wm8900.c | 10 +- sound/soc/codecs/wm8903.c | 216 +- sound/soc/codecs/wm8903.h | 221 +-- sound/soc/codecs/wm8904.c | 59 +- sound/soc/codecs/wm8904.h | 97 - sound/soc/codecs/wm8940.c | 4 +- sound/soc/codecs/wm8955.c | 16 +- sound/soc/codecs/wm8960.c | 211 +- sound/soc/codecs/wm8960.h | 10 - sound/soc/codecs/wm8961.c | 6 +- sound/soc/codecs/wm8971.c | 12 +- sound/soc/codecs/wm8974.c | 4 +- sound/soc/codecs/wm8978.c | 12 +- sound/soc/codecs/wm8988.c | 8 +- sound/soc/codecs/wm8990.c | 8 +- sound/soc/codecs/wm8993.c | 24 +- sound/soc/codecs/wm8994.c | 259 ++- sound/soc/codecs/wm8994.h | 8 + sound/soc/codecs/wm9081.c | 18 +- sound/soc/codecs/wm9713.c | 13 +- sound/soc/codecs/wm_hubs.c | 6 +- sound/soc/davinci/Kconfig | 27 +- sound/soc/davinci/Makefile | 2 + sound/soc/davinci/davinci-evm.c | 61 +- sound/soc/davinci/davinci-vcif.c | 274 ++ sound/soc/davinci/davinci-vcif.h | 28 + sound/soc/imx/Kconfig | 8 + sound/soc/imx/Makefile | 3 + sound/soc/imx/wm1133-ev1.c | 308 ++ sound/soc/omap/mcpdm.c | 548 ++-- sound/soc/omap/omap-mcbsp.c | 38 +- sound/soc/pxa/Kconfig | 8 + sound/soc/pxa/Makefile | 2 + sound/soc/pxa/spitz.c | 43 +- sound/soc/pxa/z2.c | 246 ++ sound/soc/s3c24xx/jive_wm8750.c | 5 - sound/soc/s3c24xx/s3c-i2s-v2.c | 120 +- sound/soc/s3c24xx/s3c-i2s-v2.h | 4 + sound/soc/s3c24xx/s3c2412-i2s.c | 40 + sound/soc/s3c24xx/s3c2412-i2s.h | 4 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 12 - sound/soc/s3c24xx/s3c64xx-i2s.h | 15 +- sound/soc/sh/Kconfig | 3 +- sound/soc/sh/fsi-ak4642.c | 14 + sound/soc/sh/fsi.c | 191 +- sound/soc/soc-cache.c | 122 +- sound/soc/soc-core.c | 115 +- sound/soc/soc-dapm.c | 135 +- sound/soc/soc-jack.c | 43 +- sound/usb/Kconfig | 4 +- sound/usb/Makefile | 26 +- sound/usb/caiaq/control.c | 99 +- sound/usb/caiaq/device.c | 8 +- sound/usb/caiaq/device.h | 24 +- sound/usb/caiaq/input.c | 163 +- sound/usb/card.c | 652 ++++ sound/usb/card.h | 105 + sound/usb/debug.h | 15 + sound/usb/endpoint.c | 362 ++ sound/usb/endpoint.h | 11 + sound/usb/format.c | 432 +++ sound/usb/format.h | 8 + sound/usb/helper.c | 113 + sound/usb/helper.h | 32 + sound/usb/{usbmidi.c => midi.c} | 3 +- sound/usb/midi.h | 48 + sound/usb/misc/Makefile | 2 + sound/usb/{ => misc}/ua101.c | 3 +- sound/usb/{usbmixer.c => mixer.c} | 847 ++--- sound/usb/mixer.h | 55 + sound/usb/{usbmixer_maps.c => mixer_maps.c} | 4 +- sound/usb/mixer_quirks.c | 412 ++ sound/usb/mixer_quirks.h | 13 + sound/usb/pcm.c | 935 +++++ sound/usb/pcm.h | 14 + sound/usb/proc.c | 168 + sound/usb/proc.h | 8 + sound/usb/{usbquirks.h => quirks-table.h} | 68 +- sound/usb/quirks.c | 594 +++ sound/usb/quirks.h | 23 + sound/usb/urb.c | 995 +++++ sound/usb/urb.h | 21 + sound/usb/usbaudio.c | 4050 -------------------- sound/usb/usbaudio.h | 93 +- sound/usb/usx2y/us122l.c | 1 + sound/usb/usx2y/usbusx2y.h | 1 + 214 files changed, 33194 insertions(+), 7631 deletions(-) create mode 100644 drivers/mfd/davinci_voicecodec.c create mode 100644 drivers/mfd/wm8994-irq.c create mode 100644 include/linux/mfd/davinci_voicecodec.h create mode 100644 include/linux/usb/audio-v2.h create mode 100644 include/sound/wm8903.h create mode 100644 include/sound/wm8960.h create mode 100644 sound/pci/asihpi/Makefile create mode 100644 sound/pci/asihpi/asihpi.c create mode 100644 sound/pci/asihpi/hpi.h create mode 100644 sound/pci/asihpi/hpi6000.c create mode 100644 sound/pci/asihpi/hpi6000.h create mode 100644 sound/pci/asihpi/hpi6205.c create mode 100644 sound/pci/asihpi/hpi6205.h create mode 100644 sound/pci/asihpi/hpi_internal.h create mode 100644 sound/pci/asihpi/hpicmn.c create mode 100644 sound/pci/asihpi/hpicmn.h create mode 100644 sound/pci/asihpi/hpidebug.c create mode 100644 sound/pci/asihpi/hpidebug.h create mode 100644 sound/pci/asihpi/hpidspcd.c create mode 100644 sound/pci/asihpi/hpidspcd.h create mode 100644 sound/pci/asihpi/hpifunc.c create mode 100644 sound/pci/asihpi/hpimsginit.c create mode 100644 sound/pci/asihpi/hpimsginit.h create mode 100644 sound/pci/asihpi/hpimsgx.c create mode 100644 sound/pci/asihpi/hpimsgx.h create mode 100644 sound/pci/asihpi/hpioctl.c create mode 100644 sound/pci/asihpi/hpioctl.h create mode 100644 sound/pci/asihpi/hpios.c create mode 100644 sound/pci/asihpi/hpios.h create mode 100644 sound/pci/asihpi/hpipcida.h rename sound/soc/blackfin/{bf5xx-ad1938.c => bf5xx-ad193x.c} (65%) delete mode 100644 sound/soc/codecs/ad1938.c delete mode 100644 sound/soc/codecs/ad1938.h create mode 100644 sound/soc/codecs/ad193x.c create mode 100644 sound/soc/codecs/ad193x.h create mode 100644 sound/soc/codecs/cq93vc.c create mode 100644 sound/soc/codecs/cq93vc.h create mode 100644 sound/soc/codecs/twl6040.c create mode 100644 sound/soc/codecs/twl6040.h create mode 100644 sound/soc/davinci/davinci-vcif.c create mode 100644 sound/soc/davinci/davinci-vcif.h create mode 100644 sound/soc/imx/wm1133-ev1.c create mode 100644 sound/soc/pxa/z2.c create mode 100644 sound/usb/card.c create mode 100644 sound/usb/card.h create mode 100644 sound/usb/debug.h create mode 100644 sound/usb/endpoint.c create mode 100644 sound/usb/endpoint.h create mode 100644 sound/usb/format.c create mode 100644 sound/usb/format.h create mode 100644 sound/usb/helper.c create mode 100644 sound/usb/helper.h rename sound/usb/{usbmidi.c => midi.c} (99%) create mode 100644 sound/usb/midi.h create mode 100644 sound/usb/misc/Makefile rename sound/usb/{ => misc}/ua101.c (99%) rename sound/usb/{usbmixer.c => mixer.c} (72%) create mode 100644 sound/usb/mixer.h rename sound/usb/{usbmixer_maps.c => mixer_maps.c} (98%) create mode 100644 sound/usb/mixer_quirks.c create mode 100644 sound/usb/mixer_quirks.h create mode 100644 sound/usb/pcm.c create mode 100644 sound/usb/pcm.h create mode 100644 sound/usb/proc.c create mode 100644 sound/usb/proc.h rename sound/usb/{usbquirks.h => quirks-table.h} (97%) create mode 100644 sound/usb/quirks.c create mode 100644 sound/usb/quirks.h create mode 100644 sound/usb/urb.c create mode 100644 sound/usb/urb.h delete mode 100644 sound/usb/usbaudio.c Merging cpufreq/next $ git merge cpufreq/next Auto-merging Documentation/feature-removal-schedule.txt Merge made by recursive. Documentation/feature-removal-schedule.txt | 10 -------- arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 2 + drivers/cpufreq/cpufreq.c | 10 ++------ drivers/cpufreq/cpufreq_ondemand.c | 33 +++++++++++++++------------ include/linux/cpufreq.h | 5 ---- 5 files changed, 23 insertions(+), 37 deletions(-) Merging quilt/rr $ git merge quilt/rr Resolved 'drivers/net/virtio_net.c' using previous resolution. Resolved 'include/linux/mod_devicetable.h' using previous resolution. Resolved 'scripts/mod/file2alias.c' using previous resolution. Auto-merging drivers/net/virtio_net.c CONFLICT (content): Merge conflict in drivers/net/virtio_net.c Auto-merging drivers/virtio/virtio_balloon.c Auto-merging include/linux/mod_devicetable.h CONFLICT (content): Merge conflict in include/linux/mod_devicetable.h Auto-merging kernel/module.c Auto-merging scripts/mod/file2alias.c CONFLICT (content): Merge conflict in scripts/mod/file2alias.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 2957317] Merge branch 'quilt/rr' $ git diff -M --stat --summary HEAD^.. Documentation/cpu-hotplug.txt | 2 +- drivers/block/virtio_blk.c | 46 +++- drivers/char/hw_random/virtio-rng.c | 6 +- drivers/char/virtio_console.c | 643 ++++++++++++++++++----------------- drivers/isdn/hisax/hisax_fcpcipnp.c | 3 +- drivers/net/virtio_net.c | 47 ++-- drivers/virtio/virtio_balloon.c | 17 +- drivers/virtio/virtio_ring.c | 36 +-- include/linux/isapnp.h | 8 +- include/linux/mod_devicetable.h | 7 + include/linux/virtio.h | 43 ++-- include/linux/virtio_blk.h | 5 + include/linux/virtio_console.h | 25 ++ kernel/module.c | 57 ++-- kernel/params.c | 20 +- net/9p/trans_virtio.c | 6 +- scripts/mod/file2alias.c | 17 + 17 files changed, 546 insertions(+), 442 deletions(-) Merging mmc/next $ git merge mmc/next Already up-to-date. Merging input/next $ git merge input/next Auto-merging drivers/input/tablet/wacom_sys.c Removing drivers/input/touchscreen/corgi_ts.c Auto-merging include/linux/input.h Merge made by recursive. drivers/char/keyboard.c | 325 ++++----- drivers/char/sysrq.c | 243 ++++++- drivers/input/keyboard/lm8323.c | 6 +- drivers/input/misc/Kconfig | 40 + drivers/input/misc/Makefile | 4 + drivers/input/misc/ad714x-i2c.c | 140 ++++ drivers/input/misc/ad714x-spi.c | 103 +++ drivers/input/misc/ad714x.c | 1347 +++++++++++++++++++++++++++++++++ drivers/input/misc/ad714x.h | 26 + drivers/input/misc/pcf8574_keypad.c | 227 ++++++ drivers/input/tablet/acecad.c | 86 +-- drivers/input/tablet/kbtab.c | 53 +- drivers/input/tablet/wacom.h | 36 +- drivers/input/tablet/wacom_sys.c | 316 +++----- drivers/input/tablet/wacom_wac.c | 1168 +++++++++++++++------------- drivers/input/tablet/wacom_wac.h | 13 +- drivers/input/touchscreen/Kconfig | 28 +- drivers/input/touchscreen/Makefile | 2 +- drivers/input/touchscreen/corgi_ts.c | 385 ---------- drivers/input/touchscreen/hampshire.c | 205 +++++ drivers/input/touchscreen/tsc2007.c | 2 + include/linux/input.h | 1 + include/linux/input/ad714x.h | 63 ++ include/linux/serio.h | 1 + include/linux/sysrq.h | 23 +- kernel/sysctl.c | 23 +- 26 files changed, 3389 insertions(+), 1477 deletions(-) create mode 100644 drivers/input/misc/ad714x-i2c.c create mode 100644 drivers/input/misc/ad714x-spi.c create mode 100644 drivers/input/misc/ad714x.c create mode 100644 drivers/input/misc/ad714x.h create mode 100644 drivers/input/misc/pcf8574_keypad.c delete mode 100644 drivers/input/touchscreen/corgi_ts.c create mode 100644 drivers/input/touchscreen/hampshire.c create mode 100644 include/linux/input/ad714x.h Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Resolved 'fs/ext3/fsync.c' using previous resolution. Resolved 'fs/ext4/fsync.c' using previous resolution. Auto-merging fs/ext3/fsync.c CONFLICT (content): Merge conflict in fs/ext3/fsync.c Auto-merging fs/ext4/fsync.c CONFLICT (content): Merge conflict in fs/ext4/fsync.c Auto-merging fs/gfs2/rgrp.c Auto-merging fs/nilfs2/the_nilfs.c Auto-merging fs/xfs/linux-2.6/xfs_super.c Auto-merging include/linux/fs.h Auto-merging init/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 783e7ac] Merge remote branch 'block/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/cgroups/blkio-controller.txt | 151 +++++- block/Kconfig | 23 - block/Kconfig.iosched | 16 +- block/Makefile | 2 +- block/blk-barrier.c | 147 +----- block/blk-cgroup.c | 727 +++++++++++++++++++++++++++- block/blk-cgroup.h | 178 ++++++- block/blk-core.c | 28 +- block/blk-lib.c | 233 +++++++++ block/cfq-iosched.c | 80 +++- block/elevator.c | 9 + block/genhd.c | 1 + block/ioctl.c | 2 +- drivers/block/drbd/drbd_int.h | 3 +- drivers/block/drbd/drbd_receiver.c | 3 +- fs/block_dev.c | 257 +++++++++-- fs/btrfs/extent-tree.c | 2 +- fs/ext3/fsync.c | 3 +- fs/ext4/fsync.c | 6 +- fs/gfs2/rgrp.c | 5 +- fs/jbd2/checkpoint.c | 3 +- fs/jbd2/commit.c | 6 +- fs/nilfs2/the_nilfs.c | 4 +- fs/reiserfs/file.c | 3 +- fs/xfs/linux-2.6/xfs_super.c | 3 +- include/linux/backing-dev.h | 3 + include/linux/blkdev.h | 62 ++- include/linux/elevator.h | 6 + include/linux/fs.h | 1 + include/linux/writeback.h | 3 +- init/Kconfig | 27 + kernel/sched_clock.c | 1 + mm/page-writeback.c | 34 +- mm/swapfile.c | 9 +- 34 files changed, 1703 insertions(+), 338 deletions(-) create mode 100644 block/blk-lib.c 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 Recorded preimage for 'drivers/net/wireless/orinoco/orinoco_cs.c' Resolved 'drivers/net/pcmcia/3c589_cs.c' using previous resolution. Auto-merging drivers/net/pcmcia/3c589_cs.c CONFLICT (content): Merge conflict in drivers/net/pcmcia/3c589_cs.c Auto-merging drivers/net/pcmcia/axnet_cs.c Auto-merging drivers/net/pcmcia/fmvj18x_cs.c Auto-merging drivers/net/pcmcia/nmclan_cs.c Auto-merging drivers/net/pcmcia/smc91c92_cs.c Auto-merging drivers/net/pcmcia/xirc2ps_cs.c Auto-merging drivers/net/wireless/orinoco/orinoco_cs.c CONFLICT (content): Merge conflict in drivers/net/wireless/orinoco/orinoco_cs.c Auto-merging drivers/net/wireless/orinoco/spectrum_cs.c CONFLICT (content): Merge conflict in drivers/net/wireless/orinoco/spectrum_cs.c Auto-merging drivers/net/wireless/ray_cs.c Auto-merging drivers/net/wireless/wl3501_cs.c Auto-merging drivers/ssb/main.c Auto-merging drivers/staging/comedi/drivers/quatech_daqp_cs.c Auto-merging drivers/staging/wavelan/wavelan_cs.c Removing include/pcmcia/mem_op.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/net/wireless/orinoco/orinoco_cs.c'. Resolved 'drivers/net/wireless/orinoco/spectrum_cs.c' using previous resolution. [master ff9b30f] Merge remote branch 'pcmcia/master' $ git diff -M --stat --summary HEAD^.. Documentation/pcmcia/driver-changes.txt | 13 + drivers/ata/pata_pcmcia.c | 47 +-- drivers/bluetooth/bluecard_cs.c | 11 +- drivers/bluetooth/bt3c_cs.c | 11 +- drivers/bluetooth/btuart_cs.c | 11 +- drivers/bluetooth/dtl1_cs.c | 11 +- drivers/char/pcmcia/cm4000_cs.c | 9 +- drivers/char/pcmcia/cm4040_cs.c | 5 - drivers/char/pcmcia/ipwireless/main.c | 19 +- drivers/char/pcmcia/ipwireless/main.h | 1 - drivers/char/pcmcia/ipwireless/tty.c | 19 +- drivers/char/pcmcia/ipwireless/tty.h | 3 +- drivers/char/pcmcia/synclink_cs.c | 22 +- drivers/ide/ide-cs.c | 20 +- drivers/isdn/hardware/avm/avm_cs.c | 76 +--- drivers/isdn/hisax/avma1_cs.c | 63 +-- drivers/isdn/hisax/elsa_cs.c | 40 +-- drivers/isdn/hisax/sedlbauer_cs.c | 60 +-- drivers/isdn/hisax/teles_cs.c | 50 +-- drivers/mtd/maps/pcmciamtd.c | 3 - drivers/net/pcmcia/3c574_cs.c | 15 +- drivers/net/pcmcia/3c589_cs.c | 16 +- drivers/net/pcmcia/axnet_cs.c | 21 +- drivers/net/pcmcia/com20020_cs.c | 29 +- drivers/net/pcmcia/fmvj18x_cs.c | 18 +- drivers/net/pcmcia/ibmtr_cs.c | 16 +- drivers/net/pcmcia/nmclan_cs.c | 14 +- drivers/net/pcmcia/pcnet_cs.c | 16 +- drivers/net/pcmcia/smc91c92_cs.c | 17 +- drivers/net/pcmcia/xirc2ps_cs.c | 36 +-- drivers/net/wireless/airo_cs.c | 72 +--- drivers/net/wireless/atmel_cs.c | 70 +--- drivers/net/wireless/b43/pcmcia.c | 5 +- drivers/net/wireless/hostap/hostap_cs.c | 38 +- drivers/net/wireless/libertas/if_cs.c | 21 +- drivers/net/wireless/orinoco/orinoco_cs.c | 27 +- drivers/net/wireless/orinoco/spectrum_cs.c | 27 +- drivers/net/wireless/ray_cs.c | 15 +- drivers/net/wireless/ray_cs.h | 1 - drivers/net/wireless/wl3501.h | 1 - drivers/net/wireless/wl3501_cs.c | 23 +- drivers/parport/parport_cs.c | 13 +- drivers/pcmcia/Kconfig | 22 +- drivers/pcmcia/Makefile | 9 +- drivers/pcmcia/bfin_cf_pcmcia.c | 2 +- drivers/pcmcia/cardbus.c | 1 - drivers/pcmcia/cistpl.c | 121 +---- drivers/pcmcia/cs.c | 17 +- drivers/pcmcia/cs_internal.h | 22 +- drivers/pcmcia/ds.c | 35 +- drivers/pcmcia/omap_cf.c | 2 +- drivers/pcmcia/pcmcia_cis.c | 356 ++++++++++++ drivers/pcmcia/pcmcia_ioctl.c | 23 +- drivers/pcmcia/pcmcia_resource.c | 634 ++++++---------------- drivers/pcmcia/rsrc_iodyn.c | 172 ++++++ drivers/pcmcia/rsrc_mgr.c | 112 +---- drivers/pcmcia/rsrc_nonstatic.c | 164 +++++-- drivers/pcmcia/yenta_socket.c | 7 - drivers/scsi/pcmcia/aha152x_stub.c | 9 +- drivers/scsi/pcmcia/fdomain_stub.c | 9 +- drivers/scsi/pcmcia/nsp_cs.c | 23 +- drivers/scsi/pcmcia/nsp_cs.h | 1 - drivers/scsi/pcmcia/qlogic_stub.c | 13 +- drivers/scsi/pcmcia/sym53c500_cs.c | 9 +- drivers/serial/serial_cs.c | 36 +- drivers/ssb/main.c | 2 +- drivers/staging/comedi/drivers/cb_das16_cs.c | 45 +-- drivers/staging/comedi/drivers/das08_cs.c | 35 +- drivers/staging/comedi/drivers/ni_daq_700.c | 42 +-- drivers/staging/comedi/drivers/ni_daq_dio24.c | 42 +-- drivers/staging/comedi/drivers/ni_labpc_cs.c | 42 +-- drivers/staging/comedi/drivers/ni_mio_cs.c | 19 +- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 45 +-- drivers/staging/netwave/netwave_cs.c | 9 +- drivers/staging/wavelan/wavelan_cs.c | 15 +- drivers/staging/wlags49_h2/wl_cs.c | 9 +- drivers/telephony/ixj_pcmcia.c | 3 - drivers/usb/host/sl811_cs.c | 28 +- include/pcmcia/cs.h | 19 +- include/pcmcia/ds.h | 29 +- include/pcmcia/mem_op.h | 116 ---- include/pcmcia/ss.h | 7 +- sound/pcmcia/pdaudiocf/pdaudiocf.c | 12 +- sound/pcmcia/pdaudiocf/pdaudiocf.h | 1 - sound/pcmcia/vx/vxpocket.c | 10 +- sound/pcmcia/vx/vxpocket.h | 1 - 86 files changed, 1189 insertions(+), 2146 deletions(-) create mode 100644 drivers/pcmcia/pcmcia_cis.c create mode 100644 drivers/pcmcia/rsrc_iodyn.c delete mode 100644 include/pcmcia/mem_op.h Merging battery/master $ git merge battery/master Merge made by recursive. drivers/power/Kconfig | 10 +- drivers/power/Makefile | 1 + drivers/power/ds2782_battery.c | 194 +++++++++++++++++------- drivers/power/pda_power.c | 10 ++ drivers/power/tosa_battery.c | 4 +- drivers/power/wm831x_power.c | 33 ++-- drivers/power/wm97xx_battery.c | 3 + drivers/power/z2_battery.c | 328 ++++++++++++++++++++++++++++++++++++++++ include/linux/ds2782_battery.h | 8 + include/linux/pda_power.h | 2 + include/linux/z2_battery.h | 17 ++ 11 files changed, 537 insertions(+), 73 deletions(-) create mode 100644 drivers/power/z2_battery.c create mode 100644 include/linux/ds2782_battery.h create mode 100644 include/linux/z2_battery.h Merging leds/for-mm $ git merge leds/for-mm Merge made by recursive. drivers/leds/leds-88pm860x.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) Merging backlight/for-mm $ git merge backlight/for-mm Merge made by recursive. drivers/video/backlight/Kconfig | 79 ++++++++++++++----------------- drivers/video/backlight/adx_bl.c | 4 +- drivers/video/backlight/mbp_nvidia_bl.c | 45 +++++++++++++++++ 3 files changed, 82 insertions(+), 46 deletions(-) Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS Auto-merging arch/arm/include/asm/kmap_types.h Auto-merging arch/mips/kernel/traps.c Auto-merging arch/powerpc/kernel/traps.c Auto-merging arch/sparc/kernel/kgdb_64.c Auto-merging arch/x86/include/asm/processor.h Auto-merging arch/x86/kernel/kgdb.c Auto-merging arch/x86/kernel/setup.c Auto-merging arch/x86/kernel/traps.c Auto-merging drivers/serial/8250.c Auto-merging drivers/serial/amba-pl011.c Auto-merging drivers/serial/sh-sci.c Auto-merging init/main.c Auto-merging kernel/kallsyms.c Removing kernel/kgdb.c Auto-merging kernel/module.c Auto-merging kernel/sched.c Merge made by recursive. Documentation/DocBook/kgdb.tmpl | 692 ++++++-- Documentation/kernel-parameters.txt | 31 +- 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/serial/8250.c | 4 +- drivers/serial/amba-pl011.c | 6 +- drivers/serial/kgdboc.c | 94 +- drivers/serial/sh-sci.c | 6 +- drivers/serial/sunzilog.c | 50 + drivers/usb/early/ehci-dbgp.c | 120 ++- include/asm-generic/kmap_types.h | 3 +- include/linux/kdb.h | 117 ++ include/linux/kgdb.h | 55 +- include/linux/serial_core.h | 1 + init/main.c | 2 + kernel/Makefile | 2 +- kernel/debug/Makefile | 6 + kernel/debug/debug_core.c | 982 ++++++++++++ kernel/debug/debug_core.h | 81 + kernel/debug/gdbstub.c | 1017 ++++++++++++ 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 | 927 +++++++++++ kernel/kallsyms.c | 21 + kernel/kgdb.c | 1764 -------------------- kernel/module.c | 4 + kernel/printk.c | 25 + kernel/sched.c | 7 +- kernel/signal.c | 40 + lib/Kconfig.kgdb | 24 +- 56 files changed, 9495 insertions(+), 2050 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 delete mode 100644 kernel/kgdb.c $ git am -3 ../patches/0001-kgdb-update-for-sysrq-handling-change.patch Applying: kgdb: update for sysrq handling change $ git reset HEAD^ Unstaged changes after reset: M kernel/debug/kdb/kdb_main.c $ git add . $ git commit -v -a --amend [master 16f023f] Merge remote branch 'kgdb/kgdb-next' $ git am -3 ../patches/kdb__update_gfp_slab.h_includes Applying: kdb: update gfp/slab.h includes $ git reset HEAD^ Unstaged changes after reset: M kernel/debug/kdb/kdb_main.c $ git add . $ git commit -v -a --amend [master 0d285145] Merge remote branch 'kgdb/kgdb-next' Merging slab/for-next $ git merge slab/for-next Merge made by recursive. mm/slab.c | 174 +++++++++++++++++++++++++++++++++++++++++++++++-------------- mm/slub.c | 40 ++++++++++----- 2 files changed, 161 insertions(+), 53 deletions(-) Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Auto-merging drivers/md/Kconfig Auto-merging drivers/md/faulty.c Auto-merging drivers/md/linear.c Auto-merging drivers/md/md.c Auto-merging drivers/md/multipath.c Auto-merging drivers/md/raid0.c Auto-merging drivers/md/raid1.c Auto-merging drivers/md/raid10.c Auto-merging drivers/md/raid5.c Merge made by recursive. drivers/md/Kconfig | 4 +- drivers/md/bitmap.c | 41 ++++- drivers/md/bitmap.h | 2 + drivers/md/faulty.c | 9 +- drivers/md/linear.c | 35 ++-- drivers/md/md.c | 462 +++++++++++++++++++++++++++++------------------- drivers/md/md.h | 10 +- drivers/md/multipath.c | 13 +-- drivers/md/raid0.c | 251 ++++++++++++++++++++------- drivers/md/raid0.h | 3 + drivers/md/raid1.c | 105 ++++++------ drivers/md/raid10.c | 297 ++++++++++++++++++++----------- drivers/md/raid10.h | 12 ++ drivers/md/raid5.c | 233 +++++++++++++----------- 14 files changed, 925 insertions(+), 552 deletions(-) Merging mfd/for-next $ git merge mfd/for-next Resolved 'drivers/dma/Makefile' using previous resolution. Resolved 'drivers/dma/timb_dma.c' using previous resolution. Auto-merging arch/arm/mach-davinci/board-da850-evm.c Removing arch/x86/include/asm/rdc321x_defs.h Auto-merging drivers/dma/Kconfig Auto-merging drivers/dma/Makefile CONFLICT (content): Merge conflict in drivers/dma/Makefile Auto-merging drivers/dma/timb_dma.c CONFLICT (add/add): Merge conflict in drivers/dma/timb_dma.c Auto-merging drivers/input/touchscreen/Kconfig Auto-merging drivers/input/touchscreen/Makefile Auto-merging drivers/mfd/Kconfig Auto-merging drivers/mfd/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 465a9e7] Merge remote branch 'mfd/for-next' $ git diff -M --stat --summary HEAD^.. arch/arm/mach-davinci/board-da850-evm.c | 19 +- arch/x86/include/asm/rdc321x_defs.h | 12 - drivers/gpio/Kconfig | 18 + drivers/gpio/Makefile | 4 +- drivers/gpio/janz-ttl.c | 258 +++++ drivers/gpio/rdc321x-gpio.c | 246 +++++ drivers/input/touchscreen/Kconfig | 13 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/tps6507x-ts.c | 400 +++++++ drivers/mfd/88pm860x-core.c | 6 +- drivers/mfd/88pm860x-i2c.c | 1 + drivers/mfd/Kconfig | 31 + drivers/mfd/Makefile | 5 +- drivers/mfd/ab3100-core.c | 2 + drivers/mfd/da903x.c | 1 + drivers/mfd/janz-cmodio.c | 304 +++++ drivers/mfd/menelaus.c | 3 +- drivers/mfd/mfd-core.c | 2 +- drivers/mfd/pcf50633-core.c | 5 +- drivers/mfd/rdc321x-southbridge.c | 123 +++ drivers/mfd/t7l66xb.c | 3 + drivers/mfd/timberdale.c | 138 +++- drivers/mfd/timberdale.h | 16 +- drivers/mfd/tps65010.c | 2 +- drivers/mfd/tps6507x.c | 159 +++ drivers/mfd/wm831x-core.c | 109 ++- drivers/mfd/wm831x-irq.c | 18 +- drivers/mfd/wm8350-core.c | 4 + drivers/mfd/wm8350-i2c.c | 2 + drivers/net/can/Kconfig | 10 + drivers/net/can/Makefile | 1 + drivers/net/can/janz-ican3.c | 1830 +++++++++++++++++++++++++++++++ drivers/regulator/tps6507x-regulator.c | 373 +++---- drivers/watchdog/rdc321x_wdt.c | 53 +- include/linux/input/tps6507x-ts.h | 24 + include/linux/mfd/88pm860x.h | 4 +- include/linux/mfd/janz.h | 54 + include/linux/mfd/rdc321x.h | 26 + include/linux/mfd/tps6507x.h | 169 +++ include/linux/mfd/wm831x/core.h | 5 +- 40 files changed, 4162 insertions(+), 292 deletions(-) delete mode 100644 arch/x86/include/asm/rdc321x_defs.h create mode 100644 drivers/gpio/janz-ttl.c create mode 100644 drivers/gpio/rdc321x-gpio.c create mode 100644 drivers/input/touchscreen/tps6507x-ts.c create mode 100644 drivers/mfd/janz-cmodio.c create mode 100644 drivers/mfd/rdc321x-southbridge.c create mode 100644 drivers/mfd/tps6507x.c create mode 100644 drivers/net/can/janz-ican3.c create mode 100644 include/linux/input/tps6507x-ts.h create mode 100644 include/linux/mfd/janz.h create mode 100644 include/linux/mfd/rdc321x.h create mode 100644 include/linux/mfd/tps6507x.h Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Resolved 'drivers/gpu/drm/i915/i915_drv.h' using previous resolution. Resolved 'drivers/gpu/drm/radeon/r300.c' using previous resolution. Auto-merging drivers/gpu/drm/i915/i915_dma.c Auto-merging drivers/gpu/drm/i915/i915_drv.c Auto-merging drivers/gpu/drm/i915/i915_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/i915_gem.c Auto-merging drivers/gpu/drm/i915/i915_irq.c Auto-merging drivers/gpu/drm/i915/i915_reg.h Auto-merging drivers/gpu/drm/i915/intel_display.c Auto-merging drivers/gpu/drm/radeon/r300.c CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/r300.c Auto-merging drivers/gpu/drm/radeon/r420.c Auto-merging drivers/gpu/drm/radeon/radeon_display.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 44cab77] Merge remote branch 'drm/drm-next' $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/Makefile | 2 +- Documentation/DocBook/drm.tmpl | 839 +++++++++++++ arch/x86/include/asm/cacheflush.h | 2 + arch/x86/mm/pageattr.c | 53 +- drivers/char/agp/agp.h | 80 -- drivers/char/agp/ali-agp.c | 1 + drivers/char/agp/amd-k7-agp.c | 9 + drivers/char/agp/amd64-agp.c | 1 + drivers/char/agp/ati-agp.c | 8 + drivers/char/agp/efficeon-agp.c | 1 + drivers/char/agp/intel-agp.c | 1883 ++-------------------------- drivers/char/agp/intel-agp.h | 239 ++++ drivers/char/agp/intel-gtt.c | 1516 ++++++++++++++++++++++ drivers/char/agp/nvidia-agp.c | 1 + drivers/char/agp/sis-agp.c | 1 + drivers/char/agp/uninorth-agp.c | 16 +- drivers/char/agp/via-agp.c | 2 + drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/drm_crtc.c | 9 +- drivers/gpu/drm/drm_crtc_helper.c | 395 +------ drivers/gpu/drm/drm_edid.c | 789 ++++++++---- drivers/gpu/drm/drm_fb_helper.c | 913 ++++++++++---- drivers/gpu/drm/drm_gem.c | 49 +- drivers/gpu/drm/drm_modes.c | 105 +- drivers/gpu/drm/drm_sysfs.c | 2 +- drivers/gpu/drm/i915/dvo.h | 10 - drivers/gpu/drm/i915/dvo_ch7017.c | 46 +- drivers/gpu/drm/i915/dvo_ch7xxx.c | 44 +- drivers/gpu/drm/i915/dvo_ivch.c | 21 - drivers/gpu/drm/i915/dvo_sil164.c | 38 - drivers/gpu/drm/i915/dvo_tfp410.c | 32 - drivers/gpu/drm/i915/i915_debugfs.c | 15 +- drivers/gpu/drm/i915/i915_dma.c | 6 +- drivers/gpu/drm/i915/i915_drv.c | 29 + drivers/gpu/drm/i915/i915_drv.h | 28 +- drivers/gpu/drm/i915/i915_gem.c | 80 +- drivers/gpu/drm/i915/i915_gem_debug.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 22 +- drivers/gpu/drm/i915/i915_reg.h | 138 ++ drivers/gpu/drm/i915/i915_suspend.c | 41 +- drivers/gpu/drm/i915/i915_trace.h | 86 +- drivers/gpu/drm/i915/intel_crt.c | 88 +- drivers/gpu/drm/i915/intel_display.c | 986 +++++++++++----- drivers/gpu/drm/i915/intel_dp.c | 254 +++-- drivers/gpu/drm/i915/intel_drv.h | 31 +- drivers/gpu/drm/i915/intel_dvo.c | 103 +- drivers/gpu/drm/i915/intel_fb.c | 204 ++-- drivers/gpu/drm/i915/intel_hdmi.c | 70 +- drivers/gpu/drm/i915/intel_lvds.c | 111 +-- drivers/gpu/drm/i915/intel_modes.c | 21 +- drivers/gpu/drm/i915/intel_overlay.c | 8 +- drivers/gpu/drm/i915/intel_sdvo.c | 933 +++++++------- drivers/gpu/drm/i915/intel_tv.c | 185 +--- drivers/gpu/drm/nouveau/nouveau_bo.c | 114 ++- drivers/gpu/drm/nouveau/nouveau_debugfs.c | 3 + drivers/gpu/drm/nouveau/nouveau_display.c | 41 +- drivers/gpu/drm/nouveau/nouveau_drv.c | 19 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 3 + drivers/gpu/drm/nouveau/nouveau_fb.h | 6 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 198 ++- drivers/gpu/drm/nouveau/nouveau_fbcon.h | 19 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 5 +- drivers/gpu/drm/nouveau/nouveau_irq.c | 10 +- drivers/gpu/drm/nouveau/nouveau_state.c | 5 +- drivers/gpu/drm/nouveau/nv04_fbcon.c | 16 +- drivers/gpu/drm/nouveau/nv50_display.c | 3 + drivers/gpu/drm/nouveau/nv50_fbcon.c | 16 +- drivers/gpu/drm/radeon/atombios.h | 76 ++- drivers/gpu/drm/radeon/atombios_crtc.c | 8 +- drivers/gpu/drm/radeon/evergreen.c | 1494 +++++++++++++++++++++- drivers/gpu/drm/radeon/evergreend.h | 556 ++++++++ drivers/gpu/drm/radeon/r100.c | 253 +++-- drivers/gpu/drm/radeon/r100d.h | 128 ++ drivers/gpu/drm/radeon/r300.c | 156 ++-- drivers/gpu/drm/radeon/r300d.h | 47 +- drivers/gpu/drm/radeon/r420.c | 4 +- drivers/gpu/drm/radeon/r520.c | 5 +- drivers/gpu/drm/radeon/r600.c | 159 ++- drivers/gpu/drm/radeon/r600_blit_kms.c | 3 + drivers/gpu/drm/radeon/radeon.h | 111 ++- drivers/gpu/drm/radeon/radeon_asic.c | 56 +- drivers/gpu/drm/radeon/radeon_asic.h | 26 +- drivers/gpu/drm/radeon/radeon_atombios.c | 44 +- drivers/gpu/drm/radeon/radeon_combios.c | 8 +- drivers/gpu/drm/radeon/radeon_connectors.c | 50 +- drivers/gpu/drm/radeon/radeon_cs.c | 4 - drivers/gpu/drm/radeon/radeon_device.c | 33 +- drivers/gpu/drm/radeon/radeon_display.c | 42 +- drivers/gpu/drm/radeon/radeon_fb.c | 352 +++--- drivers/gpu/drm/radeon/radeon_fence.c | 107 +- drivers/gpu/drm/radeon/radeon_gart.c | 2 +- drivers/gpu/drm/radeon/radeon_gem.c | 6 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 + drivers/gpu/drm/radeon/radeon_mode.h | 23 +- drivers/gpu/drm/radeon/radeon_object.c | 32 +- drivers/gpu/drm/radeon/radeon_object.h | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 116 ++- drivers/gpu/drm/radeon/rs400.c | 6 +- drivers/gpu/drm/radeon/rs600.c | 77 ++- drivers/gpu/drm/radeon/rs600d.h | 46 + drivers/gpu/drm/radeon/rs690.c | 6 +- drivers/gpu/drm/radeon/rv515.c | 96 +-- drivers/gpu/drm/radeon/rv515d.h | 46 + drivers/gpu/drm/radeon/rv770.c | 21 +- drivers/gpu/drm/ttm/Makefile | 2 +- drivers/gpu/drm/ttm/ttm_bo.c | 84 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 122 +- drivers/gpu/drm/ttm/ttm_bo_vm.c | 41 +- drivers/gpu/drm/ttm/ttm_memory.c | 7 +- drivers/gpu/drm/ttm/ttm_page_alloc.c | 845 +++++++++++++ drivers/gpu/drm/ttm/ttm_tt.c | 44 +- drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 50 +- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 6 - drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +- include/drm/drmP.h | 3 + include/drm/drm_crtc.h | 24 +- include/drm/drm_crtc_helper.h | 6 +- include/drm/drm_edid.h | 3 - include/drm/drm_fb_helper.h | 76 +- include/drm/ttm/ttm_bo_api.h | 29 +- include/drm/ttm/ttm_bo_driver.h | 57 +- include/drm/ttm/ttm_page_alloc.h | 74 ++ 124 files changed, 10933 insertions(+), 5760 deletions(-) create mode 100644 Documentation/DocBook/drm.tmpl create mode 100644 drivers/char/agp/intel-agp.h create mode 100644 drivers/char/agp/intel-gtt.c create mode 100644 drivers/gpu/drm/radeon/evergreend.h create mode 100644 drivers/gpu/drm/ttm/ttm_page_alloc.c create mode 100644 include/drm/ttm/ttm_page_alloc.h Merging viafb/viafb-next $ git merge viafb/viafb-next Auto-merging drivers/video/via/viafbdev.c Merge made by recursive. drivers/video/via/accel.c | 111 ++++++++++++++++---------- drivers/video/via/accel.h | 40 ++++++++++ drivers/video/via/chip.h | 8 ++ drivers/video/via/dvi.c | 35 ++++----- drivers/video/via/hw.c | 78 +++++++++++++------ drivers/video/via/hw.h | 4 +- drivers/video/via/ioctl.h | 2 +- drivers/video/via/lcd.c | 28 ++++--- drivers/video/via/lcd.h | 2 + drivers/video/via/share.h | 7 ++ drivers/video/via/via_i2c.c | 178 ++++++++++++++++++++++++++--------------- drivers/video/via/via_i2c.h | 44 +++++++---- drivers/video/via/viafbdev.c | 60 +++++++++++---- drivers/video/via/viafbdev.h | 4 +- drivers/video/via/viamode.c | 14 ++++ drivers/video/via/vt1636.c | 36 ++++----- drivers/video/via/vt1636.h | 2 +- 17 files changed, 440 insertions(+), 213 deletions(-) Merging voltage/for-next $ git merge voltage/for-next Merge made by recursive. drivers/regulator/core.c | 73 +++++++++++++++++++++---------------- include/linux/regulator/machine.h | 9 ++++- 2 files changed, 48 insertions(+), 34 deletions(-) Merging security-testing/next $ git merge security-testing/next Auto-merging Documentation/kernel-parameters.txt Auto-merging drivers/char/tpm/tpm.c Auto-merging include/linux/security.h Auto-merging kernel/cred.c Auto-merging kernel/sys.c Auto-merging security/device_cgroup.c Auto-merging security/integrity/ima/ima_audit.c Auto-merging security/integrity/ima/ima_crypto.c Auto-merging security/integrity/ima/ima_fs.c Auto-merging security/integrity/ima/ima_iint.c Auto-merging security/integrity/ima/ima_init.c Auto-merging security/integrity/ima/ima_main.c Auto-merging security/integrity/ima/ima_policy.c Auto-merging security/integrity/ima/ima_queue.c Auto-merging security/keys/keyring.c Auto-merging security/keys/proc.c Auto-merging security/lsm_audit.c Auto-merging security/selinux/netlabel.c Auto-merging security/selinux/netlink.c Auto-merging security/smack/smack_lsm.c Auto-merging security/tomoyo/common.c Merge made by recursive. Documentation/credentials.txt | 14 +- Documentation/kernel-parameters.txt | 10 ++ drivers/char/tpm/tpm.c | 47 +++++- fs/inode.c | 2 - fs/namespace.c | 13 -- include/linux/lsm_audit.h | 2 +- include/linux/security.h | 180 ---------------------- kernel/acct.c | 20 +-- kernel/cred.c | 2 - kernel/groups.c | 6 - kernel/sys.c | 31 ---- scripts/selinux/genheaders/genheaders.c | 2 +- security/capability.c | 74 --------- security/commoncap.c | 6 +- security/device_cgroup.c | 2 +- security/integrity/ima/ima.h | 2 +- security/integrity/ima/ima_audit.c | 2 +- security/integrity/ima/ima_crypto.c | 4 +- security/integrity/ima/ima_fs.c | 38 +++-- security/integrity/ima/ima_iint.c | 6 +- security/integrity/ima/ima_init.c | 2 +- security/integrity/ima/ima_main.c | 2 +- security/integrity/ima/ima_policy.c | 107 ++++++++++---- security/integrity/ima/ima_queue.c | 4 +- security/keys/key.c | 2 +- security/keys/keyctl.c | 65 ++++----- security/keys/keyring.c | 33 ++-- security/keys/permission.c | 2 +- security/keys/proc.c | 2 +- security/lsm_audit.c | 2 +- security/min_addr.c | 2 +- security/security.c | 71 +--------- security/selinux/avc.c | 3 +- security/selinux/hooks.c | 66 ++++---- security/selinux/include/initial_sid_to_string.h | 2 +- security/selinux/include/netlabel.h | 8 +- security/selinux/netlabel.c | 14 +- security/selinux/netlink.c | 1 - security/selinux/nlmsgtab.c | 1 - security/selinux/selinuxfs.c | 44 +++--- security/selinux/ss/mls.c | 2 +- security/selinux/ss/policydb.c | 6 +- security/selinux/ss/services.c | 49 ++++--- security/smack/smack_lsm.c | 11 -- security/tomoyo/common.c | 10 +- 45 files changed, 330 insertions(+), 644 deletions(-) Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging agp/agp-next $ git merge agp/agp-next Auto-merging drivers/char/agp/backend.c Auto-merging drivers/char/agp/hp-agp.c Merge made by recursive. Merging uwb/for-upstream $ git merge uwb/for-upstream Merge made by recursive. drivers/uwb/i1480/i1480u-wlp/lc.c | 16 ++++++------ drivers/uwb/wlp/messages.c | 40 ++++++++++++++++---------------- drivers/uwb/wlp/sysfs.c | 46 ++++++++++++++++++------------------ drivers/uwb/wlp/wlp-lc.c | 12 +++++----- include/linux/wlp.h | 2 +- 5 files changed, 58 insertions(+), 58 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 Auto-merging drivers/pci/dmar.c Auto-merging drivers/pci/intr_remapping.c Merge made by recursive. drivers/pci/dmar.c | 18 +++++++--- drivers/pci/intel-iommu.c | 80 +++++++++++++++++++----------------------- drivers/pci/intr_remapping.c | 6 ++-- include/linux/pci.h | 10 +++++ 4 files changed, 62 insertions(+), 52 deletions(-) Merging cputime/cputime $ git merge cputime/cputime Already up-to-date. Merging osd/linux-next $ git merge osd/linux-next Merge made by recursive. fs/exofs/inode.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) 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 Auto-merging Documentation/DocBook/libata.tmpl Auto-merging Documentation/cgroups/cgroups.txt Auto-merging Documentation/kprobes.txt Auto-merging MAINTAINERS Auto-merging arch/um/drivers/line.c Auto-merging drivers/acpi/osl.c Auto-merging drivers/firewire/ohci.c Auto-merging drivers/gpu/drm/i915/intel_display.c Auto-merging drivers/gpu/drm/radeon/atombios.h Auto-merging drivers/macintosh/windfarm_pm81.c Auto-merging drivers/net/ps3_gelic_wireless.c Auto-merging drivers/net/smsc911x.c Auto-merging drivers/pci/pci.c Auto-merging drivers/regulator/core.c Auto-merging include/linux/i2c/twl.h Auto-merging mm/memcontrol.c Auto-merging net/ipv4/ipmr.c Auto-merging scripts/kconfig/util.c Auto-merging scripts/package/mkspec Merge made by recursive. Documentation/ABI/testing/sysfs-devices-memory | 2 +- Documentation/DMA-API-HOWTO.txt | 2 +- Documentation/DocBook/libata.tmpl | 2 +- Documentation/PCI/pci-error-recovery.txt | 4 +- Documentation/Smack.txt | 2 +- Documentation/arm/SA1100/ADSBitsy | 2 +- Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen | 2 +- Documentation/atomic_ops.txt | 2 +- Documentation/blackfin/bfin-gpio-notes.txt | 2 +- Documentation/cachetlb.txt | 6 ++-- Documentation/cgroups/cgroups.txt | 2 +- Documentation/cgroups/cpusets.txt | 38 ++++++++++---------- Documentation/cgroups/memcg_test.txt | 2 +- Documentation/cgroups/memory.txt | 2 +- Documentation/connector/connector.txt | 2 +- Documentation/dvb/ci.txt | 2 +- Documentation/dvb/contributors.txt | 2 +- .../filesystems/autofs4-mount-control.txt | 2 +- Documentation/filesystems/ceph.txt | 2 +- Documentation/filesystems/dlmfs.txt | 2 +- Documentation/filesystems/fiemap.txt | 12 +++--- Documentation/filesystems/fuse.txt | 4 +- Documentation/filesystems/hpfs.txt | 2 +- Documentation/filesystems/nfs/rpc-cache.txt | 2 +- Documentation/filesystems/proc.txt | 6 ++-- Documentation/filesystems/smbfs.txt | 2 +- Documentation/filesystems/vfs.txt | 2 +- Documentation/hwmon/lm85 | 2 +- Documentation/input/joystick.txt | 2 +- Documentation/intel_txt.txt | 2 +- Documentation/kbuild/kconfig.txt | 2 +- Documentation/kernel-docs.txt | 10 +++--- Documentation/kprobes.txt | 2 +- Documentation/laptops/laptop-mode.txt | 2 +- Documentation/lguest/lguest.c | 2 +- Documentation/md.txt | 2 +- Documentation/netlabel/lsm_interface.txt | 2 +- Documentation/networking/ifenslave.c | 2 +- Documentation/networking/packet_mmap.txt | 4 +- Documentation/power/regulator/consumer.txt | 10 +++--- Documentation/power/regulator/machine.txt | 2 +- Documentation/power/regulator/overview.txt | 6 ++-- Documentation/powerpc/booting-without-of.txt | 2 +- Documentation/powerpc/dts-bindings/xilinx.txt | 2 +- Documentation/powerpc/phyp-assisted-dump.txt | 2 +- Documentation/rt-mutex-design.txt | 2 +- Documentation/scsi/ChangeLog.lpfc | 4 +- Documentation/scsi/FlashPoint.txt | 2 +- Documentation/scsi/dtc3x80.txt | 2 +- Documentation/scsi/ncr53c8xx.txt | 2 +- Documentation/scsi/osst.txt | 2 +- Documentation/scsi/scsi_fc_transport.txt | 4 +- Documentation/scsi/sym53c8xx_2.txt | 2 +- Documentation/sound/alsa/soc/dapm.txt | 4 +- Documentation/sound/alsa/soc/machine.txt | 2 +- Documentation/sound/alsa/soc/overview.txt | 2 +- Documentation/sparse.txt | 4 +- Documentation/sysfs-rules.txt | 2 +- Documentation/trace/events.txt | 8 ++-- Documentation/usb/WUSB-Design-overview.txt | 2 +- Documentation/vm/numa_memory_policy.txt | 4 +- Documentation/w1/w1.generic | 2 +- MAINTAINERS | 8 +--- arch/mips/sibyte/bcm1480/irq.c | 2 +- arch/mips/sibyte/sb1250/irq.c | 2 +- arch/powerpc/platforms/embedded6xx/wii.c | 4 +- arch/um/drivers/line.c | 1 - arch/um/include/asm/system.h | 3 -- arch/um/sys-i386/asm/elf.h | 2 + arch/um/sys-x86_64/asm/elf.h | 2 + arch/um/sys-x86_64/signal.c | 3 +- arch/x86/include/asm/percpu.h | 2 +- crypto/Kconfig | 2 +- drivers/acpi/osl.c | 4 +- drivers/acpi/power.c | 1 - drivers/ata/ata_piix.c | 2 +- drivers/char/bsr.c | 2 +- drivers/firewire/ohci.c | 2 +- drivers/gpu/drm/drm_bufs.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 4 +- drivers/gpu/drm/radeon/atombios.h | 4 +- drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 +- drivers/infiniband/hw/ipath/ipath_iba6120.c | 4 +- drivers/infiniband/hw/ipath/ipath_iba7220.c | 2 +- drivers/isdn/hardware/mISDN/hfcmulti.c | 2 +- drivers/isdn/hisax/hfc4s8s_l1.c | 2 +- drivers/macintosh/windfarm_pm81.c | 2 +- drivers/media/dvb/dvb-usb/friio-fe.c | 2 +- drivers/message/i2o/i2o_config.c | 16 +++----- drivers/net/bnx2x_hsi.h | 2 +- drivers/net/ps3_gelic_wireless.c | 2 +- drivers/net/smsc911x.c | 4 +- drivers/pci/hotplug/cpqphp_core.c | 2 +- drivers/pci/pci.c | 2 +- drivers/ps3/ps3-sys-manager.c | 2 +- drivers/regulator/core.c | 2 +- drivers/rtc/rtc-rx8581.c | 6 ++-- drivers/rtc/rtc-stk17ta8.c | 4 +- drivers/s390/char/sclp_cpi_sys.c | 2 +- drivers/scsi/bfa/include/defs/bfa_defs_cee.h | 2 +- drivers/scsi/bfa/include/defs/bfa_defs_status.h | 4 +- drivers/spi/spi_mpc8xxx.c | 2 +- drivers/staging/vt6655/rxtx.c | 14 ++++---- drivers/staging/vt6656/rxtx.c | 6 ++-- drivers/usb/wusbcore/wa-xfer.c | 2 +- drivers/video/cobalt_lcdfb.c | 2 +- drivers/virtio/virtio_pci.c | 2 +- fs/jfs/jfs_dmap.c | 2 +- fs/omfs/inode.c | 1 - include/linux/i2c/twl.h | 8 ++-- include/linux/kfifo.h | 4 +- include/linux/kobj_map.h | 9 +++++ include/linux/kref.h | 2 +- kernel/cgroup.c | 2 +- mm/memcontrol.c | 2 +- mm/page_alloc.c | 2 +- net/ipv4/ipmr.c | 2 +- net/wimax/op-rfkill.c | 2 +- scripts/kconfig/util.c | 2 +- scripts/package/mkspec | 2 +- sound/pci/emu10k1/emu10k1_main.c | 2 +- sound/pci/hda/hda_local.h | 2 +- 122 files changed, 204 insertions(+), 206 deletions(-) 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 Auto-merging include/linux/fs.h Merge made by recursive. Documentation/power/devices.txt | 847 ++++++++++++++++++------------- Documentation/power/userland-swsusp.txt | 4 + drivers/base/power/runtime.c | 10 +- drivers/base/power/sysfs.c | 65 +++- fs/libfs.c | 35 ++ include/linux/fs.h | 2 + include/linux/pm_wakeup.h | 38 +- kernel/power/Makefile | 3 +- kernel/power/block_io.c | 103 ++++ kernel/power/power.h | 27 +- kernel/power/snapshot.c | 145 ++---- kernel/power/swap.c | 333 +++++------- kernel/power/user.c | 37 +- 13 files changed, 952 insertions(+), 697 deletions(-) create mode 100644 kernel/power/block_io.c Merging bluetooth/master $ git merge bluetooth/master Already up-to-date. Merging fsnotify/for-next $ git merge fsnotify/for-next Auto-merging Documentation/feature-removal-schedule.txt Auto-merging fs/inode.c Auto-merging fs/namei.c Auto-merging fs/namespace.c Auto-merging fs/nfsd/vfs.c Auto-merging fs/notify/inotify/Kconfig Removing fs/notify/inotify/inotify.c Auto-merging include/linux/Kbuild Auto-merging include/linux/fs.h Auto-merging include/linux/security.h Auto-merging init/Kconfig Auto-merging kernel/Makefile Auto-merging kernel/sysctl.c Auto-merging security/security.c Merge made by recursive. 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 | 16 +- 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 | 233 ++++--- kernel/audit_watch.c | 295 +++++---- kernel/auditfilter.c | 39 +- kernel/auditsc.c | 10 +- kernel/sys_ni.c | 4 + kernel/sysctl.c | 7 +- security/security.c | 16 +- 57 files changed, 3098 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 $ git am -3 ../patches/fsnotify__update_gfp_slab.h_includes Applying: fsnotify: update gfp/slab.h includes $ git reset HEAD^ Unstaged changes after reset: M fs/notify/fanotify/fanotify_user.c M fs/notify/vfsmount_mark.c $ git add . $ git commit -v -a --amend [master 0d58d88] Merge remote branch 'fsnotify/for-next' 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 5539c09] 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 drbd/for-jens $ git merge drbd/for-jens Merge made by recursive. drivers/block/drbd/drbd_worker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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 a073d05] 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 $ git am -3 ../patches/0001-vbus-use-of-kzalloc-kfree-requires-the-include-of-sl.patch Applying: vbus: use of kzalloc/kfree requires the include of slab.h $ git reset HEAD^ Unstaged changes after reset: M drivers/vbus/bus-proxy.c $ git add . $ git commit -v -a --amend [master d7ee0fa] Merge remote branch 'alacrity/linux-next' $ git am -3 ../patches/vbus__update_gfp_slab.h_includes Applying: vbus: update gfp/slab.h includes $ git reset HEAD^ Unstaged changes after reset: M drivers/vbus/pci-bridge.c $ git add . $ git commit -v -a --amend [master 45c866b] Merge remote branch 'alacrity/linux-next' 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 Auto-merging arch/powerpc/kernel/vio.c Auto-merging drivers/i2c/i2c-core.c Auto-merging drivers/of/of_mdio.c Auto-merging include/linux/device.h Auto-merging include/linux/i2c.h Merge made by recursive. arch/microblaze/kernel/of_device.c | 1 + arch/powerpc/kernel/ibmebus.c | 5 ++++- arch/powerpc/kernel/of_device.c | 1 + arch/powerpc/kernel/pci-common.c | 3 ++- arch/powerpc/kernel/vio.c | 3 ++- arch/powerpc/platforms/ps3/system-bus.c | 1 + arch/sparc/kernel/of_device_32.c | 1 + arch/sparc/kernel/of_device_64.c | 1 + arch/sparc/kernel/pci.c | 1 + drivers/i2c/i2c-core.c | 3 +++ drivers/macintosh/macio_asic.c | 5 ++--- drivers/of/fdt.c | 15 +++++++++++++++ drivers/of/of_i2c.c | 1 + drivers/of/of_mdio.c | 1 + drivers/of/of_spi.c | 1 + drivers/of/platform.c | 7 ++++--- include/linux/device.h | 8 ++++++++ include/linux/i2c.h | 4 ++++ include/linux/of_device.h | 2 ++ include/linux/of_fdt.h | 4 ++++ include/linux/of_platform.h | 2 ++ 21 files changed, 61 insertions(+), 9 deletions(-) Merging spi/next-spi $ git merge spi/next-spi Already up-to-date. Merging omap_dss2/for-next $ git merge omap_dss2/for-next Merge made by recursive. arch/arm/configs/am3517_evm_defconfig | 52 +++++++- arch/arm/configs/omap3_evm_defconfig | 51 +++++++- drivers/video/omap2/displays/Kconfig | 2 +- .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 78 +++++++++++ drivers/video/omap2/displays/panel-taal.c | 143 ++++++++++++++++--- drivers/video/omap2/dss/Kconfig | 6 + drivers/video/omap2/dss/Makefile | 3 +- drivers/video/omap2/dss/core.c | 4 + drivers/video/omap2/dss/display.c | 9 +- drivers/video/omap2/dss/manager.c | 20 +++ drivers/video/omap2/dss/sdi.c | 26 ++-- drivers/video/omap2/dss/venc.c | 15 +-- drivers/video/omap2/omapfb/omapfb-ioctl.c | 5 +- drivers/video/omap2/omapfb/omapfb-sysfs.c | 25 +++-- 14 files changed, 375 insertions(+), 64 deletions(-) Merging tip/auto-latest $ git merge tip/auto-latest Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. Auto-merging Documentation/feature-removal-schedule.txt CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Auto-merging Documentation/filesystems/proc.txt Auto-merging Documentation/intel_txt.txt Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS Auto-merging arch/x86/Kconfig Auto-merging arch/x86/include/asm/cacheflush.h Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c Auto-merging arch/x86/kernel/traps.c Auto-merging drivers/char/sysrq.c Auto-merging drivers/cpufreq/cpufreq.c Auto-merging drivers/cpufreq/cpufreq_ondemand.c Auto-merging include/linux/cpufreq.h Auto-merging include/linux/ftrace_event.h Auto-merging include/trace/ftrace.h Auto-merging init/Kconfig Auto-merging kernel/Makefile Removing kernel/cred-internals.h Auto-merging kernel/cred.c Auto-merging kernel/module.c Auto-merging kernel/sched.c Auto-merging kernel/sysctl.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e8312fc] Merge remote branch 'tip/auto-latest' $ git diff -M --stat --summary HEAD^.. Documentation/feature-removal-schedule.txt | 17 + Documentation/filesystems/proc.txt | 4 + Documentation/intel_txt.txt | 16 +- Documentation/kernel-parameters.txt | 6 +- Documentation/rbtree.txt | 58 ++ Documentation/scheduler/sched-design-CFS.txt | 54 +- Documentation/scheduler/sched-rt-group.txt | 20 +- Documentation/trace/ftrace.txt | 6 +- MAINTAINERS | 11 + arch/alpha/Kconfig | 3 + arch/alpha/kernel/time.c | 101 +-- arch/avr32/kernel/time.c | 12 +- arch/blackfin/kernel/time-ts.c | 13 +- arch/blackfin/kernel/time.c | 39 +- arch/cris/Kconfig | 3 + arch/cris/arch-v10/kernel/time.c | 37 +- arch/cris/arch-v32/kernel/time.c | 40 +- arch/cris/kernel/time.c | 20 +- arch/frv/kernel/time.c | 34 +- arch/h8300/kernel/time.c | 10 +- arch/ia64/kernel/time.c | 12 +- arch/m32r/kernel/time.c | 47 +- arch/m68k/kernel/time.c | 11 +- arch/mips/include/asm/i8253.h | 2 +- arch/mips/kernel/i8253.c | 14 +- arch/mn10300/Kconfig | 3 + arch/mn10300/kernel/rtc.c | 27 +- arch/mn10300/kernel/time.c | 4 - arch/sparc/Kconfig | 2 +- arch/sparc/kernel/time_32.c | 18 +- arch/x86/Kconfig | 1 + arch/x86/include/asm/cacheflush.h | 44 +- arch/x86/include/asm/cpufeature.h | 1 + arch/x86/include/asm/e820.h | 7 +- arch/x86/include/asm/i8253.h | 2 +- arch/x86/include/asm/nmi.h | 2 + arch/x86/include/asm/uv/uv_bau.h | 247 ++++-- arch/x86/include/asm/uv/uv_hub.h | 2 +- arch/x86/include/asm/uv/uv_mmrs.h | 528 ++--------- arch/x86/kernel/apic/Makefile | 7 +- arch/x86/kernel/apic/hw_nmi.c | 127 +++ arch/x86/kernel/apic/nmi.c | 7 - arch/x86/kernel/apic/x2apic_uv_x.c | 3 - arch/x86/kernel/apm_32.c | 4 +- arch/x86/kernel/cpu/addon_cpuid_features.c | 13 +- arch/x86/kernel/cpu/cpufreq/Makefile | 4 +- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 44 +- arch/x86/kernel/cpu/cpufreq/mperf.c | 51 + arch/x86/kernel/cpu/cpufreq/mperf.h | 9 + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 172 ++++- arch/x86/kernel/cpu/cpufreq/powernow-k8.h | 2 - arch/x86/kernel/cpu/intel.c | 6 - arch/x86/kernel/i8253.c | 14 +- arch/x86/kernel/microcode_core.c | 4 +- arch/x86/kernel/microcode_intel.c | 22 +- arch/x86/kernel/tboot.c | 20 +- arch/x86/kernel/tlb_uv.c | 1280 ++++++++++++++++++-------- arch/x86/kernel/traps.c | 7 + arch/x86/kernel/uv_irq.c | 12 +- arch/x86/mm/Makefile | 1 + arch/x86/mm/pat.c | 239 +----- arch/x86/mm/pat_internal.h | 46 + arch/x86/mm/pat_rbtree.c | 273 ++++++ arch/x86/xen/time.c | 6 +- arch/xtensa/kernel/time.c | 5 - drivers/block/hd.c | 4 +- drivers/char/sysrq.c | 2 +- drivers/clocksource/cs5535-clockevt.c | 8 +- drivers/cpufreq/cpufreq.c | 40 +- drivers/cpufreq/cpufreq_conservative.c | 48 +- drivers/cpufreq/cpufreq_ondemand.c | 40 +- drivers/input/gameport/gameport.c | 4 +- drivers/input/joystick/analog.c | 4 +- drivers/input/misc/pcspkr.c | 6 +- drivers/oprofile/cpu_buffer.c | 63 +- drivers/oprofile/oprof.c | 12 +- drivers/oprofile/oprof.h | 3 +- drivers/oprofile/timer_int.c | 78 ++- include/linux/cpufreq.h | 30 + include/linux/cpuset.h | 16 +- include/linux/ftrace.h | 4 +- include/linux/ftrace_event.h | 1 + include/linux/hrtimer.h | 2 + include/linux/interrupt.h | 26 +- include/linux/kernel.h | 11 +- include/linux/module.h | 6 +- include/linux/nmi.h | 13 + include/linux/rbtree.h | 5 +- include/linux/ring_buffer.h | 6 +- include/linux/sched.h | 70 +- include/linux/time.h | 1 - include/linux/timer.h | 10 +- include/linux/timex.h | 5 - include/trace/events/module.h | 18 +- include/trace/events/signal.h | 52 +- include/trace/ftrace.h | 33 +- init/Kconfig | 8 +- ipc/mqueue.c | 74 +- kernel/Makefile | 1 + kernel/capability.c | 1 - kernel/cpu.c | 18 +- kernel/cpuset.c | 67 +- kernel/cred-internals.h | 21 - kernel/cred.c | 3 - kernel/exit.c | 1 - kernel/hrtimer.c | 67 +- kernel/irq/handle.c | 3 - kernel/irq/manage.c | 67 +- kernel/irq/proc.c | 23 + kernel/lockdep.c | 47 +- kernel/lockdep_internals.h | 74 ++- kernel/lockdep_proc.c | 58 +- kernel/module.c | 8 +- kernel/nmi_watchdog.c | 259 ++++++ kernel/posix-cpu-timers.c | 218 ++--- kernel/sched.c | 442 ++++----- kernel/sched_debug.c | 108 +-- kernel/sched_fair.c | 302 +++---- kernel/sched_features.h | 55 -- kernel/sched_idletask.c | 8 +- kernel/sched_rt.c | 15 +- kernel/sysctl.c | 15 +- kernel/time.c | 11 +- kernel/time/ntp.c | 2 +- kernel/time/tick-sched.c | 3 + kernel/time/timekeeping.c | 35 +- kernel/timer.c | 137 ++- kernel/trace/ring_buffer.c | 101 ++- kernel/trace/ring_buffer_benchmark.c | 2 +- kernel/trace/trace.c | 81 ++- kernel/trace/trace_functions_graph.c | 5 +- kernel/trace/trace_selftest.c | 7 +- kernel/user.c | 12 +- lib/Kconfig.debug | 12 + lib/debugobjects.c | 4 +- lib/rbtree.c | 48 +- sound/drivers/pcsp/pcsp.h | 2 +- sound/drivers/pcsp/pcsp_input.c | 4 +- sound/drivers/pcsp/pcsp_lib.c | 12 +- tools/perf/Documentation/perf-kvm.txt | 9 +- tools/perf/Documentation/perf-probe.txt | 3 + tools/perf/Makefile | 36 +- tools/perf/arch/powerpc/Makefile | 4 + tools/perf/arch/powerpc/util/dwarf-regs.c | 88 ++ tools/perf/arch/x86/Makefile | 4 + tools/perf/arch/x86/util/dwarf-regs.c | 75 ++ tools/perf/builtin-kmem.c | 6 +- tools/perf/builtin-lock.c | 595 +++++++----- tools/perf/builtin-probe.c | 9 +- tools/perf/builtin-sched.c | 8 +- tools/perf/builtin-timechart.c | 112 +--- tools/perf/builtin-trace.c | 13 + tools/perf/util/include/dwarf-regs.h | 8 + tools/perf/util/parse-events.c | 13 +- tools/perf/util/probe-event.c | 34 +- tools/perf/util/probe-event.h | 4 +- tools/perf/util/probe-finder.c | 70 +-- tools/perf/util/probe-finder.h | 6 +- tools/perf/util/session.c | 179 ++++- tools/perf/util/session.h | 10 + tools/perf/util/symbol.c | 1 + 161 files changed, 4755 insertions(+), 3450 deletions(-) create mode 100644 arch/x86/kernel/apic/hw_nmi.c create mode 100644 arch/x86/kernel/cpu/cpufreq/mperf.c create mode 100644 arch/x86/kernel/cpu/cpufreq/mperf.h create mode 100644 arch/x86/mm/pat_internal.h create mode 100644 arch/x86/mm/pat_rbtree.c delete mode 100644 kernel/cred-internals.h create mode 100644 kernel/nmi_watchdog.c create mode 100644 tools/perf/arch/powerpc/Makefile create mode 100644 tools/perf/arch/powerpc/util/dwarf-regs.c create mode 100644 tools/perf/arch/x86/Makefile create mode 100644 tools/perf/arch/x86/util/dwarf-regs.c create mode 100644 tools/perf/util/include/dwarf-regs.h $ git am -3 ../patches/lockdep__Fix_redundant_hardirqs_on_incremented_with_irqs_enabled Applying: lockdep: Fix redundant_hardirqs_on incremented with irqs enabled $ git reset HEAD^ Unstaged changes after reset: M kernel/lockdep.c $ git add . $ git commit -v -a --amend [master 50bf59a] Merge remote branch 'tip/auto-latest' Merging edac-amd/for-next $ git merge edac-amd/for-next Already up-to-date. Merging oprofile/for-next $ git merge oprofile/for-next Merge made by recursive. drivers/oprofile/cpu_buffer.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) Merging percpu/for-next $ git merge percpu/for-next Merge made by recursive. mm/percpu-km.c | 104 ++++++++++ mm/percpu-vm.c | 451 +++++++++++++++++++++++++++++++++++++++++++ mm/percpu.c | 585 +++++++++++--------------------------------------------- 3 files changed, 667 insertions(+), 473 deletions(-) create mode 100644 mm/percpu-km.c create mode 100644 mm/percpu-vm.c Merging workqueues/for-next $ git merge workqueues/for-next Merge made by recursive. kernel/workqueue.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 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 bkl-core/bkl/core $ git merge bkl-core/bkl/core Auto-merging kernel/ptrace.c Merge made by recursive. kernel/ptrace.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) Merging bkl-procfs/bkl/procfs $ git merge bkl-procfs/bkl/procfs Auto-merging drivers/isdn/divert/divert_procfs.c Auto-merging fs/proc/base.c Auto-merging fs/proc/inode.c Auto-merging fs/proc/kcore.c Auto-merging fs/proc/vmcore.c Auto-merging net/sunrpc/cache.c Merge made by recursive. drivers/char/i8k.c | 53 +++++++++++++++------ drivers/isdn/divert/divert_procfs.c | 90 ++++++++++++++++++++++------------- fs/proc/base.c | 10 ++++- fs/proc/inode.c | 4 +- fs/proc/kcore.c | 1 + fs/proc/kmsg.c | 1 + fs/proc/vmcore.c | 1 + net/sunrpc/cache.c | 18 +++++-- 8 files changed, 122 insertions(+), 56 deletions(-) Merging bkl-ioctl/bkl/ioctl $ git merge bkl-ioctl/bkl/ioctl Resolved 'arch/cris/arch-v10/drivers/ds1302.c' using previous resolution. Resolved 'drivers/block/pktcdvd.c' using previous resolution. Auto-merging arch/cris/arch-v10/drivers/ds1302.c CONFLICT (content): Merge conflict in arch/cris/arch-v10/drivers/ds1302.c Auto-merging drivers/block/pktcdvd.c CONFLICT (content): Merge conflict in drivers/block/pktcdvd.c Auto-merging drivers/media/dvb/dvb-core/dvb_net.c Auto-merging drivers/mtd/mtdchar.c Auto-merging drivers/pcmcia/pcmcia_ioctl.c Auto-merging drivers/scsi/3w-9xxx.c Auto-merging drivers/scsi/3w-xxxx.c Auto-merging drivers/scsi/dpt_i2o.c Auto-merging drivers/scsi/gdth.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 779bd69] Merge remote branch 'bkl-ioctl/bkl/ioctl' $ git diff -M --stat --summary HEAD^.. arch/ia64/sn/kernel/sn2/sn_hwperf.c | 9 +---- arch/um/drivers/mmapper_kern.c | 5 +-- drivers/char/apm-emulation.c | 8 +++-- drivers/char/applicom.c | 13 +++++--- drivers/char/ds1620.c | 16 ++++++++- drivers/char/dtlk.c | 15 +++++---- drivers/char/generic_nvram.c | 17 ++++++++-- drivers/char/genrtc.c | 16 ++++++++- drivers/char/hpet.c | 14 +++++--- drivers/char/ipmi/ipmi_devintf.c | 26 +++++++++++++--- drivers/char/ipmi/ipmi_watchdog.c | 17 +++++++++- drivers/char/nvram.c | 10 ++++-- drivers/char/nwflash.c | 7 +++- drivers/char/raw.c | 42 ++++++++++++++----------- drivers/hwmon/fschmd.c | 9 +++-- drivers/hwmon/w83793.c | 10 ++++-- drivers/input/misc/hp_sdc_rtc.c | 34 ++++++++++++++------ drivers/isdn/capi/capi.c | 17 ++++++++-- drivers/isdn/i4l/isdn_common.c | 18 +++++++++-- drivers/isdn/mISDN/timerdev.c | 10 ++++-- drivers/macintosh/nvram.c | 2 +- drivers/macintosh/via-pmu.c | 17 ++++++++-- drivers/media/dvb/dvb-core/dmxdev.c | 31 +++++++++++++----- drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 17 +++++++--- drivers/media/dvb/dvb-core/dvb_frontend.c | 30 +++++++++--------- drivers/media/dvb/dvb-core/dvb_net.c | 15 +++++++-- drivers/media/dvb/dvb-core/dvbdev.c | 17 +++++++---- drivers/media/dvb/dvb-core/dvbdev.h | 11 ++---- drivers/media/dvb/firewire/firedtv-ci.c | 5 +-- drivers/media/dvb/ttpci/av7110.c | 4 +- drivers/media/dvb/ttpci/av7110_av.c | 8 ++-- drivers/media/dvb/ttpci/av7110_ca.c | 5 +-- drivers/mtd/mtdchar.c | 19 ++++++++--- drivers/pcmcia/pcmcia_ioctl.c | 17 ++++++++-- drivers/rtc/rtc-m41t80.c | 16 ++++++++- drivers/sbus/char/openprom.c | 44 +++++++++++++++----------- drivers/scsi/3w-9xxx.c | 10 ++++-- drivers/scsi/3w-sas.c | 8 ++++- drivers/scsi/3w-xxxx.c | 11 +++++-- drivers/scsi/aacraid/linit.c | 11 +++++-- drivers/scsi/dpt_i2o.c | 20 ++++++++++-- drivers/scsi/gdth.c | 20 +++++++++--- drivers/scsi/megaraid.c | 20 ++++++++++-- drivers/scsi/megaraid.h | 3 +- drivers/scsi/megaraid/megaraid_mm.c | 22 ++++++++++--- drivers/scsi/osst.c | 14 ++++++-- drivers/scsi/sg.c | 17 ++++++++-- drivers/usb/mon/mon_bin.c | 23 ++++++++++---- drivers/usb/mon/mon_stat.c | 3 +- fs/coda/psdev.c | 5 +-- fs/hfsplus/dir.c | 2 +- fs/hfsplus/hfsplus_fs.h | 3 +- fs/hfsplus/inode.c | 2 +- fs/hfsplus/ioctl.c | 12 +++++-- fs/smbfs/dir.c | 2 +- fs/smbfs/file.c | 2 +- fs/smbfs/ioctl.c | 10 ++++-- fs/smbfs/proto.h | 2 +- 58 files changed, 547 insertions(+), 246 deletions(-) Merging quilt/driver-core $ git merge quilt/driver-core Resolved 'drivers/base/platform.c' using previous resolution. Resolved 'drivers/staging/comedi/drivers/quatech_daqp_cs.c' using previous resolution. Auto-merging drivers/base/platform.c CONFLICT (content): Merge conflict in drivers/base/platform.c Auto-merging drivers/md/bitmap.c Auto-merging drivers/md/md.c Auto-merging drivers/staging/comedi/drivers/quatech_daqp_cs.c CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/quatech_daqp_cs.c Auto-merging include/linux/device.h Auto-merging include/linux/kref.h Auto-merging kernel/lockdep.c Auto-merging security/integrity/ima/ima_iint.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 9181887] Merge branch 'quilt/driver-core' $ git diff -M --stat --summary HEAD^.. drivers/base/Kconfig | 7 +- drivers/base/class.c | 9 + drivers/base/core.c | 128 +++++++++++++---- drivers/base/dd.c | 4 +- drivers/base/devtmpfs.c | 5 + drivers/base/firmware_class.c | 171 +++++++++++---------- drivers/base/module.c | 4 +- drivers/base/platform.c | 8 +- drivers/gpio/gpiolib.c | 2 +- drivers/md/bitmap.c | 4 +- drivers/md/md.c | 6 +- drivers/net/mlx4/mlx4.h | 1 + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1 + drivers/usb/core/usb.c | 2 +- fs/ramfs/inode.c | 2 +- fs/sysfs/bin.c | 2 +- fs/sysfs/dir.c | 106 +++++++++++--- fs/sysfs/file.c | 17 ++- fs/sysfs/group.c | 6 +- fs/sysfs/inode.c | 6 +- fs/sysfs/mount.c | 90 +++++++++++- fs/sysfs/symlink.c | 35 ++++- fs/sysfs/sysfs.h | 23 +++- include/linux/device.h | 12 +- include/linux/kobject.h | 26 ++++ include/linux/kref.h | 1 - include/linux/lockdep.h | 8 + include/linux/ramfs.h | 2 + include/linux/sysfs.h | 18 +++ kernel/lockdep.c | 5 + kernel/user_namespace.c | 4 +- lib/kobject.c | 104 +++++++++++++ lib/kref.c | 15 +-- scripts/checkpatch.pl | 11 ++ security/integrity/ima/ima_iint.c | 4 +- 35 files changed, 650 insertions(+), 199 deletions(-) $ git am -3 ../patches/0001-md-fixup-for-sysfs_get_dirent-API-change.patch Applying: md: fixup for sysfs_get_dirent API change $ git reset HEAD^ Unstaged changes after reset: M drivers/md/md.c $ git add . $ git commit -v -a --amend [master 21a556e] Merge branch 'quilt/driver-core' Merging quilt/tty $ git merge quilt/tty Resolved 'include/linux/tty.h' using previous resolution. Auto-merging include/linux/tty.h CONFLICT (content): Merge conflict in include/linux/tty.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 05e0b33] Merge branch 'quilt/tty' $ git diff -M --stat --summary HEAD^.. drivers/char/Kconfig | 10 +- drivers/char/Makefile | 1 + drivers/char/n_gsm.c | 2763 ++++++++++++++++++++++++++++++++++++++ drivers/serial/Kconfig | 30 +- drivers/serial/bfin_sport_uart.c | 206 ++- drivers/serial/bfin_sport_uart.h | 27 +- drivers/serial/uartlite.c | 32 +- include/linux/gsmmux.h | 25 + include/linux/tty.h | 3 +- 9 files changed, 3010 insertions(+), 87 deletions(-) create mode 100644 drivers/char/n_gsm.c create mode 100644 include/linux/gsmmux.h Merging quilt/usb $ git merge quilt/usb Resolved 'drivers/input/tablet/acecad.c' using previous resolution. Resolved 'drivers/input/tablet/kbtab.c' using previous resolution. Resolved 'drivers/input/tablet/wacom_sys.c' using previous resolution. Renaming sound/usb/ua101.c => sound/usb/misc/ua101.c Auto-merging sound/usb/misc/ua101.c Renaming sound/usb/usbmidi.c => sound/usb/midi.c Auto-merging sound/usb/midi.c Auto-merging drivers/hid/usbhid/hid-core.c Auto-merging drivers/hid/usbhid/usbkbd.c Auto-merging drivers/input/tablet/acecad.c CONFLICT (content): Merge conflict in drivers/input/tablet/acecad.c Auto-merging drivers/input/tablet/kbtab.c CONFLICT (content): Merge conflict in drivers/input/tablet/kbtab.c Auto-merging drivers/input/tablet/wacom_sys.c CONFLICT (content): Merge conflict in drivers/input/tablet/wacom_sys.c Auto-merging drivers/media/video/au0828/au0828-video.c Auto-merging drivers/media/video/cx231xx/cx231xx-core.c Auto-merging drivers/media/video/em28xx/em28xx-core.c Auto-merging drivers/media/video/gspca/gspca.c Auto-merging drivers/media/video/tlg2300/pd-main.c Auto-merging drivers/media/video/tlg2300/pd-video.c Auto-merging drivers/net/wireless/ath/ar9170/usb.c Auto-merging drivers/usb/mon/mon_bin.c Auto-merging drivers/usb/wusbcore/wa-xfer.c CONFLICT (delete/modify): sound/usb/usbaudio.c deleted in HEAD and modified in quilt/usb. Version quilt/usb of sound/usb/usbaudio.c left in tree. Automatic merge failed; fix conflicts and then commit the result. $ git rm -f sound/usb/usbaudio.c drivers/input/tablet/acecad.c: needs merge drivers/input/tablet/kbtab.c: needs merge drivers/input/tablet/wacom_sys.c: needs merge sound/usb/usbaudio.c: needs merge rm 'sound/usb/usbaudio.c' $ git commit -v -a [master f7b0239] Merge branch 'quilt/usb' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/obsolete/sysfs-bus-usb | 31 + Documentation/ABI/testing/sysfs-bus-usb | 28 - .../testing/sysfs-devices-platform-_UDC_-gadget | 9 + Documentation/DocBook/writing_usb_driver.tmpl | 2 +- Documentation/usb/bulk-streams.txt | 78 ++ Documentation/usb/dma.txt | 4 +- Documentation/usb/gadget_hid.txt | 445 ++++++++ Documentation/usb/power-management.txt | 19 +- Documentation/usb/usb-serial.txt | 29 +- arch/arm/mach-omap2/board-omap3evm.c | 3 + arch/arm/mach-omap2/usb-musb.c | 1 + arch/arm/plat-omap/include/plat/usb.h | 1 + drivers/hid/usbhid/hid-core.c | 20 +- drivers/hid/usbhid/usbhid.h | 1 - drivers/hid/usbhid/usbkbd.c | 16 +- drivers/hid/usbhid/usbmouse.c | 6 +- drivers/input/joystick/xpad.c | 16 +- drivers/input/misc/ati_remote.c | 12 +- drivers/input/misc/ati_remote2.c | 4 +- drivers/input/misc/cm109.c | 28 +- drivers/input/misc/keyspan_remote.c | 6 +- drivers/input/misc/powermate.c | 17 +- drivers/input/misc/yealink.c | 25 +- drivers/input/mouse/appletouch.c | 12 +- drivers/input/mouse/bcm5974.c | 24 +- drivers/input/tablet/acecad.c | 6 +- drivers/input/tablet/aiptek.c | 14 +- drivers/input/tablet/gtco.c | 12 +- drivers/input/tablet/kbtab.c | 6 +- drivers/input/tablet/wacom_sys.c | 8 +- drivers/input/touchscreen/usbtouchscreen.c | 8 +- drivers/media/dvb/dvb-usb/usb-urb.c | 7 +- drivers/media/dvb/ttusb-dec/ttusb_dec.c | 6 +- drivers/media/video/au0828/au0828-video.c | 4 +- drivers/media/video/cx231xx/cx231xx-core.c | 14 +- drivers/media/video/em28xx/em28xx-core.c | 4 +- drivers/media/video/gspca/benq.c | 4 +- drivers/media/video/gspca/gspca.c | 30 +- drivers/media/video/hdpvr/hdpvr-video.c | 8 +- drivers/media/video/tlg2300/pd-main.c | 2 +- drivers/media/video/tlg2300/pd-video.c | 14 +- drivers/media/video/usbvision/usbvision-core.c | 16 +- drivers/media/video/uvc/uvc_video.c | 4 +- drivers/net/can/usb/ems_usb.c | 18 +- drivers/net/usb/ipheth.c | 24 +- drivers/net/usb/kaweth.c | 12 +- drivers/net/wimax/i2400m/usb.c | 2 +- drivers/net/wireless/ath/ar9170/usb.c | 8 +- drivers/net/wireless/zd1211rw/zd_usb.c | 10 +- drivers/staging/rt2860/iface/rtmp_usb.h | 4 +- drivers/staging/udlfb/udlfb.c | 8 +- drivers/staging/usbip/stub_rx.c | 2 +- drivers/staging/usbip/vhci.h | 2 +- drivers/usb/atm/ueagle-atm.c | 347 ++++--- drivers/usb/c67x00/c67x00-hcd.h | 2 +- drivers/usb/class/cdc-acm.c | 22 +- drivers/usb/class/cdc-acm.h | 4 +- drivers/usb/class/cdc-wdm.c | 38 +- drivers/usb/class/usblp.c | 2 +- drivers/usb/core/buffer.c | 2 +- drivers/usb/core/config.c | 29 +- drivers/usb/core/devices.c | 19 +- drivers/usb/core/devio.c | 3 +- drivers/usb/core/driver.c | 43 +- drivers/usb/core/generic.c | 2 +- drivers/usb/core/hcd-pci.c | 2 +- drivers/usb/core/hcd.c | 242 +++-- drivers/usb/core/hub.c | 14 +- drivers/usb/core/inode.c | 2 +- drivers/usb/core/message.c | 47 +- drivers/usb/core/quirks.c | 4 + drivers/usb/core/sysfs.c | 22 +- drivers/usb/core/urb.c | 15 +- drivers/usb/core/usb.c | 24 +- drivers/usb/gadget/Kconfig | 11 + drivers/usb/gadget/Makefile | 2 + drivers/usb/gadget/composite.c | 23 +- drivers/usb/gadget/dummy_hcd.c | 4 +- drivers/usb/gadget/f_hid.c | 673 ++++++++++++ drivers/usb/gadget/f_mass_storage.c | 99 ++- drivers/usb/gadget/hid.c | 298 +++++ drivers/usb/gadget/pxa27x_udc.h | 2 +- drivers/usb/host/ehci-au1xxx.c | 11 +- drivers/usb/host/ehci-hcd.c | 3 +- drivers/usb/host/ehci-hub.c | 24 +- drivers/usb/host/ehci-pci.c | 3 + drivers/usb/host/ehci.h | 8 +- drivers/usb/host/fhci-dbg.c | 2 +- drivers/usb/host/fhci-hcd.c | 2 +- drivers/usb/host/fhci-hub.c | 2 +- drivers/usb/host/fhci-mem.c | 2 +- drivers/usb/host/fhci-q.c | 2 +- drivers/usb/host/fhci-sched.c | 2 +- drivers/usb/host/fhci-tds.c | 2 +- drivers/usb/host/fhci.h | 2 +- drivers/usb/host/imx21-hcd.c | 2 +- drivers/usb/host/isp116x-hcd.c | 2 +- drivers/usb/host/isp1362-hcd.c | 6 +- drivers/usb/host/isp1760-hcd.c | 22 +- drivers/usb/host/isp1760-if.c | 2 +- drivers/usb/host/ohci-hcd.c | 2 +- drivers/usb/host/oxu210hp-hcd.c | 31 +- drivers/usb/host/r8a66597-hcd.c | 39 +- drivers/usb/host/sl811-hcd.c | 60 +- drivers/usb/host/u132-hcd.c | 2 +- drivers/usb/host/uhci-hcd.c | 2 +- drivers/usb/host/whci/qset.c | 2 +- drivers/usb/host/xhci-dbg.c | 24 + drivers/usb/host/xhci-hub.c | 24 +- drivers/usb/host/xhci-mem.c | 467 ++++++++- drivers/usb/host/xhci-pci.c | 6 +- drivers/usb/host/xhci-ring.c | 217 +++- drivers/usb/host/xhci.c | 418 +++++++- drivers/usb/host/xhci.h | 112 ++- drivers/usb/misc/appledisplay.c | 6 +- drivers/usb/misc/ftdi-elan.c | 20 +- drivers/usb/misc/iowarrior.c | 12 +- drivers/usb/misc/sisusbvga/sisusb.c | 13 +- drivers/usb/misc/usblcd.c | 8 +- drivers/usb/misc/usbtest.c | 17 +- drivers/usb/mon/mon_bin.c | 2 +- drivers/usb/mon/mon_main.c | 3 +- drivers/usb/mon/mon_text.c | 4 +- drivers/usb/musb/Kconfig | 6 +- drivers/usb/musb/Makefile | 14 +- drivers/usb/musb/blackfin.c | 96 ++- drivers/usb/musb/davinci.c | 2 +- drivers/usb/musb/musb_core.c | 147 ++- drivers/usb/musb/musb_core.h | 10 +- drivers/usb/musb/musb_debug.h | 13 + drivers/usb/musb/musb_debugfs.c | 295 +++++ drivers/usb/musb/musb_gadget_ep0.c | 25 + drivers/usb/musb/musb_regs.h | 10 + drivers/usb/musb/musb_virthub.c | 4 +- drivers/usb/musb/musbhsdma.h | 16 +- drivers/usb/musb/omap2430.c | 29 +- drivers/usb/musb/tusb6010.c | 2 +- drivers/usb/otg/isp1301_omap.c | 2 +- drivers/usb/otg/twl4030-usb.c | 108 +-- drivers/usb/otg/ulpi.c | 50 +- drivers/usb/serial/Kconfig | 23 + drivers/usb/serial/Makefile | 2 + drivers/usb/serial/ark3116.c | 7 +- drivers/usb/serial/belkin_sa.c | 4 +- drivers/usb/serial/ch341.c | 5 +- drivers/usb/serial/console.c | 27 +- drivers/usb/serial/cp210x.c | 23 +- drivers/usb/serial/ftdi_sio.c | 162 +--- drivers/usb/serial/generic.c | 318 +++--- drivers/usb/serial/ipaq.c | 28 +- drivers/usb/serial/iuu_phoenix.c | 30 +- drivers/usb/serial/mct_u232.c | 7 +- drivers/usb/serial/mos7720.c | 1130 ++++++++++++++------ drivers/usb/serial/mos7840.c | 1 - drivers/usb/serial/option.c | 661 +----------- drivers/usb/serial/pl2303.c | 425 +------- drivers/usb/serial/qcserial.c | 64 +- drivers/usb/serial/usb-serial.c | 14 +- drivers/usb/serial/usb-wwan.h | 67 ++ drivers/usb/serial/usb_debug.c | 4 +- drivers/usb/serial/usb_wwan.c | 665 ++++++++++++ drivers/usb/serial/zio.c | 64 ++ drivers/usb/storage/isd200.c | 4 +- drivers/usb/storage/onetouch.c | 12 +- drivers/usb/storage/transport.c | 2 - drivers/usb/storage/unusual_devs.h | 9 - drivers/usb/storage/usb.c | 17 +- drivers/usb/storage/usb.h | 3 +- drivers/usb/usb-skeleton.c | 10 +- drivers/usb/wusbcore/wa-xfer.c | 2 - drivers/usb/wusbcore/wusbhc.h | 4 +- drivers/watchdog/pcwd_usb.c | 6 +- include/linux/usb.h | 38 +- include/linux/usb/cdc.h | 94 ++ drivers/usb/core/hub.h => include/linux/usb/ch11.h | 54 +- include/linux/usb/ch9.h | 2 + include/linux/usb/composite.h | 1 + include/linux/usb/g_hid.h | 32 + include/linux/usb/gadget.h | 4 + {drivers/usb/core => include/linux/usb}/hcd.h | 47 +- include/linux/usb/musb.h | 36 + include/linux/usb/ncm.h | 114 ++ include/linux/usb/quirks.h | 4 + include/linux/usb/serial.h | 26 +- include/linux/usb/ulpi.h | 140 +++ sound/usb/midi.c | 14 +- sound/usb/misc/ua101.c | 16 +- 187 files changed, 6853 insertions(+), 3079 deletions(-) create mode 100644 Documentation/ABI/obsolete/sysfs-bus-usb create mode 100644 Documentation/ABI/testing/sysfs-devices-platform-_UDC_-gadget create mode 100644 Documentation/usb/bulk-streams.txt create mode 100644 Documentation/usb/gadget_hid.txt create mode 100644 drivers/usb/gadget/f_hid.c create mode 100644 drivers/usb/gadget/hid.c create mode 100644 drivers/usb/musb/musb_debugfs.c create mode 100644 drivers/usb/serial/usb-wwan.h create mode 100644 drivers/usb/serial/usb_wwan.c create mode 100644 drivers/usb/serial/zio.c rename drivers/usb/core/hub.h => include/linux/usb/ch11.h (75%) create mode 100644 include/linux/usb/g_hid.h rename {drivers/usb/core => include/linux/usb}/hcd.h (92%) create mode 100644 include/linux/usb/ncm.h $ git am -3 ../patches/usb__update_gfp_slab.h_includes Applying: usb: update gfp/slab.h includes $ git reset HEAD^ Unstaged changes after reset: M drivers/usb/musb/musb_debugfs.c $ git add . $ git commit -v -a --amend [master 0cd4170] Merge branch 'quilt/usb' $ git am -3 ../patches/0001-sound-fixup-for-usb_buffer_alloc-free-rename.patch Applying: sound: fixup for usb_buffer_alloc/free rename $ git reset HEAD^ Unstaged changes after reset: M sound/usb/urb.c $ git add . $ git commit -v -a --amend [master 5382319] Merge branch 'quilt/usb' Merging staging-next/staging-next $ git merge staging-next/staging-next Resolved 'drivers/staging/arlan/arlan-main.c' using previous resolution. Resolved 'drivers/staging/comedi/drivers/cb_das16_cs.c' using previous resolution. Resolved 'drivers/staging/cx25821/cx25821-alsa.c' using previous resolution. Resolved 'drivers/staging/dt3155/dt3155_drv.c' using previous resolution. Resolved 'drivers/staging/netwave/netwave_cs.c' using previous resolution. Auto-merging drivers/staging/Kconfig Auto-merging drivers/staging/Makefile Auto-merging drivers/staging/arlan/arlan-main.c CONFLICT (content): Merge conflict in drivers/staging/arlan/arlan-main.c Removing drivers/staging/comedi/comedi_ksyms.c Auto-merging drivers/staging/comedi/drivers/cb_das16_cs.c CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/cb_das16_cs.c Auto-merging drivers/staging/comedi/drivers/ni_daq_700.c Removing drivers/staging/comedi/kcomedilib/data.c Removing drivers/staging/comedi/kcomedilib/dio.c Removing drivers/staging/comedi/kcomedilib/get.c Removing drivers/staging/comedi/kcomedilib/ksyms.c Removing drivers/staging/comedi/pci_ids.h Removing drivers/staging/comedi/wrapper.h Auto-merging drivers/staging/cx25821/cx25821-alsa.c CONFLICT (content): Merge conflict in drivers/staging/cx25821/cx25821-alsa.c Auto-merging drivers/staging/cx25821/cx25821-core.c Auto-merging drivers/staging/dt3155/dt3155_drv.c CONFLICT (content): Merge conflict in drivers/staging/dt3155/dt3155_drv.c Auto-merging drivers/staging/et131x/et131x_netdev.c Auto-merging drivers/staging/hv/Hv.c Auto-merging drivers/staging/hv/netvsc_drv.c Auto-merging drivers/staging/iio/industrialio-core.c Auto-merging drivers/staging/iio/ring_sw.c Auto-merging drivers/staging/netwave/netwave_cs.c CONFLICT (content): Merge conflict in drivers/staging/netwave/netwave_cs.c Removing drivers/staging/poch/Kconfig Removing drivers/staging/poch/Makefile Removing drivers/staging/poch/README Removing drivers/staging/poch/poch.c Removing drivers/staging/poch/poch.h Auto-merging drivers/staging/rt2860/usb_main_dev.c Removing drivers/staging/rtl8192su/r8180_93cx6.c Removing drivers/staging/rtl8192su/r8180_93cx6.h Auto-merging drivers/staging/rtl8192su/r8192U_core.c Auto-merging drivers/staging/udlfb/udlfb.c Auto-merging drivers/staging/vme/bridges/vme_tsi148.c Auto-merging drivers/staging/vt6655/device_main.c Auto-merging drivers/staging/vt6656/main_usb.c Auto-merging drivers/staging/vt6656/rxtx.c Auto-merging drivers/staging/wavelan/wavelan.c Auto-merging drivers/staging/winbond/wbusb.c Auto-merging drivers/staging/wlags49_h2/wl_netdev.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 9e1bd9a] Merge remote branch 'staging-next/staging-next' $ git diff -M --stat --summary HEAD^.. drivers/staging/Kconfig | 10 +- drivers/staging/Makefile | 5 +- drivers/staging/adis16255/Kconfig | 9 + drivers/staging/adis16255/Makefile | 1 + drivers/staging/adis16255/TODO | 8 + drivers/staging/adis16255/adis16255.c | 396 ++ drivers/staging/adis16255/adis16255.h | 12 + drivers/staging/arlan/arlan-main.c | 936 ++--- drivers/staging/arlan/arlan-proc.c | 623 ++-- drivers/staging/arlan/arlan.h | 40 +- drivers/staging/asus_oled/asus_oled.c | 2 +- drivers/staging/batman-adv/proc.c | 51 +- drivers/staging/batman-adv/send.c | 3 +- drivers/staging/batman-adv/vis.c | 235 +- drivers/staging/batman-adv/vis.h | 8 +- drivers/staging/comedi/Makefile | 1 - drivers/staging/comedi/comedi.h | 69 +- drivers/staging/comedi/comedi_compat32.c | 3 +- drivers/staging/comedi/comedi_fops.c | 204 +- drivers/staging/comedi/comedi_fops.h | 1 + drivers/staging/comedi/comedi_ksyms.c | 69 - drivers/staging/comedi/comedidev.h | 32 +- drivers/staging/comedi/comedilib.h | 170 +- drivers/staging/comedi/drivers.c | 104 +- drivers/staging/comedi/drivers/8253.h | 3 +- drivers/staging/comedi/drivers/Makefile | 1 + drivers/staging/comedi/drivers/adl_pci6208.c | 10 +- drivers/staging/comedi/drivers/adl_pci7230.c | 206 + drivers/staging/comedi/drivers/adl_pci9111.c | 30 +- drivers/staging/comedi/drivers/adl_pci9118.c | 854 +++-- drivers/staging/comedi/drivers/adv_pci1710.c | 24 +- drivers/staging/comedi/drivers/adv_pci1723.c | 153 +- drivers/staging/comedi/drivers/adv_pci_dio.c | 36 +- drivers/staging/comedi/drivers/aio_aio12_8.c | 4 +- drivers/staging/comedi/drivers/amplc_dio200.c | 2 +- drivers/staging/comedi/drivers/amplc_pci224.c | 116 +- drivers/staging/comedi/drivers/amplc_pci230.c | 132 +- drivers/staging/comedi/drivers/cb_das16_cs.c | 12 +- drivers/staging/comedi/drivers/cb_pcidas64.c | 42 +- drivers/staging/comedi/drivers/cb_pcimdas.c | 2 + drivers/staging/comedi/drivers/cb_pcimdda.c | 3 +- drivers/staging/comedi/drivers/comedi_bond.c | 13 +- drivers/staging/comedi/drivers/comedi_parport.c | 10 +- drivers/staging/comedi/drivers/das08.c | 156 +- drivers/staging/comedi/drivers/das16.c | 159 +- drivers/staging/comedi/drivers/das1800.c | 6 +- drivers/staging/comedi/drivers/dt2801.c | 2 +- drivers/staging/comedi/drivers/dt2811.c | 191 +- drivers/staging/comedi/drivers/dt2814.c | 38 +- drivers/staging/comedi/drivers/dt282x.c | 225 +- drivers/staging/comedi/drivers/dt3000.c | 21 +- drivers/staging/comedi/drivers/me_daq.c | 1 + drivers/staging/comedi/drivers/mite.c | 2 +- drivers/staging/comedi/drivers/mite.h | 2 - drivers/staging/comedi/drivers/mpc624.c | 185 +- drivers/staging/comedi/drivers/ni_6527.c | 7 +- drivers/staging/comedi/drivers/ni_65xx.c | 47 +- drivers/staging/comedi/drivers/ni_660x.c | 11 +- drivers/staging/comedi/drivers/ni_670x.c | 11 +- drivers/staging/comedi/drivers/ni_at_ao.c | 6 +- drivers/staging/comedi/drivers/ni_daq_700.c | 7 +- drivers/staging/comedi/drivers/ni_labpc.c | 7 +- drivers/staging/comedi/drivers/ni_pcidio.c | 25 +- drivers/staging/comedi/drivers/ni_pcimio.c | 107 +- drivers/staging/comedi/drivers/skel.c | 21 +- drivers/staging/comedi/drivers/ssv_dnp.c | 86 +- drivers/staging/comedi/drivers/usbduxfast.c | 44 +- drivers/staging/comedi/internal.h | 12 + drivers/staging/comedi/kcomedilib/Makefile | 7 +- drivers/staging/comedi/kcomedilib/data.c | 92 - drivers/staging/comedi/kcomedilib/dio.c | 95 - drivers/staging/comedi/kcomedilib/get.c | 293 -- .../staging/comedi/kcomedilib/kcomedilib_main.c | 523 +--- drivers/staging/comedi/kcomedilib/ksyms.c | 146 - drivers/staging/comedi/pci_ids.h | 31 - drivers/staging/comedi/proc.c | 23 +- drivers/staging/comedi/range.c | 36 +- drivers/staging/comedi/wrapper.h | 25 - drivers/staging/crystalhd/TODO | 1 - drivers/staging/crystalhd/bc_dts_defs.h | 4 +- drivers/staging/crystalhd/bc_dts_glob_lnx.h | 2 +- drivers/staging/crystalhd/bc_dts_types.h | 25 +- drivers/staging/crystalhd/bcm_70012_regs.h | 24 +- drivers/staging/crystalhd/crystalhd_cmds.c | 20 +- drivers/staging/crystalhd/crystalhd_cmds.h | 2 +- drivers/staging/crystalhd/crystalhd_hw.c | 29 +- drivers/staging/crystalhd/crystalhd_lnx.c | 42 +- drivers/staging/crystalhd/crystalhd_lnx.h | 4 +- drivers/staging/crystalhd/crystalhd_misc.c | 18 +- drivers/staging/crystalhd/crystalhd_misc.h | 1 - drivers/staging/cx25821/cx25821-alsa.c | 2 +- drivers/staging/cxt1e1/Kconfig | 22 + drivers/staging/cxt1e1/Makefile | 19 + drivers/staging/cxt1e1/comet.c | 566 +++ drivers/staging/cxt1e1/comet.h | 366 ++ drivers/staging/cxt1e1/comet_tables.c | 561 +++ drivers/staging/cxt1e1/comet_tables.h | 85 + drivers/staging/cxt1e1/functions.c | 368 ++ drivers/staging/cxt1e1/hwprobe.c | 402 ++ drivers/staging/cxt1e1/libsbew.h | 581 +++ drivers/staging/cxt1e1/linux.c | 1354 +++++++ drivers/staging/cxt1e1/musycc.c | 2181 +++++++++++ drivers/staging/cxt1e1/musycc.h | 460 +++ drivers/staging/cxt1e1/ossiRelease.c | 39 + drivers/staging/cxt1e1/pmc93x6_eeprom.c | 559 +++ drivers/staging/cxt1e1/pmc93x6_eeprom.h | 60 + drivers/staging/cxt1e1/pmcc4.h | 155 + drivers/staging/cxt1e1/pmcc4_cpld.h | 124 + drivers/staging/cxt1e1/pmcc4_defs.h | 82 + drivers/staging/cxt1e1/pmcc4_drv.c | 1857 +++++++++ drivers/staging/cxt1e1/pmcc4_ioctls.h | 81 + drivers/staging/cxt1e1/pmcc4_private.h | 295 ++ drivers/staging/cxt1e1/pmcc4_sysdep.h | 62 + drivers/staging/cxt1e1/sbe_bid.h | 61 + drivers/staging/cxt1e1/sbe_promformat.h | 157 + drivers/staging/cxt1e1/sbecom_inline_linux.h | 310 ++ drivers/staging/cxt1e1/sbecrc.c | 137 + drivers/staging/cxt1e1/sbeid.c | 217 ++ drivers/staging/cxt1e1/sbeproc.c | 358 ++ drivers/staging/cxt1e1/sbeproc.h | 52 + drivers/staging/cxt1e1/sbew_ioc.h | 136 + drivers/staging/dream/Kconfig | 10 +- drivers/staging/dream/Makefile | 1 + drivers/staging/dream/TODO | 1 - drivers/staging/dream/pmem.c | 22 +- drivers/staging/dream/qdsp5/audio_out.c | 9 - drivers/staging/dream/smd/smd_private.h | 21 +- drivers/staging/dream/smd/smd_qmi.c | 22 +- drivers/staging/dream/smd/smd_rpcrouter_servers.c | 4 - drivers/staging/dream/synaptics_i2c_rmi.c | 28 +- drivers/staging/dt3155/allocator.c | 16 +- drivers/staging/dt3155/allocator.h | 4 +- drivers/staging/dt3155/dt3155.h | 44 +- drivers/staging/dt3155/dt3155_drv.c | 380 +- drivers/staging/dt3155/dt3155_io.c | 24 +- drivers/staging/dt3155/dt3155_isr.c | 297 +- drivers/staging/dt3155/dt3155_isr.h | 2 +- drivers/staging/dt3155v4l/Kconfig | 28 + drivers/staging/dt3155v4l/Makefile | 4 + drivers/staging/dt3155v4l/dt3155-bufs.c | 256 ++ drivers/staging/dt3155v4l/dt3155-bufs.h | 88 + drivers/staging/dt3155v4l/dt3155v4l.c | 1537 ++++++++ drivers/staging/dt3155v4l/dt3155v4l.h | 220 ++ drivers/staging/et131x/et1310_address_map.h | 7 +- drivers/staging/et131x/et1310_eeprom.c | 8 +- drivers/staging/et131x/et1310_phy.c | 2 +- drivers/staging/et131x/et1310_rx.c | 53 +- drivers/staging/et131x/et1310_rx.h | 5 +- drivers/staging/et131x/et131x_initpci.c | 12 +- drivers/staging/et131x/et131x_isr.c | 6 +- drivers/staging/et131x/et131x_netdev.c | 14 +- drivers/staging/frontier/alphatrack.c | 34 +- drivers/staging/frontier/tranzport.c | 36 +- drivers/staging/go7007/wis-saa7113.c | 1 + drivers/staging/go7007/wis-saa7115.c | 1 + drivers/staging/go7007/wis-tw9903.c | 1 + drivers/staging/hv/Channel.c | 49 +- drivers/staging/hv/ChannelMgmt.c | 33 +- drivers/staging/hv/Connection.c | 18 +- drivers/staging/hv/Hv.c | 18 +- drivers/staging/hv/NetVsc.c | 39 +- drivers/staging/hv/NetVsc.h | 1 + drivers/staging/hv/RingBuffer.c | 2 +- drivers/staging/hv/StorVsc.c | 14 +- drivers/staging/hv/TODO | 3 - drivers/staging/hv/VersionInfo.h | 4 +- drivers/staging/hv/Vmbus.c | 26 +- drivers/staging/hv/VmbusApi.h | 18 + drivers/staging/hv/blkvsc_drv.c | 16 +- drivers/staging/hv/netvsc_drv.c | 64 +- drivers/staging/hv/osd.c | 70 + drivers/staging/hv/rndis.h | 2 +- drivers/staging/hv/storvsc_drv.c | 18 +- drivers/staging/hv/vmbus_drv.c | 88 +- drivers/staging/hv/vstorage.h | 2 +- .../iio/Documentation/lis3l02dqbuffersimple.c | 3 +- drivers/staging/iio/Documentation/userspace.txt | 2 +- drivers/staging/iio/industrialio-core.c | 2 +- drivers/staging/iio/industrialio-ring.c | 2 + drivers/staging/iio/industrialio-trigger.c | 3 + drivers/staging/iio/ring_generic.h | 8 +- drivers/staging/iio/ring_sw.c | 21 +- drivers/staging/iio/trigger/iio-trig-gpio.c | 127 +- drivers/staging/line6/control.h | 166 +- drivers/staging/memrar/Kconfig | 15 + drivers/staging/memrar/Makefile | 2 + drivers/staging/memrar/TODO | 43 + drivers/staging/memrar/memrar-abi | 89 + drivers/staging/memrar/memrar.h | 155 + drivers/staging/memrar/memrar_allocator.c | 432 +++ drivers/staging/memrar/memrar_allocator.h | 149 + drivers/staging/memrar/memrar_handler.c | 937 +++++ drivers/staging/netwave/netwave_cs.c | 246 +- drivers/staging/otus/80211core/cagg.c | 34 +- drivers/staging/otus/80211core/ccmd.c | 3 +- drivers/staging/otus/80211core/cfunc.c | 3 +- drivers/staging/otus/80211core/cic.c | 9 +- drivers/staging/otus/80211core/cinit.c | 3 +- drivers/staging/otus/80211core/cmm.c | 144 +- drivers/staging/otus/80211core/cmmap.c | 103 +- drivers/staging/otus/80211core/cmmsta.c | 123 +- drivers/staging/otus/80211core/coid.c | 3 +- drivers/staging/otus/80211core/cpsmgr.c | 3 +- drivers/staging/otus/80211core/ctxrx.c | 81 +- drivers/staging/otus/80211core/queue.c | 5 +- drivers/staging/otus/80211core/ratectrl.c | 3 +- drivers/staging/otus/hal/hpani.c | 33 +- drivers/staging/otus/hal/hpani.h | 7 +- drivers/staging/otus/hal/hpfw2.c | 2 +- drivers/staging/otus/hal/hpfwu.c | 2 +- drivers/staging/otus/hal/hpfwu_2k.c | 2 +- drivers/staging/otus/hal/hpfwu_BA.c | 2 +- drivers/staging/otus/hal/hpfwu_OTUS_RC.c | 2 +- drivers/staging/otus/hal/hpfwuinit.c | 2 +- drivers/staging/otus/hal/hpmain.c | 30 +- drivers/staging/otus/hal/hpreg.c | 1586 ++++---- drivers/staging/otus/ioctl.c | 37 +- drivers/staging/otus/usbdrv.c | 6 +- drivers/staging/otus/wwrap.c | 1 - drivers/staging/otus/zdusb.c | 3 +- drivers/staging/phison/phison.c | 4 +- drivers/staging/poch/Kconfig | 6 - drivers/staging/poch/Makefile | 1 - drivers/staging/poch/README | 136 - drivers/staging/poch/poch.c | 1443 ------- drivers/staging/poch/poch.h | 35 - drivers/staging/pohmelfs/config.c | 22 +- drivers/staging/pohmelfs/crypto.c | 38 +- drivers/staging/pohmelfs/dir.c | 14 +- drivers/staging/pohmelfs/inode.c | 64 +- drivers/staging/pohmelfs/net.c | 38 +- drivers/staging/pohmelfs/netfs.h | 17 +- drivers/staging/quatech_usb2/quatech_usb2.c | 12 +- drivers/staging/rt2860/chip/mac_pci.h | 41 +- drivers/staging/rt2860/chip/mac_usb.h | 55 +- drivers/staging/rt2860/chip/rtmp_mac.h | 52 +- drivers/staging/rt2860/chip/rtmp_phy.h | 338 +- drivers/staging/rt2860/chips/rt3070.c | 4 +- drivers/staging/rt2860/chips/rt3090.c | 4 +- drivers/staging/rt2860/chips/rt30xx.c | 9 +- drivers/staging/rt2860/common/cmm_aes.c | 2 +- drivers/staging/rt2860/common/cmm_data.c | 6 +- drivers/staging/rt2860/common/cmm_wpa.c | 18 +- drivers/staging/rt2860/common/spectrum.c | 7 +- drivers/staging/rt2860/pci_main_dev.c | 37 +- drivers/staging/rt2860/rt_linux.c | 49 +- drivers/staging/rt2860/rt_linux.h | 14 +- drivers/staging/rt2860/rt_main_dev.c | 20 +- drivers/staging/rt2860/rt_pci_rbus.c | 24 +- drivers/staging/rt2860/rt_usb.c | 20 +- drivers/staging/rt2860/rtmp.h | 410 +-- drivers/staging/rt2860/sta/assoc.c | 1 - drivers/staging/rt2860/sta_ioctl.c | 15 +- drivers/staging/rt2860/usb_main_dev.c | 4 +- drivers/staging/rt2870/Kconfig | 2 +- drivers/staging/rt2870/common/rtusb_bulk.c | 42 +- drivers/staging/rt2870/common/rtusb_data.c | 8 +- drivers/staging/rt2870/common/rtusb_io.c | 39 +- drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 4 - .../rtl8187se/ieee80211/ieee80211_softmac.c | 9 +- .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 4 - drivers/staging/rtl8187se/r8180_core.c | 104 +- drivers/staging/rtl8187se/r8180_rtl8225z2.c | 129 +- drivers/staging/rtl8192e/Makefile | 1 + .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 3 +- drivers/staging/rtl8192e/r8192E_core.c | 10 +- drivers/staging/rtl8192e/r8192_pm.c | 6 +- drivers/staging/rtl8192e/r8192_pm.h | 4 - drivers/staging/rtl8192su/Kconfig | 1 + drivers/staging/rtl8192su/Makefile | 1 - .../rtl8192su/ieee80211/ieee80211_softmac.c | 3 +- drivers/staging/rtl8192su/r8180_93cx6.c | 146 - drivers/staging/rtl8192su/r8180_93cx6.h | 40 - drivers/staging/rtl8192su/r8192S_firmware.c | 236 +- drivers/staging/rtl8192su/r8192S_phy.c | 185 +- drivers/staging/rtl8192su/r8192U.h | 6 + drivers/staging/rtl8192su/r8192U_core.c | 459 ++-- drivers/staging/rtl8192su/r819xU_cmdpkt.c | 657 ++--- drivers/staging/rtl8192su/r819xU_cmdpkt.h | 366 +- drivers/staging/rtl8192u/dot11d.h | 52 +- drivers/staging/rtl8192u/ieee80211.h | 548 ++-- .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 3 +- drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 1 - drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 1 - drivers/staging/rtl8192u/ieee80211_crypt.h | 2 +- drivers/staging/rtl8192u/r819xU_cmdpkt.c | 1 - drivers/staging/sep/sep_driver.c | 1 - drivers/staging/serqt_usb2/serqt_usb2.c | 26 +- drivers/staging/sm7xx/smtcfb.c | 14 +- drivers/staging/sm7xx/smtcfb.h | 2 +- drivers/staging/ti-st/Kconfig | 24 + drivers/staging/ti-st/Makefile | 7 + drivers/staging/ti-st/TODO | 19 + drivers/staging/ti-st/bt_drv.c | 502 +++ drivers/staging/ti-st/bt_drv.h | 61 + drivers/staging/ti-st/fm.h | 13 + drivers/staging/ti-st/st.h | 90 + drivers/staging/ti-st/st_core.c | 1062 ++++++ drivers/staging/ti-st/st_core.h | 98 + drivers/staging/ti-st/st_kim.c | 754 ++++ drivers/staging/ti-st/st_kim.h | 150 + drivers/staging/ti-st/st_ll.c | 147 + drivers/staging/ti-st/st_ll.h | 62 + drivers/staging/ti-st/sysfs-uim | 16 + drivers/staging/udlfb/udlfb.c | 58 +- drivers/staging/usbip/usbip_common.h | 2 +- drivers/staging/usbip/vhci_hcd.c | 2 +- drivers/staging/usbip/vhci_tx.c | 2 +- drivers/staging/vme/boards/vme_vmivme7805.c | 1 - drivers/staging/vme/bridges/vme_ca91cx42.c | 104 +- drivers/staging/vme/bridges/vme_tsi148.c | 388 +- drivers/staging/vme/bridges/vme_tsi148.h | 26 +- drivers/staging/vme/devices/vme_user.c | 18 +- drivers/staging/vme/vme.c | 4 +- drivers/staging/vt6655/80211hdr.h | 46 +- drivers/staging/vt6655/desc.h | 6 +- drivers/staging/vt6655/device.h | 6 +- drivers/staging/vt6655/device_main.c | 11 +- drivers/staging/vt6655/hostap.c | 8 +- drivers/staging/vt6655/hostap.h | 4 +- drivers/staging/vt6655/ioctl.c | 6 +- drivers/staging/vt6655/iwctl.c | 5 +- drivers/staging/vt6655/srom.c | 50 +- drivers/staging/vt6656/80211hdr.h | 83 +- drivers/staging/vt6656/80211mgr.c | 88 +- drivers/staging/vt6656/80211mgr.h | 88 +- drivers/staging/vt6656/aes_ccmp.c | 11 +- drivers/staging/vt6656/aes_ccmp.h | 2 +- drivers/staging/vt6656/baseband.c | 46 +- drivers/staging/vt6656/baseband.h | 48 +- drivers/staging/vt6656/bssdb.c | 182 +- drivers/staging/vt6656/bssdb.h | 144 +- drivers/staging/vt6656/card.c | 52 +- drivers/staging/vt6656/card.h | 45 +- drivers/staging/vt6656/channel.c | 4 +- drivers/staging/vt6656/channel.h | 4 +- drivers/staging/vt6656/control.c | 87 +- drivers/staging/vt6656/control.h | 31 +- drivers/staging/vt6656/datarate.c | 49 +- drivers/staging/vt6656/datarate.h | 29 +- drivers/staging/vt6656/desc.h | 12 +- drivers/staging/vt6656/device.h | 30 +- drivers/staging/vt6656/dpc.c | 220 +- drivers/staging/vt6656/dpc.h | 27 +- drivers/staging/vt6656/firmware.c | 6 +- drivers/staging/vt6656/firmware.h | 9 +- drivers/staging/vt6656/hostap.c | 8 +- drivers/staging/vt6656/hostap.h | 9 +- drivers/staging/vt6656/int.c | 251 +- drivers/staging/vt6656/int.h | 12 +- drivers/staging/vt6656/iocmd.h | 4 +- drivers/staging/vt6656/ioctl.c | 8 +- drivers/staging/vt6656/ioctl.h | 15 +- drivers/staging/vt6656/iowpa.h | 4 +- drivers/staging/vt6656/iwctl.c | 2 - drivers/staging/vt6656/iwctl.h | 5 +- drivers/staging/vt6656/key.c | 58 +- drivers/staging/vt6656/key.h | 47 +- drivers/staging/vt6656/mac.c | 2 +- drivers/staging/vt6656/mac.h | 4 +- drivers/staging/vt6656/main_usb.c | 147 +- drivers/staging/vt6656/mib.c | 19 +- drivers/staging/vt6656/mib.h | 9 +- drivers/staging/vt6656/michael.c | 181 +- drivers/staging/vt6656/michael.h | 12 +- drivers/staging/vt6656/power.c | 24 +- drivers/staging/vt6656/power.h | 30 +- drivers/staging/vt6656/rc4.c | 82 +- drivers/staging/vt6656/rc4.h | 4 +- drivers/staging/vt6656/rf.c | 28 +- drivers/staging/vt6656/rf.h | 33 +- drivers/staging/vt6656/rndis.h | 3 +- drivers/staging/vt6656/rxtx.c | 683 ++-- drivers/staging/vt6656/rxtx.h | 35 +- drivers/staging/vt6656/srom.h | 2 +- drivers/staging/vt6656/tcrc.c | 21 +- drivers/staging/vt6656/tcrc.h | 5 +- drivers/staging/vt6656/tether.c | 45 +- drivers/staging/vt6656/tether.h | 27 +- drivers/staging/vt6656/tkip.c | 2 +- drivers/staging/vt6656/tkip.h | 7 +- drivers/staging/vt6656/tmacro.h | 4 +- drivers/staging/vt6656/ttype.h | 14 +- drivers/staging/vt6656/upc.h | 6 +- drivers/staging/vt6656/usbpipe.c | 123 +- drivers/staging/vt6656/usbpipe.h | 51 +- drivers/staging/vt6656/wcmd.c | 60 +- drivers/staging/vt6656/wcmd.h | 24 +- drivers/staging/vt6656/wctl.c | 6 +- drivers/staging/vt6656/wctl.h | 5 +- drivers/staging/vt6656/wmgr.c | 644 ++-- drivers/staging/vt6656/wmgr.h | 77 +- drivers/staging/vt6656/wpa.c | 14 +- drivers/staging/vt6656/wpa.h | 16 +- drivers/staging/vt6656/wpa2.c | 44 +- drivers/staging/vt6656/wpa2.h | 14 +- drivers/staging/vt6656/wpactl.c | 2 +- drivers/staging/vt6656/wpactl.h | 5 +- drivers/staging/wavelan/i82586.h | 58 +- drivers/staging/wavelan/wavelan.c | 198 +- drivers/staging/wavelan/wavelan.h | 31 +- drivers/staging/wavelan/wavelan.p.h | 26 +- drivers/staging/wavelan/wavelan_cs.h | 37 +- drivers/staging/wavelan/wavelan_cs.p.h | 42 +- drivers/staging/winbond/{README => TODO} | 3 +- drivers/staging/winbond/core.h | 14 +- drivers/staging/winbond/mac_structures.h | 342 +- drivers/staging/winbond/mds.c | 310 +- drivers/staging/winbond/mds_f.h | 20 +- drivers/staging/winbond/mds_s.h | 173 +- drivers/staging/winbond/mlme_s.h | 288 +- drivers/staging/winbond/mlmetxrx.c | 62 +- drivers/staging/winbond/mlmetxrx_f.h | 6 +- drivers/staging/winbond/mto.c | 299 +- drivers/staging/winbond/mto.h | 179 +- drivers/staging/winbond/phy_calibration.c | 9 +- drivers/staging/winbond/phy_calibration.h | 177 +- drivers/staging/winbond/reg.c | 3985 +++++++++----------- drivers/staging/winbond/scan_s.h | 152 +- drivers/staging/winbond/sme_api.h | 211 +- drivers/staging/winbond/sysdef.h | 18 +- drivers/staging/winbond/wb35reg.c | 618 ++-- drivers/staging/winbond/wb35reg_f.h | 104 +- drivers/staging/winbond/wb35reg_s.h | 221 +- drivers/staging/winbond/wb35rx.c | 258 +- drivers/staging/winbond/wb35tx_f.h | 18 +- drivers/staging/winbond/wbhal_f.h | 137 +- drivers/staging/winbond/wbhal_s.h | 502 ++-- drivers/staging/winbond/wblinux_f.h | 19 +- drivers/staging/winbond/wbusb.c | 187 +- drivers/staging/winbond/wbusb_s.h | 23 +- drivers/staging/wlags49_h2/ap_h2.c | 80 +- drivers/staging/wlags49_h2/debug.h | 104 +- drivers/staging/wlags49_h2/dhf.c | 147 +- drivers/staging/wlags49_h2/dhf.h | 56 +- drivers/staging/wlags49_h2/dhfcfg.h | 118 +- drivers/staging/wlags49_h2/hcf.c | 15 +- drivers/staging/wlags49_h2/wl_main.c | 3 +- drivers/staging/wlags49_h2/wl_netdev.c | 12 +- drivers/staging/wlags49_h2/wl_priv.c | 9 +- drivers/staging/wlags49_h2/wl_sysfs.c | 3 +- drivers/staging/wlan-ng/hfa384x_usb.c | 154 +- drivers/staging/wlan-ng/p80211conv.c | 2 +- drivers/staging/wlan-ng/p80211req.c | 5 +- drivers/staging/wlan-ng/p80211wext.c | 399 +-- 445 files changed, 33625 insertions(+), 17764 deletions(-) create mode 100644 drivers/staging/adis16255/Kconfig create mode 100644 drivers/staging/adis16255/Makefile create mode 100644 drivers/staging/adis16255/TODO create mode 100644 drivers/staging/adis16255/adis16255.c create mode 100644 drivers/staging/adis16255/adis16255.h delete mode 100644 drivers/staging/comedi/comedi_ksyms.c create mode 100644 drivers/staging/comedi/drivers/adl_pci7230.c create mode 100644 drivers/staging/comedi/internal.h delete mode 100644 drivers/staging/comedi/kcomedilib/data.c delete mode 100644 drivers/staging/comedi/kcomedilib/dio.c delete mode 100644 drivers/staging/comedi/kcomedilib/get.c delete mode 100644 drivers/staging/comedi/kcomedilib/ksyms.c delete mode 100644 drivers/staging/comedi/pci_ids.h delete mode 100644 drivers/staging/comedi/wrapper.h create mode 100644 drivers/staging/cxt1e1/Kconfig create mode 100644 drivers/staging/cxt1e1/Makefile create mode 100644 drivers/staging/cxt1e1/comet.c create mode 100644 drivers/staging/cxt1e1/comet.h create mode 100644 drivers/staging/cxt1e1/comet_tables.c create mode 100644 drivers/staging/cxt1e1/comet_tables.h create mode 100644 drivers/staging/cxt1e1/functions.c create mode 100644 drivers/staging/cxt1e1/hwprobe.c create mode 100644 drivers/staging/cxt1e1/libsbew.h create mode 100644 drivers/staging/cxt1e1/linux.c create mode 100644 drivers/staging/cxt1e1/musycc.c create mode 100644 drivers/staging/cxt1e1/musycc.h create mode 100644 drivers/staging/cxt1e1/ossiRelease.c create mode 100644 drivers/staging/cxt1e1/pmc93x6_eeprom.c create mode 100644 drivers/staging/cxt1e1/pmc93x6_eeprom.h create mode 100644 drivers/staging/cxt1e1/pmcc4.h create mode 100644 drivers/staging/cxt1e1/pmcc4_cpld.h create mode 100644 drivers/staging/cxt1e1/pmcc4_defs.h create mode 100644 drivers/staging/cxt1e1/pmcc4_drv.c create mode 100644 drivers/staging/cxt1e1/pmcc4_ioctls.h create mode 100644 drivers/staging/cxt1e1/pmcc4_private.h create mode 100644 drivers/staging/cxt1e1/pmcc4_sysdep.h create mode 100644 drivers/staging/cxt1e1/sbe_bid.h create mode 100644 drivers/staging/cxt1e1/sbe_promformat.h create mode 100644 drivers/staging/cxt1e1/sbecom_inline_linux.h create mode 100644 drivers/staging/cxt1e1/sbecrc.c create mode 100644 drivers/staging/cxt1e1/sbeid.c create mode 100644 drivers/staging/cxt1e1/sbeproc.c create mode 100644 drivers/staging/cxt1e1/sbeproc.h create mode 100644 drivers/staging/cxt1e1/sbew_ioc.h create mode 100644 drivers/staging/dt3155v4l/Kconfig create mode 100644 drivers/staging/dt3155v4l/Makefile create mode 100644 drivers/staging/dt3155v4l/dt3155-bufs.c create mode 100644 drivers/staging/dt3155v4l/dt3155-bufs.h create mode 100644 drivers/staging/dt3155v4l/dt3155v4l.c create mode 100644 drivers/staging/dt3155v4l/dt3155v4l.h create mode 100644 drivers/staging/memrar/Kconfig create mode 100644 drivers/staging/memrar/Makefile create mode 100644 drivers/staging/memrar/TODO create mode 100644 drivers/staging/memrar/memrar-abi create mode 100644 drivers/staging/memrar/memrar.h create mode 100644 drivers/staging/memrar/memrar_allocator.c create mode 100644 drivers/staging/memrar/memrar_allocator.h create mode 100644 drivers/staging/memrar/memrar_handler.c delete mode 100644 drivers/staging/poch/Kconfig delete mode 100644 drivers/staging/poch/Makefile delete mode 100644 drivers/staging/poch/README delete mode 100644 drivers/staging/poch/poch.c delete mode 100644 drivers/staging/poch/poch.h delete mode 100644 drivers/staging/rtl8192su/r8180_93cx6.c delete mode 100644 drivers/staging/rtl8192su/r8180_93cx6.h create mode 100644 drivers/staging/ti-st/Kconfig create mode 100644 drivers/staging/ti-st/Makefile create mode 100644 drivers/staging/ti-st/TODO create mode 100644 drivers/staging/ti-st/bt_drv.c create mode 100644 drivers/staging/ti-st/bt_drv.h create mode 100644 drivers/staging/ti-st/fm.h create mode 100644 drivers/staging/ti-st/st.h create mode 100644 drivers/staging/ti-st/st_core.c create mode 100644 drivers/staging/ti-st/st_core.h create mode 100644 drivers/staging/ti-st/st_kim.c create mode 100644 drivers/staging/ti-st/st_kim.h create mode 100644 drivers/staging/ti-st/st_ll.c create mode 100644 drivers/staging/ti-st/st_ll.h create mode 100644 drivers/staging/ti-st/sysfs-uim rename drivers/staging/winbond/{README => TODO} (79%) Merging slabh/slabh $ git merge slabh/slabh Already up-to-date. Merging scsi-post-merge/master $ git merge scsi-post-merge/master Already up-to-date.