$ date Thu Dec 1 11:04:15 EST 2011 $ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 883381d Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 Merging origin/master (883381d Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) $ git merge origin/master Already up-to-date. Merging fixes/master (aaa0b4f iio: iio_event_getfd -- fix ev_int build failure) $ git merge fixes/master Already up-to-date. Merging kbuild-current/rc-fixes (44656fa kbuild: Fix missing system calls check on mips.) $ git merge kbuild-current/rc-fixes Already up-to-date. Merging arm-current/fixes (fe41db7 ARM: 7177/1: GIC: avoid skipping non-existent PPIs in irq_start calculation) $ git merge arm-current/fixes Merge made by the 'recursive' strategy. arch/arm/Kconfig | 20 ++++++-- arch/arm/common/gic.c | 16 ++++-- arch/arm/common/pl330.c | 12 +++- arch/arm/include/asm/pmu.h | 10 ---- arch/arm/kernel/entry-armv.S | 2 +- arch/arm/kernel/kprobes-test-thumb.c | 16 +++--- arch/arm/kernel/kprobes-test.h | 100 ++++++++++++++++++++++++---------- arch/arm/kernel/perf_event.c | 11 ++++- arch/arm/kernel/pmu.c | 1 + arch/arm/kernel/process.c | 3 + arch/arm/lib/bitops.h | 26 ++++++++-- arch/arm/lib/changebit.S | 4 +- arch/arm/lib/clearbit.S | 4 +- arch/arm/lib/setbit.S | 4 +- arch/arm/lib/testchangebit.S | 4 +- arch/arm/lib/testclearbit.S | 4 +- arch/arm/lib/testsetbit.S | 4 +- arch/arm/mm/cache-l2x0.c | 2 +- arch/arm/mm/dma-mapping.c | 11 ++++- arch/arm/mm/mmap.c | 23 ++------ drivers/i2c/busses/i2c-nuc900.c | 2 +- drivers/spi/spi-nuc900.c | 2 +- sound/soc/nuc900/nuc900-ac97.c | 3 +- 23 files changed, 177 insertions(+), 107 deletions(-) Merging m68k-current/for-linus (2690e21 m68k/mac: Remove mac_irq_{en,dis}able() wrappers) $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge (49e4406 powerpc/44x: Add mtd ndfc to the ppx44x defconfig) $ git merge powerpc-merge/merge Already up-to-date. Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries) $ git merge 52xx-and-virtex-current/powerpc/merge Already up-to-date. Merging sparc/master (0b64120 sparc64: Patch sun4v code sequences properly on module load.) $ git merge sparc/master Already up-to-date. Merging scsi-rc-fixes/master (e5a44df [SCSI] hpsa: Disable ASPM) $ git merge scsi-rc-fixes/master Already up-to-date. Merging net/master (218fa90 ipv4: fix lockdep splat in rt_cache_seq_show) $ git merge net/master Merge made by the 'recursive' strategy. drivers/isdn/divert/divert_procfs.c | 6 + drivers/isdn/i4l/isdn_net.c | 3 + drivers/net/arcnet/Kconfig | 2 +- drivers/net/can/sja1000/peak_pci.c | 1 - drivers/net/ethernet/broadcom/b44.c | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 39 +++++++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 1 + drivers/net/ethernet/davicom/dm9000.c | 2 +- drivers/net/ethernet/freescale/Kconfig | 1 + drivers/net/ethernet/ibm/ehea/ehea.h | 4 +- drivers/net/ethernet/ibm/ehea/ehea_main.c | 6 +- drivers/net/ethernet/ibm/iseries_veth.c | 2 +- drivers/net/ethernet/jme.c | 113 ++++++++++++++++++++- drivers/net/ethernet/jme.h | 19 ++++ drivers/net/ethernet/qlogic/qlge/qlge.h | 8 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 14 ++- drivers/net/phy/Kconfig | 2 +- drivers/net/wireless/p54/p54spi.c | 5 +- drivers/net/wireless/prism54/isl_ioctl.c | 2 +- drivers/net/wireless/rt2x00/rt2800lib.c | 2 +- drivers/net/wireless/rtlwifi/ps.c | 17 ++-- drivers/net/xen-netback/netback.c | 2 +- include/linux/netdevice.h | 2 + include/linux/pkt_sched.h | 6 +- include/net/dst.h | 7 +- include/net/dst_ops.h | 2 +- include/net/inet_sock.h | 2 + include/net/inetpeer.h | 1 + include/net/netfilter/nf_conntrack_ecache.h | 19 ++-- include/net/netns/conntrack.h | 2 + include/net/route.h | 4 +- net/caif/cffrml.c | 11 +- net/core/dev.c | 6 + net/core/dev_addr_lists.c | 3 +- net/core/neighbour.c | 5 +- net/core/skbuff.c | 2 +- net/dccp/ipv4.c | 1 + net/decnet/dn_route.c | 10 +- net/decnet/dn_timer.c | 17 +-- net/ipv4/igmp.c | 3 +- net/ipv4/inet_diag.c | 14 ++- net/ipv4/ip_forward.c | 2 +- net/ipv4/ip_options.c | 5 +- net/ipv4/netfilter.c | 3 +- net/ipv4/netfilter/Kconfig | 1 - net/ipv4/route.c | 41 ++++++-- net/ipv6/inet6_connection_sock.c | 2 +- net/ipv6/ipv6_sockglue.c | 2 +- net/ipv6/ndisc.c | 2 +- net/ipv6/netfilter/Kconfig | 1 - net/ipv6/route.c | 21 +++-- net/ipv6/tcp_ipv6.c | 13 ++- net/l2tp/l2tp_core.c | 2 +- net/mac80211/agg-tx.c | 42 +++++++- net/mac80211/debugfs_sta.c | 4 +- net/mac80211/status.c | 8 +- net/netfilter/Kconfig | 1 - net/netfilter/ipset/ip_set_hash_ipport.c | 2 +- net/netfilter/ipset/ip_set_hash_ipportip.c | 2 +- net/netfilter/ipset/ip_set_hash_ipportnet.c | 2 +- net/netfilter/nf_conntrack_ecache.c | 37 ++++---- net/netfilter/nf_conntrack_netlink.c | 73 ++++++++++---- net/netlabel/netlabel_kapi.c | 26 +++-- net/sched/sch_teql.c | 31 ++++-- net/sctp/auth.c | 2 +- net/unix/af_unix.c | 4 + net/wireless/nl80211.c | 4 +- net/wireless/reg.c | 4 + net/xfrm/xfrm_policy.c | 10 +- 69 files changed, 513 insertions(+), 204 deletions(-) Merging sound-current/for-linus (ae7cc70 ALSA: usb-audio - Support for Roland GAIA SH-01 Synthesizer) $ git merge sound-current/for-linus Merge made by the 'recursive' strategy. sound/usb/quirks-table.h | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) Merging pci-current/for-linus (4cac2eb PCI hotplug: shpchp: don't blindly claim non-AMD 0x7450 device IDs) $ git merge pci-current/for-linus Already up-to-date. Merging wireless/master (c72e8d3 mac80211: fill rate filter for internal scan requests) $ git merge wireless/master Auto-merging net/wireless/reg.c Merge made by the 'recursive' strategy. net/mac80211/main.c | 6 ++++++ net/wireless/reg.c | 49 +++++++++++++++++++++++++++++++------------------ 2 files changed, 37 insertions(+), 18 deletions(-) Merging driver-core.current/driver-core-linus (caca6a0 Linux 3.2-rc3) $ git merge driver-core.current/driver-core-linus Already up-to-date. Merging tty.current/tty-linus (caca6a0 Linux 3.2-rc3) $ git merge tty.current/tty-linus Already up-to-date. Merging usb.current/usb-linus (6414e94 usb: gadget: fsl_udc: fix dequeuing a request in progress) $ git merge usb.current/usb-linus Merge made by the 'recursive' strategy. Documentation/usb/linux-cdc-acm.inf | 4 +- drivers/usb/gadget/amd5536udc.c | 2 +- drivers/usb/gadget/f_serial.c | 4 +- drivers/usb/gadget/fsl_mxc_udc.c | 3 +- drivers/usb/gadget/fsl_qe_udc.c | 3 +- drivers/usb/gadget/fsl_udc_core.c | 75 +++++++++++++++----------------- drivers/usb/gadget/fsl_usb2_udc.h | 10 ++++ drivers/usb/gadget/m66592-udc.c | 2 +- drivers/usb/gadget/net2280.c | 2 +- drivers/usb/gadget/r8a66597-udc.c | 2 +- drivers/usb/gadget/s3c-hsotg.c | 4 +- drivers/usb/gadget/s3c-hsudc.c | 3 +- drivers/usb/host/ehci-sched.c | 9 ++-- drivers/usb/host/whci/qset.c | 2 +- drivers/usb/host/xhci-pci.c | 7 +++- drivers/usb/musb/musb_core.c | 6 --- drivers/usb/musb/musb_gadget.c | 2 +- drivers/usb/renesas_usbhs/mod_gadget.c | 47 ++++++++----------- drivers/usb/serial/option.c | 4 ++ drivers/usb/storage/unusual_devs.h | 7 +++ 20 files changed, 101 insertions(+), 97 deletions(-) Merging staging.current/staging-linus (dfd8ee9 Staging: comedi: fix integer overflow in do_insnlist_ioctl()) $ git merge staging.current/staging-linus Merge made by the 'recursive' strategy. drivers/staging/comedi/comedi_fops.c | 96 +++++++++++++++++++------ drivers/staging/comedi/drivers/usbduxsigma.c | 7 +- drivers/staging/rts_pstor/rtsx.c | 1 + drivers/staging/usbip/vhci_rx.c | 10 ++- 4 files changed, 84 insertions(+), 30 deletions(-) Merging char-misc.current/char-misc-linus (caca6a0 Linux 3.2-rc3) $ git merge char-misc.current/char-misc-linus Already up-to-date. Merging cpufreq-current/fixes (eb0b38a [CPUFREQ] db8500: fix build error due to undeclared i variable) $ git merge cpufreq-current/fixes Already up-to-date. Merging input-current/for-linus (77f6ca5 Input: ams_delta_serio - include linux/module.h) $ git merge input-current/for-linus Already up-to-date. Merging md-current/for-linus (257a4b4 md/raid5: STRIPE_ACTIVE has lock semantics, add barriers) $ git merge md-current/for-linus Already up-to-date. Merging audit-current/for-linus (def5754 Audit: remove spaces from audit_log_d_path) $ git merge audit-current/for-linus Already up-to-date. Merging crypto-current/master (2742528 crypto: mv_cesa - fix hashing of chunks > 1920 bytes) $ git merge crypto-current/master Already up-to-date. Merging ide/master (0ab3d8b cy82c693: fix PCI device selection) $ git merge ide/master Already up-to-date. Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6) $ git merge dwmw2/master Already up-to-date. Merging sh-current/sh-fixes-for-linus (21d41f2 sh: fix the compile error in setup-sh7757.c) $ git merge sh-current/sh-fixes-for-linus Already up-to-date. Merging rmobile-current/rmobile-fixes-for-linus (a408bae ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support) $ git merge rmobile-current/rmobile-fixes-for-linus Already up-to-date. Merging devicetree-current/devicetree/merge (50e07f8 dt: add empty of_machine_is_compatible) $ git merge devicetree-current/devicetree/merge Already up-to-date. Merging spi-current/spi/merge (940ab88 drivercore: Add helper macro for platform_driver boilerplate) $ git merge spi-current/spi/merge Already up-to-date. Merging arm/for-next (7c4fba6 Merge branch 'devel' into for-next) $ git merge arm/for-next Removing arch/arm/plat-tcc/include/mach/vmalloc.h Removing arch/arm/plat-spear/include/plat/vmalloc.h Removing arch/arm/plat-omap/io.c Removing arch/arm/plat-mxc/include/mach/vmalloc.h Removing arch/arm/plat-mxc/gic.c Removing arch/arm/plat-iop/io.c Removing arch/arm/mach-zynq/include/mach/vmalloc.h Removing arch/arm/mach-w90x900/include/mach/vmalloc.h Removing arch/arm/mach-vt8500/include/mach/vmalloc.h Removing arch/arm/mach-vexpress/include/mach/vmalloc.h Removing arch/arm/mach-versatile/include/mach/vmalloc.h Removing arch/arm/mach-ux500/include/mach/vmalloc.h Removing arch/arm/mach-u300/include/mach/vmalloc.h Removing arch/arm/mach-tegra/include/mach/vmalloc.h Removing arch/arm/mach-spear6xx/include/mach/vmalloc.h Removing arch/arm/mach-spear3xx/include/mach/vmalloc.h Removing arch/arm/mach-shmobile/include/mach/vmalloc.h Removing arch/arm/mach-shmobile/entry-gic.S Removing arch/arm/mach-shark/include/mach/vmalloc.h Removing arch/arm/mach-sa1100/include/mach/vmalloc.h Removing arch/arm/mach-s5pv210/include/mach/vmalloc.h Removing arch/arm/mach-s5pc100/include/mach/vmalloc.h Removing arch/arm/mach-s5p64x0/include/mach/vmalloc.h Removing arch/arm/mach-s3c64xx/include/mach/vmalloc.h Removing arch/arm/mach-s3c2410/include/mach/vmalloc.h Removing arch/arm/mach-rpc/include/mach/vmalloc.h Removing arch/arm/mach-realview/include/mach/vmalloc.h Removing arch/arm/mach-pxa/include/mach/vmalloc.h Removing arch/arm/mach-prima2/include/mach/vmalloc.h Removing arch/arm/mach-pnx4008/include/mach/vmalloc.h Removing arch/arm/mach-picoxcell/include/mach/vmalloc.h Removing arch/arm/mach-orion5x/include/mach/vmalloc.h Removing arch/arm/mach-omap2/include/mach/vmalloc.h Removing arch/arm/mach-omap2/include/mach/omap4-common.h Removing arch/arm/mach-omap1/include/mach/vmalloc.h Removing arch/arm/mach-nomadik/include/mach/vmalloc.h Removing arch/arm/mach-netx/include/mach/vmalloc.h Removing arch/arm/mach-mxs/include/mach/vmalloc.h Removing arch/arm/mach-mv78xx0/include/mach/vmalloc.h Removing arch/arm/mach-msm/include/mach/vmalloc.h Removing arch/arm/mach-msm/include/mach/entry-macro-vic.S Removing arch/arm/mach-msm/include/mach/entry-macro-qgic.S Removing arch/arm/mach-mmp/include/mach/vmalloc.h Removing arch/arm/mach-lpc32xx/include/mach/vmalloc.h Removing arch/arm/mach-ks8695/include/mach/vmalloc.h Removing arch/arm/mach-kirkwood/include/mach/vmalloc.h Removing arch/arm/mach-ixp4xx/include/mach/vmalloc.h Removing arch/arm/mach-ixp23xx/include/mach/vmalloc.h Removing arch/arm/mach-ixp2000/include/mach/vmalloc.h Removing arch/arm/mach-iop33x/include/mach/vmalloc.h Removing arch/arm/mach-iop32x/include/mach/vmalloc.h Removing arch/arm/mach-iop13xx/include/mach/vmalloc.h Removing arch/arm/mach-integrator/include/mach/vmalloc.h Removing arch/arm/mach-highbank/include/mach/vmalloc.h Removing arch/arm/mach-h720x/include/mach/vmalloc.h Removing arch/arm/mach-gemini/include/mach/vmalloc.h Removing arch/arm/mach-footbridge/include/mach/vmalloc.h Removing arch/arm/mach-exynos/include/mach/vmalloc.h Removing arch/arm/mach-ep93xx/include/mach/vmalloc.h Removing arch/arm/mach-ebsa110/include/mach/vmalloc.h Removing arch/arm/mach-dove/include/mach/vmalloc.h Removing arch/arm/mach-davinci/io.c Removing arch/arm/mach-davinci/include/mach/vmalloc.h Removing arch/arm/mach-cns3xxx/include/mach/vmalloc.h Removing arch/arm/mach-clps711x/time.c Removing arch/arm/mach-clps711x/mm.c Removing arch/arm/mach-clps711x/include/mach/vmalloc.h Auto-merging arch/arm/mach-clps711x/common.c Removing arch/arm/mach-bcmring/include/mach/vmalloc.h Removing arch/arm/mach-at91/include/mach/vmalloc.h Removing arch/arm/include/asm/hardware/entry-macro-gic.S Removing arch/arm/include/asm/entry-macro-vic2.S Merge made by the 'recursive' strategy. Documentation/arm/memory.txt | 11 +- Documentation/devicetree/bindings/arm/gic.txt | 4 + Documentation/devicetree/bindings/arm/vic.txt | 29 + arch/arm/common/Kconfig | 6 + arch/arm/common/gic.c | 165 +++++- arch/arm/common/vic.c | 143 ++++- arch/arm/include/asm/entry-macro-vic2.S | 57 -- arch/arm/include/asm/hardirq.h | 17 - arch/arm/include/asm/hardware/entry-macro-gic.S | 60 -- arch/arm/include/asm/hardware/gic.h | 26 +- arch/arm/include/asm/hardware/iop3xx.h | 1 + arch/arm/include/asm/hardware/vic.h | 10 +- arch/arm/include/asm/mach/arch.h | 9 +- arch/arm/include/asm/pgalloc.h | 2 +- arch/arm/include/asm/pgtable.h | 36 +- arch/arm/include/asm/system.h | 2 +- arch/arm/include/asm/tlb.h | 1 + arch/arm/kernel/entry-armv.S | 7 +- arch/arm/kernel/machine_kexec.c | 4 +- arch/arm/kernel/process.c | 31 +- arch/arm/kernel/setup.c | 15 +- arch/arm/mach-at91/at91cap9.c | 4 +- arch/arm/mach-at91/at91rm9200.c | 4 +- arch/arm/mach-at91/at91sam9260.c | 2 +- arch/arm/mach-at91/at91sam9261.c | 2 +- arch/arm/mach-at91/at91sam9263.c | 2 +- arch/arm/mach-at91/at91sam9_alt_reset.S | 9 +- arch/arm/mach-at91/at91sam9g45.c | 4 +- arch/arm/mach-at91/at91sam9rl.c | 2 +- arch/arm/mach-at91/generic.h | 3 +- arch/arm/mach-at91/include/mach/io.h | 8 - arch/arm/mach-at91/include/mach/system.h | 9 - arch/arm/mach-at91/include/mach/vmalloc.h | 28 - arch/arm/mach-at91/setup.c | 18 - arch/arm/mach-bcmring/arch.c | 25 +- arch/arm/mach-bcmring/dma.c | 2 +- arch/arm/mach-bcmring/include/mach/system.h | 26 - arch/arm/mach-bcmring/include/mach/vmalloc.h | 25 - arch/arm/mach-clps711x/Makefile | 2 +- arch/arm/mach-clps711x/autcpu12.c | 1 + arch/arm/mach-clps711x/cdb89712.c | 1 + arch/arm/mach-clps711x/ceiva.c | 1 + arch/arm/mach-clps711x/clep7312.c | 1 + arch/arm/mach-clps711x/{irq.c => common.c} | 100 +++- arch/arm/mach-clps711x/edb7211-arch.c | 1 + arch/arm/mach-clps711x/fortunet.c | 1 + arch/arm/mach-clps711x/include/mach/system.h | 5 - arch/arm/mach-clps711x/include/mach/vmalloc.h | 20 - arch/arm/mach-clps711x/mm.c | 48 -- arch/arm/mach-clps711x/p720t.c | 1 + arch/arm/mach-clps711x/time.c | 84 --- arch/arm/mach-cns3xxx/cns3420vb.c | 3 + arch/arm/mach-cns3xxx/core.h | 1 + arch/arm/mach-cns3xxx/include/mach/entry-macro.S | 2 - arch/arm/mach-cns3xxx/include/mach/system.h | 3 - arch/arm/mach-cns3xxx/include/mach/vmalloc.h | 11 - arch/arm/mach-cns3xxx/pm.c | 4 +- arch/arm/mach-davinci/Makefile | 2 +- arch/arm/mach-davinci/include/mach/io.h | 8 - arch/arm/mach-davinci/include/mach/vmalloc.h | 14 - arch/arm/mach-davinci/io.c | 48 -- arch/arm/mach-dove/cm-a510.c | 1 + arch/arm/mach-dove/common.c | 16 + arch/arm/mach-dove/common.h | 1 + arch/arm/mach-dove/dove-db-setup.c | 1 + arch/arm/mach-dove/include/mach/dove.h | 2 - arch/arm/mach-dove/include/mach/system.h | 19 - arch/arm/mach-dove/include/mach/vmalloc.h | 5 - arch/arm/mach-ebsa110/core.c | 8 +- arch/arm/mach-ebsa110/include/mach/system.h | 2 - arch/arm/mach-ebsa110/include/mach/vmalloc.h | 10 - arch/arm/mach-ep93xx/adssphere.c | 3 + arch/arm/mach-ep93xx/core.c | 12 + arch/arm/mach-ep93xx/edb93xx.c | 17 + arch/arm/mach-ep93xx/gesbc9312.c | 3 + arch/arm/mach-ep93xx/include/mach/entry-macro.S | 42 -- arch/arm/mach-ep93xx/include/mach/platform.h | 2 + arch/arm/mach-ep93xx/include/mach/system.h | 17 - arch/arm/mach-ep93xx/include/mach/vmalloc.h | 5 - arch/arm/mach-ep93xx/micro9.c | 9 + arch/arm/mach-ep93xx/simone.c | 3 + arch/arm/mach-ep93xx/snappercl15.c | 3 + arch/arm/mach-ep93xx/ts72xx.c | 3 + arch/arm/mach-ep93xx/vision_ep9307.c | 1 + arch/arm/mach-exynos/cpu.c | 20 +- arch/arm/mach-exynos/include/mach/entry-macro.S | 75 --- arch/arm/mach-exynos/include/mach/vmalloc.h | 22 - arch/arm/mach-exynos/mach-armlex4210.c | 2 + arch/arm/mach-exynos/mach-nuri.c | 2 + arch/arm/mach-exynos/mach-origen.c | 2 + arch/arm/mach-exynos/mach-smdk4x12.c | 3 + arch/arm/mach-exynos/mach-smdkv310.c | 3 + arch/arm/mach-exynos/mach-universal_c210.c | 4 +- arch/arm/mach-exynos/platsmp.c | 28 +- arch/arm/mach-footbridge/cats-hw.c | 3 +- arch/arm/mach-footbridge/common.c | 27 + arch/arm/mach-footbridge/common.h | 1 + arch/arm/mach-footbridge/ebsa285.c | 1 + arch/arm/mach-footbridge/include/mach/system.h | 56 -- arch/arm/mach-footbridge/include/mach/vmalloc.h | 10 - arch/arm/mach-footbridge/netwinder-hw.c | 27 + arch/arm/mach-footbridge/personal.c | 1 + arch/arm/mach-gemini/include/mach/vmalloc.h | 10 - arch/arm/mach-h720x/common.c | 5 + arch/arm/mach-h720x/common.h | 1 + arch/arm/mach-h720x/h7201-eval.c | 1 + arch/arm/mach-h720x/h7202-eval.c | 1 + arch/arm/mach-h720x/include/mach/system.h | 6 - arch/arm/mach-h720x/include/mach/vmalloc.h | 10 - arch/arm/mach-highbank/core.h | 1 + arch/arm/mach-highbank/highbank.c | 2 + arch/arm/mach-highbank/include/mach/entry-macro.S | 2 - arch/arm/mach-highbank/include/mach/system.h | 2 - arch/arm/mach-highbank/include/mach/vmalloc.h | 1 - arch/arm/mach-highbank/system.c | 2 +- arch/arm/mach-imx/mach-apf9328.c | 1 + arch/arm/mach-imx/mach-armadillo5x0.c | 1 + arch/arm/mach-imx/mach-bug.c | 1 + arch/arm/mach-imx/mach-cpuimx27.c | 1 + arch/arm/mach-imx/mach-cpuimx35.c | 1 + arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 1 + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 1 + arch/arm/mach-imx/mach-imx27ipcam.c | 1 + arch/arm/mach-imx/mach-imx27lite.c | 1 + arch/arm/mach-imx/mach-imx6q.c | 1 + arch/arm/mach-imx/mach-kzm_arm11_01.c | 1 + arch/arm/mach-imx/mach-mx1ads.c | 2 + arch/arm/mach-imx/mach-mx21ads.c | 1 + arch/arm/mach-imx/mach-mx25_3ds.c | 1 + arch/arm/mach-imx/mach-mx27_3ds.c | 1 + arch/arm/mach-imx/mach-mx27ads.c | 1 + arch/arm/mach-imx/mach-mx31_3ds.c | 1 + arch/arm/mach-imx/mach-mx31ads.c | 1 + arch/arm/mach-imx/mach-mx31lilly.c | 1 + arch/arm/mach-imx/mach-mx31lite.c | 1 + arch/arm/mach-imx/mach-mx31moboard.c | 1 + arch/arm/mach-imx/mach-mx35_3ds.c | 1 + arch/arm/mach-imx/mach-mxt_td60.c | 1 + arch/arm/mach-imx/mach-pca100.c | 1 + arch/arm/mach-imx/mach-pcm037.c | 1 + arch/arm/mach-imx/mach-pcm038.c | 1 + arch/arm/mach-imx/mach-pcm043.c | 1 + arch/arm/mach-imx/mach-qong.c | 1 + arch/arm/mach-imx/mach-scb9328.c | 1 + arch/arm/mach-imx/mach-vpr200.c | 1 + arch/arm/mach-integrator/common.h | 1 + arch/arm/mach-integrator/core.c | 8 + arch/arm/mach-integrator/include/mach/system.h | 11 - arch/arm/mach-integrator/include/mach/vmalloc.h | 20 - arch/arm/mach-integrator/integrator_ap.c | 1 + arch/arm/mach-integrator/integrator_cp.c | 1 + arch/arm/mach-iop13xx/include/mach/iop13xx.h | 1 + arch/arm/mach-iop13xx/include/mach/system.h | 14 - arch/arm/mach-iop13xx/include/mach/vmalloc.h | 4 - arch/arm/mach-iop13xx/iq81340mc.c | 1 + arch/arm/mach-iop13xx/iq81340sc.c | 1 + arch/arm/mach-iop13xx/setup.c | 11 + arch/arm/mach-iop32x/em7210.c | 1 + arch/arm/mach-iop32x/glantank.c | 1 + arch/arm/mach-iop32x/include/mach/io.h | 7 - arch/arm/mach-iop32x/include/mach/system.h | 21 - arch/arm/mach-iop32x/include/mach/vmalloc.h | 5 - arch/arm/mach-iop32x/iq31244.c | 2 + arch/arm/mach-iop32x/iq80321.c | 1 + arch/arm/mach-iop32x/n2100.c | 9 + arch/arm/mach-iop33x/include/mach/io.h | 7 - arch/arm/mach-iop33x/include/mach/system.h | 10 - arch/arm/mach-iop33x/include/mach/vmalloc.h | 5 - arch/arm/mach-iop33x/iq80331.c | 1 + arch/arm/mach-iop33x/iq80332.c | 1 + arch/arm/mach-ixp2000/core.c | 4 + arch/arm/mach-ixp2000/enp2611.c | 1 + arch/arm/mach-ixp2000/include/mach/platform.h | 1 + arch/arm/mach-ixp2000/include/mach/system.h | 35 -- arch/arm/mach-ixp2000/include/mach/vmalloc.h | 20 - arch/arm/mach-ixp2000/ixdp2400.c | 1 + arch/arm/mach-ixp2000/ixdp2800.c | 1 + arch/arm/mach-ixp2000/ixdp2x01.c | 32 + arch/arm/mach-ixp23xx/core.c | 6 + arch/arm/mach-ixp23xx/espresso.c | 1 + arch/arm/mach-ixp23xx/include/mach/io.h | 29 - arch/arm/mach-ixp23xx/include/mach/platform.h | 1 + arch/arm/mach-ixp23xx/include/mach/system.h | 17 - arch/arm/mach-ixp23xx/include/mach/vmalloc.h | 10 - arch/arm/mach-ixp23xx/ixdp2351.c | 12 + arch/arm/mach-ixp23xx/roadrunner.c | 1 + arch/arm/mach-ixp4xx/avila-setup.c | 2 + arch/arm/mach-ixp4xx/common.c | 20 + arch/arm/mach-ixp4xx/coyote-setup.c | 2 + arch/arm/mach-ixp4xx/dsmg600-setup.c | 1 + arch/arm/mach-ixp4xx/fsg-setup.c | 1 + arch/arm/mach-ixp4xx/gateway7001-setup.c | 1 + arch/arm/mach-ixp4xx/goramo_mlr.c | 1 + arch/arm/mach-ixp4xx/gtwx5715-setup.c | 1 + arch/arm/mach-ixp4xx/include/mach/platform.h | 1 + arch/arm/mach-ixp4xx/include/mach/system.h | 25 - arch/arm/mach-ixp4xx/include/mach/vmalloc.h | 5 - arch/arm/mach-ixp4xx/ixdp425-setup.c | 1 + arch/arm/mach-ixp4xx/nas100d-setup.c | 1 + arch/arm/mach-ixp4xx/nslu2-setup.c | 1 + arch/arm/mach-ixp4xx/omixp-setup.c | 3 + arch/arm/mach-ixp4xx/vulcan-setup.c | 1 + arch/arm/mach-ixp4xx/wg302v2-setup.c | 1 + arch/arm/mach-kirkwood/common.c | 16 + arch/arm/mach-kirkwood/common.h | 1 + arch/arm/mach-kirkwood/d2net_v2-setup.c | 1 + arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 1 + arch/arm/mach-kirkwood/dockstar-setup.c | 1 + arch/arm/mach-kirkwood/guruplug-setup.c | 1 + arch/arm/mach-kirkwood/include/mach/io.h | 25 - arch/arm/mach-kirkwood/include/mach/system.h | 19 - arch/arm/mach-kirkwood/include/mach/vmalloc.h | 5 - arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 1 + arch/arm/mach-kirkwood/netspace_v2-setup.c | 3 + arch/arm/mach-kirkwood/netxbig_v2-setup.c | 2 + arch/arm/mach-kirkwood/openrd-setup.c | 3 + arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 1 + arch/arm/mach-kirkwood/rd88f6281-setup.c | 1 + arch/arm/mach-kirkwood/sheevaplug-setup.c | 2 + arch/arm/mach-kirkwood/t5325-setup.c | 1 + arch/arm/mach-kirkwood/ts219-setup.c | 1 + arch/arm/mach-kirkwood/ts41x-setup.c | 1 + arch/arm/mach-ks8695/board-acs5k.c | 1 + arch/arm/mach-ks8695/board-dsm320.c | 1 + arch/arm/mach-ks8695/board-micrel.c | 1 + arch/arm/mach-ks8695/generic.h | 1 + arch/arm/mach-ks8695/include/mach/system.h | 21 - arch/arm/mach-ks8695/include/mach/vmalloc.h | 19 - arch/arm/mach-ks8695/time.c | 18 + arch/arm/mach-lpc32xx/common.c | 20 +- arch/arm/mach-lpc32xx/common.h | 2 + arch/arm/mach-lpc32xx/include/mach/system.h | 25 - arch/arm/mach-lpc32xx/include/mach/vmalloc.h | 24 - arch/arm/mach-lpc32xx/phy3250.c | 1 + arch/arm/mach-mmp/aspenite.c | 2 + arch/arm/mach-mmp/avengers_lite.c | 1 + arch/arm/mach-mmp/brownstone.c | 1 + arch/arm/mach-mmp/common.c | 5 + arch/arm/mach-mmp/common.h | 1 + arch/arm/mach-mmp/flint.c | 1 + arch/arm/mach-mmp/gplugd.c | 1 + arch/arm/mach-mmp/include/mach/pxa168.h | 1 + arch/arm/mach-mmp/include/mach/system.h | 10 - arch/arm/mach-mmp/include/mach/vmalloc.h | 5 - arch/arm/mach-mmp/jasper.c | 1 + arch/arm/mach-mmp/pxa168.c | 5 + arch/arm/mach-mmp/tavorevb.c | 1 + arch/arm/mach-mmp/teton_bga.c | 1 + arch/arm/mach-mmp/ttc_dkb.c | 1 + arch/arm/mach-msm/board-msm8960.c | 2 + arch/arm/mach-msm/board-msm8x60.c | 4 + arch/arm/mach-msm/include/mach/entry-macro-qgic.S | 17 - arch/arm/mach-msm/include/mach/entry-macro-vic.S | 37 -- arch/arm/mach-msm/include/mach/entry-macro.S | 27 +- arch/arm/mach-msm/include/mach/system.h | 8 - arch/arm/mach-msm/include/mach/vmalloc.h | 22 - arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 1 + arch/arm/mach-mv78xx0/common.c | 16 + arch/arm/mach-mv78xx0/common.h | 1 + arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 1 + arch/arm/mach-mv78xx0/include/mach/system.h | 19 - arch/arm/mach-mv78xx0/include/mach/vmalloc.h | 5 - arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 1 + arch/arm/mach-mx5/board-cpuimx51.c | 1 + arch/arm/mach-mx5/board-cpuimx51sd.c | 1 + arch/arm/mach-mx5/board-mx50_rdp.c | 1 + arch/arm/mach-mx5/board-mx51_3ds.c | 1 + arch/arm/mach-mx5/board-mx51_babbage.c | 1 + arch/arm/mach-mx5/board-mx51_efikamx.c | 3 +- arch/arm/mach-mx5/board-mx51_efikasb.c | 1 + arch/arm/mach-mx5/board-mx53_ard.c | 1 + arch/arm/mach-mx5/board-mx53_evk.c | 1 + arch/arm/mach-mx5/board-mx53_loco.c | 1 + arch/arm/mach-mx5/board-mx53_smd.c | 1 + arch/arm/mach-mx5/imx51-dt.c | 1 + arch/arm/mach-mx5/imx53-dt.c | 1 + arch/arm/mach-mxs/include/mach/common.h | 1 + arch/arm/mach-mxs/include/mach/system.h | 2 - arch/arm/mach-mxs/include/mach/vmalloc.h | 22 - arch/arm/mach-mxs/mach-m28evk.c | 1 + arch/arm/mach-mxs/mach-mx23evk.c | 1 + arch/arm/mach-mxs/mach-mx28evk.c | 1 + arch/arm/mach-mxs/mach-stmp378x_devb.c | 1 + arch/arm/mach-mxs/mach-tx28.c | 1 + arch/arm/mach-mxs/system.c | 4 +- arch/arm/mach-netx/generic.c | 5 + arch/arm/mach-netx/generic.h | 1 + arch/arm/mach-netx/include/mach/entry-macro.S | 13 - arch/arm/mach-netx/include/mach/system.h | 10 - arch/arm/mach-netx/include/mach/vmalloc.h | 19 - arch/arm/mach-netx/nxdb500.c | 3 + arch/arm/mach-netx/nxdkn.c | 3 + arch/arm/mach-netx/nxeb500hmi.c | 3 + arch/arm/mach-nomadik/board-nhk8815.c | 2 + arch/arm/mach-nomadik/include/mach/entry-macro.S | 30 - arch/arm/mach-nomadik/include/mach/vmalloc.h | 2 - arch/arm/mach-omap1/board-ams-delta.c | 3 +- arch/arm/mach-omap1/board-fsample.c | 3 +- arch/arm/mach-omap1/board-generic.c | 3 +- arch/arm/mach-omap1/board-h2.c | 3 +- arch/arm/mach-omap1/board-h3.c | 3 +- arch/arm/mach-omap1/board-htcherald.c | 3 +- arch/arm/mach-omap1/board-innovator.c | 3 +- arch/arm/mach-omap1/board-nokia770.c | 3 +- arch/arm/mach-omap1/board-osk.c | 3 +- arch/arm/mach-omap1/board-palmte.c | 3 +- arch/arm/mach-omap1/board-palmtt.c | 3 +- arch/arm/mach-omap1/board-palmz71.c | 3 +- arch/arm/mach-omap1/board-perseus2.c | 3 +- arch/arm/mach-omap1/board-sx1.c | 3 +- arch/arm/mach-omap1/board-voiceblue.c | 8 +- arch/arm/mach-omap1/common.h | 62 ++ arch/arm/mach-omap1/devices.c | 2 +- arch/arm/mach-omap1/include/mach/vmalloc.h | 20 - arch/arm/mach-omap1/io.c | 1 - arch/arm/mach-omap1/reset.c | 5 +- arch/arm/mach-omap1/time.c | 2 +- arch/arm/mach-omap1/timer32k.c | 2 +- arch/arm/mach-omap2/Kconfig | 2 + arch/arm/mach-omap2/board-2430sdp.c | 4 +- arch/arm/mach-omap2/board-3430sdp.c | 4 +- arch/arm/mach-omap2/board-3630sdp.c | 4 +- arch/arm/mach-omap2/board-4430sdp.c | 6 +- arch/arm/mach-omap2/board-am3517crane.c | 4 +- arch/arm/mach-omap2/board-am3517evm.c | 4 +- arch/arm/mach-omap2/board-apollon.c | 4 +- arch/arm/mach-omap2/board-cm-t35.c | 6 +- arch/arm/mach-omap2/board-cm-t3517.c | 4 +- arch/arm/mach-omap2/board-devkit8000.c | 4 +- arch/arm/mach-omap2/board-generic.c | 8 +- arch/arm/mach-omap2/board-h4.c | 4 +- arch/arm/mach-omap2/board-igep0020.c | 6 +- arch/arm/mach-omap2/board-ldp.c | 4 +- arch/arm/mach-omap2/board-n8x0.c | 8 +- arch/arm/mach-omap2/board-omap3beagle.c | 4 +- arch/arm/mach-omap2/board-omap3evm.c | 4 +- arch/arm/mach-omap2/board-omap3logic.c | 6 +- arch/arm/mach-omap2/board-omap3pandora.c | 4 +- arch/arm/mach-omap2/board-omap3stalker.c | 4 +- arch/arm/mach-omap2/board-omap3touchbook.c | 4 +- arch/arm/mach-omap2/board-omap4panda.c | 6 +- arch/arm/mach-omap2/board-overo.c | 4 +- arch/arm/mach-omap2/board-rm680.c | 4 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +- arch/arm/mach-omap2/board-rx51.c | 4 +- arch/arm/mach-omap2/board-ti8168evm.c | 3 +- arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +- arch/arm/mach-omap2/board-zoom.c | 6 +- arch/arm/mach-omap2/cm2xxx_3xxx.c | 2 +- arch/arm/mach-omap2/cm44xx.c | 2 +- arch/arm/mach-omap2/cminst44xx.c | 2 +- arch/arm/mach-omap2/common.c | 2 +- arch/arm/mach-omap2/common.h | 184 ++++++ arch/arm/mach-omap2/control.c | 2 +- arch/arm/mach-omap2/i2c.c | 2 +- arch/arm/mach-omap2/id.c | 2 +- arch/arm/mach-omap2/include/mach/entry-macro.S | 137 ----- arch/arm/mach-omap2/include/mach/omap4-common.h | 43 -- arch/arm/mach-omap2/include/mach/vmalloc.h | 20 - arch/arm/mach-omap2/io.c | 8 +- arch/arm/mach-omap2/irq.c | 51 ++ arch/arm/mach-omap2/omap-hotplug.c | 3 +- arch/arm/mach-omap2/omap-smp.c | 3 +- arch/arm/mach-omap2/omap4-common.c | 9 +- arch/arm/mach-omap2/omap_hwmod.c | 2 +- arch/arm/mach-omap2/pm.c | 2 +- arch/arm/mach-omap2/pm24xx.c | 1 + arch/arm/mach-omap2/pm34xx.c | 1 + arch/arm/mach-omap2/pm44xx.c | 2 +- arch/arm/mach-omap2/prcm.c | 7 +- arch/arm/mach-omap2/prcm_mpu44xx.c | 2 +- arch/arm/mach-omap2/prm2xxx_3xxx.c | 2 +- arch/arm/mach-omap2/prm44xx.c | 2 +- arch/arm/mach-omap2/prminst44xx.c | 2 +- arch/arm/mach-omap2/sdram-nokia.c | 2 +- arch/arm/mach-omap2/sdrc.c | 2 +- arch/arm/mach-omap2/sdrc2xxx.c | 2 +- arch/arm/mach-omap2/serial.c | 2 +- arch/arm/mach-omap2/smartreflex.c | 2 +- arch/arm/mach-omap2/timer.c | 2 +- arch/arm/mach-omap2/vc3xxx_data.c | 2 +- arch/arm/mach-omap2/vc44xx_data.c | 2 +- arch/arm/mach-omap2/voltage.c | 2 +- arch/arm/mach-omap2/voltagedomains3xxx_data.c | 2 +- arch/arm/mach-omap2/voltagedomains44xx_data.c | 2 +- arch/arm/mach-omap2/vp.c | 2 +- arch/arm/mach-omap2/vp3xxx_data.c | 2 +- arch/arm/mach-omap2/vp44xx_data.c | 2 +- arch/arm/mach-orion5x/common.c | 12 + arch/arm/mach-orion5x/common.h | 1 + arch/arm/mach-orion5x/d2net-setup.c | 2 + arch/arm/mach-orion5x/db88f5281-setup.c | 1 + arch/arm/mach-orion5x/dns323-setup.c | 1 + arch/arm/mach-orion5x/edmini_v2-setup.c | 1 + arch/arm/mach-orion5x/include/mach/io.h | 25 - arch/arm/mach-orion5x/include/mach/system.h | 14 - arch/arm/mach-orion5x/include/mach/vmalloc.h | 5 - arch/arm/mach-orion5x/kurobox_pro-setup.c | 2 + arch/arm/mach-orion5x/ls-chl-setup.c | 3 +- arch/arm/mach-orion5x/ls_hgl-setup.c | 3 +- arch/arm/mach-orion5x/lsmini-setup.c | 3 +- arch/arm/mach-orion5x/mss2-setup.c | 3 +- arch/arm/mach-orion5x/mv2120-setup.c | 3 +- arch/arm/mach-orion5x/net2big-setup.c | 1 + arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 1 + arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 1 + arch/arm/mach-orion5x/rd88f5182-setup.c | 1 + arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 1 + arch/arm/mach-orion5x/terastation_pro2-setup.c | 1 + arch/arm/mach-orion5x/ts209-setup.c | 1 + arch/arm/mach-orion5x/ts409-setup.c | 1 + arch/arm/mach-orion5x/ts78xx-setup.c | 1 + arch/arm/mach-orion5x/wnr854t-setup.c | 1 + arch/arm/mach-orion5x/wrt350n-v2-setup.c | 1 + arch/arm/mach-picoxcell/common.c | 9 +- arch/arm/mach-picoxcell/include/mach/entry-macro.S | 11 +- arch/arm/mach-picoxcell/include/mach/system.h | 5 - arch/arm/mach-picoxcell/include/mach/vmalloc.h | 14 - arch/arm/mach-pnx4008/core.c | 6 + arch/arm/mach-pnx4008/include/mach/system.h | 9 - arch/arm/mach-pnx4008/include/mach/vmalloc.h | 20 - arch/arm/mach-prima2/common.h | 1 + arch/arm/mach-prima2/include/mach/map.h | 6 +- arch/arm/mach-prima2/include/mach/system.h | 12 - arch/arm/mach-prima2/include/mach/vmalloc.h | 16 - arch/arm/mach-prima2/prima2.c | 1 + arch/arm/mach-prima2/rstc.c | 7 + arch/arm/mach-pxa/balloon3.c | 1 + arch/arm/mach-pxa/capc7117.c | 3 +- arch/arm/mach-pxa/cm-x2xx.c | 1 + arch/arm/mach-pxa/cm-x300.c | 1 + arch/arm/mach-pxa/colibri-pxa270.c | 2 + arch/arm/mach-pxa/colibri-pxa300.c | 1 + arch/arm/mach-pxa/colibri-pxa320.c | 1 + arch/arm/mach-pxa/corgi.c | 8 +- arch/arm/mach-pxa/csb726.c | 1 + arch/arm/mach-pxa/em-x270.c | 2 + arch/arm/mach-pxa/eseries.c | 6 + arch/arm/mach-pxa/ezx.c | 6 + arch/arm/mach-pxa/generic.h | 2 + arch/arm/mach-pxa/gumstix.c | 1 + arch/arm/mach-pxa/h5000.c | 1 + arch/arm/mach-pxa/himalaya.c | 1 + arch/arm/mach-pxa/hx4700.c | 1 + arch/arm/mach-pxa/icontrol.c | 3 +- arch/arm/mach-pxa/idp.c | 1 + arch/arm/mach-pxa/include/mach/entry-macro.S | 36 -- arch/arm/mach-pxa/include/mach/system.h | 8 - arch/arm/mach-pxa/include/mach/vmalloc.h | 11 - arch/arm/mach-pxa/littleton.c | 1 + arch/arm/mach-pxa/lpd270.c | 1 + arch/arm/mach-pxa/lubbock.c | 1 + arch/arm/mach-pxa/magician.c | 1 + arch/arm/mach-pxa/mainstone.c | 1 + arch/arm/mach-pxa/mioa701.c | 7 +- arch/arm/mach-pxa/mp900.c | 1 + arch/arm/mach-pxa/palmld.c | 3 +- arch/arm/mach-pxa/palmt5.c | 3 +- arch/arm/mach-pxa/palmtc.c | 3 +- arch/arm/mach-pxa/palmte2.c | 3 +- arch/arm/mach-pxa/palmtreo.c | 2 + arch/arm/mach-pxa/palmtx.c | 3 +- arch/arm/mach-pxa/palmz72.c | 3 +- arch/arm/mach-pxa/pcm027.c | 1 + arch/arm/mach-pxa/poodle.c | 9 +- arch/arm/mach-pxa/raumfeld.c | 3 + arch/arm/mach-pxa/reset.c | 7 +- arch/arm/mach-pxa/saar.c | 1 + arch/arm/mach-pxa/saarb.c | 1 + arch/arm/mach-pxa/spitz.c | 9 +- arch/arm/mach-pxa/stargate2.c | 2 + arch/arm/mach-pxa/tavorevb.c | 1 + arch/arm/mach-pxa/tavorevb3.c | 1 + arch/arm/mach-pxa/tosa.c | 5 +- arch/arm/mach-pxa/trizeps4.c | 2 + arch/arm/mach-pxa/viper.c | 1 + arch/arm/mach-pxa/vpac270.c | 3 +- arch/arm/mach-pxa/xcep.c | 1 + arch/arm/mach-pxa/z2.c | 1 + arch/arm/mach-pxa/zeus.c | 1 + arch/arm/mach-pxa/zylonite.c | 1 + arch/arm/mach-realview/core.h | 1 - arch/arm/mach-realview/include/mach/entry-macro.S | 2 - arch/arm/mach-realview/include/mach/system.h | 17 - arch/arm/mach-realview/include/mach/vmalloc.h | 21 - arch/arm/mach-realview/realview_eb.c | 10 +- arch/arm/mach-realview/realview_pb1176.c | 6 +- arch/arm/mach-realview/realview_pb11mp.c | 6 +- arch/arm/mach-realview/realview_pba8.c | 6 +- arch/arm/mach-realview/realview_pbx.c | 10 +- arch/arm/mach-rpc/include/mach/system.h | 14 - arch/arm/mach-rpc/include/mach/vmalloc.h | 10 - arch/arm/mach-rpc/riscpc.c | 12 + arch/arm/mach-s3c2410/include/mach/system-reset.h | 4 +- arch/arm/mach-s3c2410/include/mach/vmalloc.h | 20 - arch/arm/mach-s3c64xx/include/mach/entry-macro.S | 7 +- arch/arm/mach-s3c64xx/include/mach/system.h | 2 +- arch/arm/mach-s3c64xx/include/mach/vmalloc.h | 20 - arch/arm/mach-s3c64xx/mach-anw6410.c | 2 + arch/arm/mach-s3c64xx/mach-crag6410.c | 2 + arch/arm/mach-s3c64xx/mach-hmt.c | 2 + arch/arm/mach-s3c64xx/mach-mini6410.c | 2 + arch/arm/mach-s3c64xx/mach-ncp.c | 2 + arch/arm/mach-s3c64xx/mach-real6410.c | 2 + arch/arm/mach-s3c64xx/mach-smartq5.c | 2 + arch/arm/mach-s3c64xx/mach-smartq7.c | 2 + arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 + arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 + arch/arm/mach-s5p64x0/include/mach/entry-macro.S | 7 +- arch/arm/mach-s5p64x0/include/mach/vmalloc.h | 20 - arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 + arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 + arch/arm/mach-s5pc100/include/mach/entry-macro.S | 25 - arch/arm/mach-s5pc100/include/mach/vmalloc.h | 17 - arch/arm/mach-s5pc100/mach-smdkc100.c | 2 + arch/arm/mach-s5pv210/include/mach/entry-macro.S | 37 -- arch/arm/mach-s5pv210/include/mach/vmalloc.h | 22 - arch/arm/mach-s5pv210/mach-aquila.c | 2 + arch/arm/mach-s5pv210/mach-goni.c | 2 + arch/arm/mach-s5pv210/mach-smdkc110.c | 2 + arch/arm/mach-s5pv210/mach-smdkv210.c | 2 + arch/arm/mach-s5pv210/mach-torbreck.c | 2 + arch/arm/mach-sa1100/assabet.c | 1 + arch/arm/mach-sa1100/badge4.c | 1 + arch/arm/mach-sa1100/cerf.c | 1 + arch/arm/mach-sa1100/collie.c | 1 + arch/arm/mach-sa1100/generic.c | 11 + arch/arm/mach-sa1100/generic.h | 1 + arch/arm/mach-sa1100/h3100.c | 1 + arch/arm/mach-sa1100/h3600.c | 1 + arch/arm/mach-sa1100/hackkit.c | 1 + arch/arm/mach-sa1100/include/mach/system.h | 13 - arch/arm/mach-sa1100/include/mach/vmalloc.h | 4 - arch/arm/mach-sa1100/jornada720.c | 1 + arch/arm/mach-sa1100/lart.c | 1 + arch/arm/mach-sa1100/nanoengine.c | 1 + arch/arm/mach-sa1100/pleb.c | 1 + arch/arm/mach-sa1100/shannon.c | 1 + arch/arm/mach-sa1100/simpad.c | 1 + arch/arm/mach-shark/core.c | 4 +- arch/arm/mach-shark/include/mach/system.h | 3 - arch/arm/mach-shark/include/mach/vmalloc.h | 4 - arch/arm/mach-shmobile/Makefile | 1 - arch/arm/mach-shmobile/board-ag5evm.c | 2 +- arch/arm/mach-shmobile/board-kota2.c | 2 +- arch/arm/mach-shmobile/entry-gic.S | 18 - arch/arm/mach-shmobile/include/mach/common.h | 1 - arch/arm/mach-shmobile/include/mach/entry-macro.S | 9 - arch/arm/mach-shmobile/include/mach/system.h | 2 +- arch/arm/mach-shmobile/include/mach/vmalloc.h | 7 - arch/arm/mach-spear3xx/include/mach/entry-macro.S | 27 - arch/arm/mach-spear3xx/include/mach/generic.h | 2 + arch/arm/mach-spear3xx/include/mach/vmalloc.h | 19 - arch/arm/mach-spear3xx/spear300_evb.c | 3 + arch/arm/mach-spear3xx/spear310_evb.c | 3 + arch/arm/mach-spear3xx/spear320_evb.c | 3 + arch/arm/mach-spear6xx/include/mach/entry-macro.S | 36 -- arch/arm/mach-spear6xx/include/mach/generic.h | 2 + arch/arm/mach-spear6xx/include/mach/vmalloc.h | 19 - arch/arm/mach-spear6xx/spear600_evb.c | 3 + arch/arm/mach-tegra/board-dt.c | 3 + arch/arm/mach-tegra/board-harmony.c | 3 + arch/arm/mach-tegra/board-paz00.c | 3 + arch/arm/mach-tegra/board-seaboard.c | 7 + arch/arm/mach-tegra/board-trimslice.c | 3 + arch/arm/mach-tegra/common.c | 2 - arch/arm/mach-tegra/include/mach/entry-macro.S | 22 +- arch/arm/mach-tegra/include/mach/io.h | 6 - arch/arm/mach-tegra/include/mach/system.h | 4 - arch/arm/mach-tegra/include/mach/vmalloc.h | 28 - arch/arm/mach-tegra/io.c | 21 - arch/arm/mach-u300/core.c | 20 + arch/arm/mach-u300/include/mach/entry-macro.S | 24 - arch/arm/mach-u300/include/mach/platform.h | 1 + arch/arm/mach-u300/include/mach/system.h | 28 - arch/arm/mach-u300/include/mach/vmalloc.h | 12 - arch/arm/mach-u300/u300.c | 3 + arch/arm/mach-ux500/board-mop500.c | 4 + arch/arm/mach-ux500/board-u5500.c | 2 + arch/arm/mach-ux500/include/mach/entry-macro.S | 2 - arch/arm/mach-ux500/include/mach/system.h | 5 - arch/arm/mach-ux500/include/mach/vmalloc.h | 18 - arch/arm/mach-versatile/core.c | 18 +- arch/arm/mach-versatile/core.h | 1 + arch/arm/mach-versatile/include/mach/entry-macro.S | 30 - arch/arm/mach-versatile/include/mach/system.h | 16 - arch/arm/mach-versatile/include/mach/vmalloc.h | 21 - arch/arm/mach-versatile/versatile_ab.c | 3 + arch/arm/mach-versatile/versatile_dt.c | 3 + arch/arm/mach-versatile/versatile_pb.c | 3 + arch/arm/mach-vexpress/include/mach/entry-macro.S | 2 - arch/arm/mach-vexpress/include/mach/system.h | 4 - arch/arm/mach-vexpress/include/mach/vmalloc.h | 21 - arch/arm/mach-vexpress/v2m.c | 4 +- arch/arm/mach-vt8500/include/mach/vmalloc.h | 20 - arch/arm/mach-w90x900/cpu.c | 16 + arch/arm/mach-w90x900/include/mach/system.h | 22 - arch/arm/mach-w90x900/include/mach/vmalloc.h | 23 - arch/arm/mach-w90x900/irq.c | 2 + arch/arm/mach-w90x900/mach-nuc910evb.c | 1 + arch/arm/mach-w90x900/mach-nuc950evb.c | 1 + arch/arm/mach-w90x900/mach-nuc960evb.c | 1 + arch/arm/mach-w90x900/nuc910.h | 9 +- arch/arm/mach-w90x900/nuc950.h | 9 +- arch/arm/mach-w90x900/nuc960.h | 9 +- arch/arm/mach-w90x900/nuc9xx.h | 24 + arch/arm/mach-w90x900/time.c | 2 + arch/arm/mach-zynq/common.c | 1 + arch/arm/mach-zynq/include/mach/entry-macro.S | 3 - arch/arm/mach-zynq/include/mach/system.h | 5 - arch/arm/mach-zynq/include/mach/vmalloc.h | 20 - arch/arm/mm/idmap.c | 2 +- arch/arm/mm/init.c | 40 +- arch/arm/mm/ioremap.c | 82 ++- arch/arm/mm/mm.h | 14 + arch/arm/mm/mmu.c | 50 ++- arch/arm/mm/nommu.c | 4 +- arch/arm/plat-iop/Makefile | 4 +- arch/arm/plat-iop/io.c | 59 -- arch/arm/plat-iop/restart.c | 19 + arch/arm/plat-mxc/Makefile | 1 - arch/arm/plat-mxc/gic.c | 41 -- arch/arm/plat-mxc/include/mach/common.h | 3 +- arch/arm/plat-mxc/include/mach/entry-macro.S | 11 - arch/arm/plat-mxc/include/mach/mx1.h | 2 - arch/arm/plat-mxc/include/mach/system.h | 2 - arch/arm/plat-mxc/include/mach/vmalloc.h | 22 - arch/arm/plat-mxc/system.c | 11 +- arch/arm/plat-omap/Makefile | 2 +- arch/arm/plat-omap/common.c | 7 + arch/arm/plat-omap/include/plat/common.h | 82 --- arch/arm/plat-omap/include/plat/io.h | 76 --- arch/arm/plat-omap/include/plat/irqs.h | 14 - arch/arm/plat-omap/include/plat/system.h | 2 - arch/arm/plat-omap/io.c | 159 ----- arch/arm/plat-s3c24xx/cpu.c | 23 - arch/arm/plat-s5p/Kconfig | 1 + arch/arm/plat-spear/Makefile | 2 +- arch/arm/plat-spear/include/plat/system.h | 15 - arch/arm/plat-spear/include/plat/vmalloc.h | 19 - arch/arm/plat-spear/restart.c | 27 + arch/arm/plat-tcc/include/mach/vmalloc.h | 10 - arch/arm/tools/mach-types | 632 +++++++++++--------- include/linux/vmalloc.h | 1 + mm/vmalloc.c | 29 +- 645 files changed, 2505 insertions(+), 3871 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/vic.txt delete mode 100644 arch/arm/include/asm/entry-macro-vic2.S delete mode 100644 arch/arm/include/asm/hardware/entry-macro-gic.S delete mode 100644 arch/arm/mach-at91/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-bcmring/include/mach/vmalloc.h rename arch/arm/mach-clps711x/{irq.c => common.c} (58%) delete mode 100644 arch/arm/mach-clps711x/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-clps711x/mm.c delete mode 100644 arch/arm/mach-clps711x/time.c delete mode 100644 arch/arm/mach-cns3xxx/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-davinci/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-davinci/io.c delete mode 100644 arch/arm/mach-dove/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-ebsa110/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-ep93xx/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-exynos/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-footbridge/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-gemini/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-h720x/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-highbank/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-integrator/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-iop32x/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-iop33x/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-ixp2000/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-ixp23xx/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-ixp4xx/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-kirkwood/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-ks8695/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-lpc32xx/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-mmp/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-msm/include/mach/entry-macro-qgic.S delete mode 100644 arch/arm/mach-msm/include/mach/entry-macro-vic.S delete mode 100644 arch/arm/mach-msm/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-mv78xx0/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-mxs/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-netx/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-nomadik/include/mach/vmalloc.h create mode 100644 arch/arm/mach-omap1/common.h delete mode 100644 arch/arm/mach-omap1/include/mach/vmalloc.h create mode 100644 arch/arm/mach-omap2/common.h delete mode 100644 arch/arm/mach-omap2/include/mach/omap4-common.h delete mode 100644 arch/arm/mach-omap2/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-orion5x/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-picoxcell/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-pnx4008/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-prima2/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-pxa/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-realview/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-rpc/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-s3c2410/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-s3c64xx/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-s5pc100/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-sa1100/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-shark/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-shmobile/entry-gic.S delete mode 100644 arch/arm/mach-shmobile/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-spear3xx/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-spear6xx/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-tegra/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-u300/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-ux500/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-versatile/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-vexpress/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-vt8500/include/mach/vmalloc.h delete mode 100644 arch/arm/mach-w90x900/include/mach/vmalloc.h create mode 100644 arch/arm/mach-w90x900/nuc9xx.h delete mode 100644 arch/arm/mach-zynq/include/mach/vmalloc.h delete mode 100644 arch/arm/plat-iop/io.c create mode 100644 arch/arm/plat-iop/restart.c delete mode 100644 arch/arm/plat-mxc/gic.c delete mode 100644 arch/arm/plat-mxc/include/mach/vmalloc.h delete mode 100644 arch/arm/plat-omap/io.c delete mode 100644 arch/arm/plat-spear/include/plat/vmalloc.h create mode 100644 arch/arm/plat-spear/restart.c delete mode 100644 arch/arm/plat-tcc/include/mach/vmalloc.h Merging arm-lpae/for-next (b0d153e ARM: LPAE: Add the Kconfig entries) $ git merge arm-lpae/for-next Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution. Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution. Resolved 'arch/arm/include/asm/tlb.h' using previous resolution. Resolved 'arch/arm/mm/ioremap.c' using previous resolution. Auto-merging arch/arm/mm/mmu.c Auto-merging arch/arm/mm/ioremap.c CONFLICT (content): Merge conflict in arch/arm/mm/ioremap.c Auto-merging arch/arm/mm/idmap.c Auto-merging arch/arm/kernel/head.S Auto-merging arch/arm/include/asm/tlb.h CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h Auto-merging arch/arm/include/asm/system.h Auto-merging arch/arm/include/asm/pgtable.h CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h Auto-merging arch/arm/include/asm/pgalloc.h CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h Auto-merging arch/arm/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 9bd7a14] Merge remote-tracking branch 'arm-lpae/for-next' $ git diff -M --stat --summary HEAD^.. arch/arm/Kconfig | 2 +- arch/arm/boot/compressed/head.S | 1 + arch/arm/include/asm/assembler.h | 11 ++ arch/arm/include/asm/page.h | 4 + arch/arm/include/asm/pgalloc.h | 24 ++++ arch/arm/include/asm/pgtable-2level.h | 41 ++++++ arch/arm/include/asm/pgtable-3level-hwdef.h | 77 ++++++++++++ arch/arm/include/asm/pgtable-3level-types.h | 70 +++++++++++ arch/arm/include/asm/pgtable-3level.h | 155 +++++++++++++++++++++++ arch/arm/include/asm/pgtable-hwdef.h | 4 + arch/arm/include/asm/pgtable.h | 42 +------ arch/arm/include/asm/proc-fns.h | 21 +++ arch/arm/include/asm/system.h | 8 ++ arch/arm/include/asm/tlb.h | 11 ++- arch/arm/kernel/head.S | 47 +++++++- arch/arm/kernel/hw_breakpoint.c | 8 +- arch/arm/kernel/sleep.S | 2 + arch/arm/mm/Kconfig | 17 +++ arch/arm/mm/alignment.c | 2 +- arch/arm/mm/context.c | 19 +++- arch/arm/mm/fault.c | 111 +++-------------- arch/arm/mm/fault.h | 27 ++++- arch/arm/mm/fsr-2level.c | 78 ++++++++++++ arch/arm/mm/fsr-3level.c | 68 ++++++++++ arch/arm/mm/idmap.c | 34 +++++- arch/arm/mm/ioremap.c | 39 ++++--- arch/arm/mm/mmu.c | 46 +++++++- arch/arm/mm/pgd.c | 51 +++++++- arch/arm/mm/proc-macros.S | 5 +- arch/arm/mm/proc-v7-2level.S | 171 ++++++++++++++++++++++++++ arch/arm/mm/proc-v7-3level.S | 151 +++++++++++++++++++++++ arch/arm/mm/proc-v7.S | 177 +++------------------------ 32 files changed, 1201 insertions(+), 323 deletions(-) create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h create mode 100644 arch/arm/include/asm/pgtable-3level-types.h create mode 100644 arch/arm/include/asm/pgtable-3level.h create mode 100644 arch/arm/mm/fsr-2level.c create mode 100644 arch/arm/mm/fsr-3level.c create mode 100644 arch/arm/mm/proc-v7-2level.S create mode 100644 arch/arm/mm/proc-v7-3level.S Merging arm-soc/for-next (7958e98 Merge branch 'next/timer' into for-next) $ git merge arm-soc/for-next Auto-merging arch/arm/tools/mach-types CONFLICT (content): Merge conflict in arch/arm/tools/mach-types Removing arch/arm/plat-pxa/include/plat/gpio.h Removing arch/arm/plat-pxa/include/plat/gpio-pxa.h Auto-merging arch/arm/plat-omap/include/plat/common.h CONFLICT (content): Merge conflict in arch/arm/plat-omap/include/plat/common.h Auto-merging arch/arm/plat-mxc/system.c Auto-merging arch/arm/plat-mxc/include/mach/system.h Auto-merging arch/arm/plat-mxc/include/mach/common.h Auto-merging arch/arm/mach-pxa/zylonite.c Auto-merging arch/arm/mach-pxa/zeus.c Auto-merging arch/arm/mach-pxa/z2.c Auto-merging arch/arm/mach-pxa/vpac270.c Auto-merging arch/arm/mach-pxa/viper.c Auto-merging arch/arm/mach-pxa/tosa.c Auto-merging arch/arm/mach-pxa/tavorevb3.c Auto-merging arch/arm/mach-pxa/tavorevb.c Auto-merging arch/arm/mach-pxa/stargate2.c Auto-merging arch/arm/mach-pxa/spitz.c Auto-merging arch/arm/mach-pxa/saarb.c Auto-merging arch/arm/mach-pxa/saar.c Auto-merging arch/arm/mach-pxa/raumfeld.c Auto-merging arch/arm/mach-pxa/poodle.c Auto-merging arch/arm/mach-pxa/palmtc.c Auto-merging arch/arm/mach-pxa/mioa701.c Auto-merging arch/arm/mach-pxa/mainstone.c Auto-merging arch/arm/mach-pxa/magician.c Auto-merging arch/arm/mach-pxa/lubbock.c Auto-merging arch/arm/mach-pxa/lpd270.c Auto-merging arch/arm/mach-pxa/littleton.c Removing arch/arm/mach-pxa/include/mach/gpio-pxa.h Auto-merging arch/arm/mach-pxa/idp.c Auto-merging arch/arm/mach-pxa/icontrol.c Auto-merging arch/arm/mach-pxa/hx4700.c Auto-merging arch/arm/mach-pxa/gumstix.c Auto-merging arch/arm/mach-pxa/eseries.c Auto-merging arch/arm/mach-pxa/em-x270.c Auto-merging arch/arm/mach-pxa/corgi.c Auto-merging arch/arm/mach-pxa/colibri-pxa320.c Auto-merging arch/arm/mach-pxa/colibri-pxa300.c Auto-merging arch/arm/mach-pxa/colibri-pxa270.c Auto-merging arch/arm/mach-pxa/cm-x300.c Auto-merging arch/arm/mach-pxa/cm-x2xx.c Auto-merging arch/arm/mach-pxa/capc7117.c Auto-merging arch/arm/mach-pxa/balloon3.c Auto-merging arch/arm/mach-omap2/smartreflex.c Auto-merging arch/arm/mach-omap2/pm.c Auto-merging arch/arm/mach-omap2/omap_hwmod.c Removing arch/arm/mach-omap2/io.h Auto-merging arch/arm/mach-omap2/Kconfig Auto-merging arch/arm/mach-omap1/devices.c Auto-merging arch/arm/mach-omap1/board-ams-delta.c Removing arch/arm/mach-mx5/pm-imx5.c Removing arch/arm/mach-mx5/Makefile.boot Removing arch/arm/mach-mx5/Makefile Removing arch/arm/mach-mx5/Kconfig Auto-merging arch/arm/mach-mmp/ttc_dkb.c Auto-merging arch/arm/mach-mmp/teton_bga.c Auto-merging arch/arm/mach-mmp/tavorevb.c Auto-merging arch/arm/mach-mmp/pxa168.c Auto-merging arch/arm/mach-mmp/include/mach/pxa168.h Auto-merging arch/arm/mach-mmp/gplugd.c Auto-merging arch/arm/mach-mmp/flint.c Auto-merging arch/arm/mach-mmp/brownstone.c Auto-merging arch/arm/mach-mmp/avengers_lite.c Auto-merging arch/arm/mach-mmp/aspenite.c Auto-merging arch/arm/mach-imx/pm-imx5.c Auto-merging arch/arm/mach-imx/mm-imx5.c Auto-merging arch/arm/mach-imx/mach-mx53_smd.c Auto-merging arch/arm/mach-imx/mach-mx53_loco.c Auto-merging arch/arm/mach-imx/mach-mx53_evk.c Auto-merging arch/arm/mach-imx/mach-mx53_ard.c Auto-merging arch/arm/mach-imx/mach-imx6q.c Auto-merging arch/arm/mach-imx/cpu-imx5.c Auto-merging arch/arm/mach-imx/clock-mx51-mx53.c Auto-merging arch/arm/mach-highbank/highbank.c Auto-merging arch/arm/mach-at91/setup.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/setup.c Auto-merging arch/arm/mach-at91/generic.h Auto-merging arch/arm/mach-at91/at91sam9rl.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9rl.c Auto-merging arch/arm/mach-at91/at91sam9g45.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c Auto-merging arch/arm/mach-at91/at91sam9263.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9263.c Auto-merging arch/arm/mach-at91/at91sam9261.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9261.c Auto-merging arch/arm/mach-at91/at91sam9260.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c Auto-merging arch/arm/mach-at91/at91rm9200.c Auto-merging arcResolved 'arch/arm/mach-at91/at91cap9.c' using previous resolution. Resolved 'arch/arm/mach-at91/at91sam9260.c' using previous resolution. Resolved 'arch/arm/mach-at91/at91sam9261.c' using previous resolution. Resolved 'arch/arm/mach-at91/at91sam9263.c' using previous resolution. Resolved 'arch/arm/mach-at91/at91sam9g45.c' using previous resolution. Resolved 'arch/arm/mach-at91/at91sam9rl.c' using previous resolution. Resolved 'arch/arm/mach-at91/setup.c' using previous resolution. Resolved 'arch/arm/plat-omap/include/plat/common.h' using previous resolution. Resolved 'arch/arm/tools/mach-types' using previous resolution. h/arm/mach-at91/at91cap9.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91cap9.c Removing arch/arm/configs/mx3_defconfig Auto-merging arch/arm/configs/imx_v6_v7_defconfig Auto-merging arch/arm/configs/at91sam9rl_defconfig Auto-merging arch/arm/configs/at91sam9g20_defconfig Auto-merging arch/arm/configs/at91sam9260_defconfig Auto-merging arch/arm/configs/at91cap9_defconfig Auto-merging arch/arm/Kconfig Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master d42ccd7] Merge remote-tracking branch 'arm-soc/for-next' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 8 + arch/arm/Kconfig | 2 + arch/arm/Kconfig.debug | 8 + arch/arm/Makefile | 1 - arch/arm/arm-soc-for-next-contents.txt | 20 + .../{at91cap9adk_defconfig => at91cap9_defconfig} | 7 - arch/arm/configs/at91rm9200_defconfig | 47 +-- ...91sam9260ek_defconfig => at91sam9260_defconfig} | 16 +- ...91sam9g20ek_defconfig => at91sam9g20_defconfig} | 23 +- arch/arm/configs/at91sam9g45_defconfig | 7 +- ...at91sam9rlek_defconfig => at91sam9rl_defconfig} | 5 - arch/arm/configs/ezx_defconfig | 2 +- arch/arm/configs/imote2_defconfig | 2 +- .../configs/{mx5_defconfig => imx_v6_v7_defconfig} | 61 ++-- arch/arm/configs/magician_defconfig | 2 +- arch/arm/configs/mx3_defconfig | 144 -------- arch/arm/configs/omap1_defconfig | 1 - arch/arm/configs/zeus_defconfig | 2 +- arch/arm/mach-at91/Kconfig | 24 ++- arch/arm/mach-at91/at91cap9.c | 40 ++- arch/arm/mach-at91/at91cap9_devices.c | 49 ++- arch/arm/mach-at91/at91rm9200.c | 24 +- arch/arm/mach-at91/at91rm9200_devices.c | 48 ++- arch/arm/mach-at91/at91rm9200_time.c | 8 +- arch/arm/mach-at91/at91sam9260.c | 36 +- arch/arm/mach-at91/at91sam9260_devices.c | 55 ++-- arch/arm/mach-at91/at91sam9261.c | 32 +- arch/arm/mach-at91/at91sam9261_devices.c | 33 ++- arch/arm/mach-at91/at91sam9263.c | 45 ++-- arch/arm/mach-at91/at91sam9263_devices.c | 59 ++-- arch/arm/mach-at91/at91sam926x_time.c | 38 ++- arch/arm/mach-at91/at91sam9g45.c | 44 ++-- arch/arm/mach-at91/at91sam9g45_devices.c | 69 +++-- arch/arm/mach-at91/at91sam9rl.c | 36 +- arch/arm/mach-at91/at91sam9rl_devices.c | 43 ++- arch/arm/mach-at91/board-1arm.c | 4 +- arch/arm/mach-at91/board-afeb-9260v1.c | 10 +- arch/arm/mach-at91/board-cam60.c | 8 +- arch/arm/mach-at91/board-cap9adk.c | 21 +- arch/arm/mach-at91/board-carmeva.c | 9 +- arch/arm/mach-at91/board-cpu9krea.c | 14 +- arch/arm/mach-at91/board-cpuat91.c | 7 +- arch/arm/mach-at91/board-csb337.c | 7 +- arch/arm/mach-at91/board-csb637.c | 4 +- arch/arm/mach-at91/board-dt.c | 3 +- arch/arm/mach-at91/board-eb9200.c | 11 +- arch/arm/mach-at91/board-ecbat91.c | 7 +- arch/arm/mach-at91/board-eco920.c | 7 +- arch/arm/mach-at91/board-flexibity.c | 5 +- arch/arm/mach-at91/board-foxg20.c | 9 +- arch/arm/mach-at91/board-gsia18s.c | 7 +- arch/arm/mach-at91/board-kafa.c | 4 +- arch/arm/mach-at91/board-kb9202.c | 8 +- arch/arm/mach-at91/board-neocore926.c | 9 +- arch/arm/mach-at91/board-pcontrol-g20.c | 8 +- arch/arm/mach-at91/board-picotux200.c | 5 +- arch/arm/mach-at91/board-qil-a9260.c | 18 +- arch/arm/mach-at91/board-rm9200dk.c | 13 +- arch/arm/mach-at91/board-rm9200ek.c | 5 +- arch/arm/mach-at91/board-rsi-ews.c | 4 +- arch/arm/mach-at91/board-sam9-l9260.c | 12 +- arch/arm/mach-at91/board-sam9260ek.c | 16 +- arch/arm/mach-at91/board-sam9261ek.c | 13 +- arch/arm/mach-at91/board-sam9263ek.c | 12 +- arch/arm/mach-at91/board-sam9g20ek.c | 13 +- arch/arm/mach-at91/board-sam9m10g45ek.c | 8 +- arch/arm/mach-at91/board-sam9rlek.c | 9 +- arch/arm/mach-at91/board-snapper9260.c | 10 +- arch/arm/mach-at91/board-stamp9g20.c | 16 +- arch/arm/mach-at91/board-usb-a926x.c | 14 +- arch/arm/mach-at91/board-yl-9200.c | 9 +- arch/arm/mach-at91/generic.h | 7 +- arch/arm/mach-at91/gpio.c | 85 +++-- arch/arm/mach-at91/include/mach/at91_aic.h | 48 ++- arch/arm/mach-at91/include/mach/at91_dbgu.h | 2 +- arch/arm/mach-at91/include/mach/at91_pit.h | 8 +- arch/arm/mach-at91/include/mach/at91_rtc.h | 24 +- arch/arm/mach-at91/include/mach/at91_shdwc.h | 16 +- arch/arm/mach-at91/include/mach/at91cap9.h | 27 +- arch/arm/mach-at91/include/mach/at91rm9200.h | 14 +- arch/arm/mach-at91/include/mach/at91sam9260.h | 23 +- arch/arm/mach-at91/include/mach/at91sam9261.h | 20 +- arch/arm/mach-at91/include/mach/at91sam9263.h | 33 +- arch/arm/mach-at91/include/mach/at91sam9_smc.h | 17 +- arch/arm/mach-at91/include/mach/at91sam9g45.h | 30 +- arch/arm/mach-at91/include/mach/at91sam9rl.h | 29 +- arch/arm/mach-at91/include/mach/at91x40.h | 1 - arch/arm/mach-at91/include/mach/board.h | 42 +-- arch/arm/mach-at91/include/mach/debug-macro.S | 10 +- arch/arm/mach-at91/include/mach/entry-macro.S | 11 +- arch/arm/mach-at91/include/mach/gpio.h | 336 +++++++++--------- arch/arm/mach-at91/include/mach/hardware.h | 12 + arch/arm/mach-at91/include/mach/irqs.h | 2 +- arch/arm/mach-at91/include/mach/timex.h | 65 +--- arch/arm/mach-at91/include/mach/uncompress.h | 6 +- arch/arm/mach-at91/irq.c | 38 ++- arch/arm/mach-at91/pm.c | 11 +- arch/arm/mach-at91/sam9_smc.c | 62 +++-- arch/arm/mach-at91/sam9_smc.h | 3 +- arch/arm/mach-at91/setup.c | 26 ++- arch/arm/mach-at91/soc.h | 1 + arch/arm/mach-exynos/cpuidle.c | 2 + arch/arm/mach-highbank/highbank.c | 4 + arch/arm/mach-imx/Kconfig | 244 ++++++++++++- arch/arm/mach-imx/Makefile | 21 ++ arch/arm/mach-imx/Makefile.boot | 12 + arch/arm/mach-imx/clock-imx6q.c | 7 +- arch/arm/{mach-mx5 => mach-imx}/clock-mx51-mx53.c | 2 +- arch/arm/{mach-mx5/cpu.c => mach-imx/cpu-imx5.c} | 5 +- arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.c | 0 arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.h | 0 .../crm_regs.h => mach-imx/crm-regs-imx5.h} | 0 arch/arm/{mach-mx5 => mach-imx}/devices-imx50.h | 0 arch/arm/{mach-mx5 => mach-imx}/devices-imx51.h | 0 arch/arm/{mach-mx5 => mach-imx}/devices-imx53.h | 0 arch/arm/{mach-mx5 => mach-imx}/efika.h | 0 arch/arm/{mach-mx5/ehci.c => mach-imx/ehci-imx5.c} | 0 .../eukrea_mbimx51-baseboard.c | 0 .../eukrea_mbimxsd-baseboard.c | 0 arch/arm/{mach-mx5 => mach-imx}/imx51-dt.c | 0 arch/arm/{mach-mx5 => mach-imx}/imx53-dt.c | 0 .../board-cpuimx51.c => mach-imx/mach-cpuimx51.c} | 0 .../mach-cpuimx51sd.c} | 0 arch/arm/mach-imx/mach-imx6q.c | 1 + .../board-mx50_rdp.c => mach-imx/mach-mx50_rdp.c} | 0 .../board-mx51_3ds.c => mach-imx/mach-mx51_3ds.c} | 0 .../mach-mx51_babbage.c} | 0 .../mach-mx51_efikamx.c} | 0 .../mach-mx51_efikasb.c} | 0 .../board-mx53_ard.c => mach-imx/mach-mx53_ard.c} | 1 - .../board-mx53_evk.c => mach-imx/mach-mx53_evk.c} | 1 - .../mach-mx53_loco.c} | 1 - .../board-mx53_smd.c => mach-imx/mach-mx53_smd.c} | 1 - arch/arm/mach-imx/mm-imx3.c | 109 +++--- arch/arm/{mach-mx5/mm.c => mach-imx/mm-imx5.c} | 6 +- arch/arm/{mach-mx5 => mach-imx}/mx51_efika.c | 0 arch/arm/{mach-mx5/system.c => mach-imx/pm-imx5.c} | 89 ++++- arch/arm/mach-imx/src.c | 7 + arch/arm/mach-mmp/aspenite.c | 5 +- arch/arm/mach-mmp/avengers_lite.c | 1 + arch/arm/mach-mmp/brownstone.c | 1 + arch/arm/mach-mmp/flint.c | 5 +- arch/arm/mach-mmp/gplugd.c | 3 +- arch/arm/mach-mmp/include/mach/gpio-pxa.h | 5 +- arch/arm/mach-mmp/include/mach/gpio.h | 7 +- arch/arm/mach-mmp/include/mach/irqs.h | 6 +- arch/arm/mach-mmp/include/mach/mmp2.h | 2 + arch/arm/mach-mmp/include/mach/pxa168.h | 2 + arch/arm/mach-mmp/include/mach/pxa910.h | 2 + arch/arm/mach-mmp/mmp2.c | 39 ++- arch/arm/mach-mmp/pxa168.c | 40 ++- arch/arm/mach-mmp/pxa910.c | 40 ++- arch/arm/mach-mmp/tavorevb.c | 6 +- arch/arm/mach-mmp/teton_bga.c | 3 +- arch/arm/mach-mmp/ttc_dkb.c | 8 +- arch/arm/mach-msm/timer.c | 347 +++++++------------ arch/arm/mach-mx5/Kconfig | 244 ------------- arch/arm/mach-mx5/Makefile | 26 -- arch/arm/mach-mx5/Makefile.boot | 9 - arch/arm/mach-mx5/pm-imx5.c | 83 ----- arch/arm/mach-mxs/clock-mx28.c | 2 +- arch/arm/mach-omap1/Kconfig | 8 - arch/arm/mach-omap1/board-ams-delta.c | 10 +- arch/arm/mach-omap1/clock.h | 3 +- arch/arm/mach-omap1/clock_data.c | 53 ++- arch/arm/mach-omap1/devices.c | 3 + arch/arm/mach-omap2/Kconfig | 1 + arch/arm/mach-omap2/Makefile | 5 +- arch/arm/mach-omap2/cpuidle34xx.c | 1 + arch/arm/mach-omap2/display.c | 159 ++++++++ arch/arm/mach-omap2/display.h | 29 ++ arch/arm/mach-omap2/omap_hwmod.c | 6 +- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 17 +- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 17 +- .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 5 +- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 37 ++- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 24 +- arch/arm/mach-omap2/omap_hwmod_common_data.c | 4 + arch/arm/mach-omap2/omap_hwmod_common_data.h | 4 + arch/arm/mach-omap2/omap_l3_noc.c | 2 +- arch/arm/mach-omap2/pm.c | 6 +- arch/arm/mach-omap2/smartreflex.c | 2 +- arch/arm/mach-omap2/twl-common.c | 11 + arch/arm/mach-omap2/twl-common.h | 3 + arch/arm/mach-pxa/am200epd.c | 4 +- arch/arm/mach-pxa/am300epd.c | 4 +- arch/arm/mach-pxa/balloon3.c | 4 +- arch/arm/mach-pxa/capc7117.c | 12 +- arch/arm/mach-pxa/cm-x270.c | 4 +- arch/arm/mach-pxa/cm-x2xx.c | 4 +- arch/arm/mach-pxa/cm-x300.c | 6 +- arch/arm/mach-pxa/colibri-pxa270.c | 6 +- arch/arm/mach-pxa/colibri-pxa300.c | 4 +- arch/arm/mach-pxa/colibri-pxa320.c | 6 +- arch/arm/mach-pxa/corgi.c | 2 +- arch/arm/mach-pxa/corgi_pm.c | 20 +- arch/arm/mach-pxa/devices.c | 30 ++ arch/arm/mach-pxa/devices.h | 1 + arch/arm/mach-pxa/em-x270.c | 6 +- arch/arm/mach-pxa/eseries.c | 4 +- arch/arm/mach-pxa/gumstix.c | 2 +- arch/arm/mach-pxa/hx4700.c | 18 +- arch/arm/mach-pxa/icontrol.c | 8 +- arch/arm/mach-pxa/idp.c | 4 +- arch/arm/mach-pxa/include/mach/balloon3.h | 6 +- arch/arm/mach-pxa/include/mach/corgi.h | 26 +- arch/arm/mach-pxa/include/mach/csb726.h | 4 +- arch/arm/mach-pxa/include/mach/gpio-pxa.h | 133 ------- arch/arm/mach-pxa/include/mach/gpio.h | 20 +- arch/arm/mach-pxa/include/mach/gumstix.h | 20 +- arch/arm/mach-pxa/include/mach/hx4700.h | 2 +- arch/arm/mach-pxa/include/mach/idp.h | 16 +- arch/arm/mach-pxa/include/mach/irqs.h | 8 +- arch/arm/mach-pxa/include/mach/littleton.h | 4 +- arch/arm/mach-pxa/include/mach/magician.h | 2 +- arch/arm/mach-pxa/include/mach/palm27x.h | 4 +- arch/arm/mach-pxa/include/mach/palmld.h | 8 +- arch/arm/mach-pxa/include/mach/palmt5.h | 8 +- arch/arm/mach-pxa/include/mach/palmtc.h | 4 +- arch/arm/mach-pxa/include/mach/palmtx.h | 8 +- arch/arm/mach-pxa/include/mach/pcm027.h | 8 +- arch/arm/mach-pxa/include/mach/pcm990_baseboard.h | 14 +- arch/arm/mach-pxa/include/mach/poodle.h | 26 +- arch/arm/mach-pxa/include/mach/spitz.h | 40 +- arch/arm/mach-pxa/include/mach/tosa.h | 54 ++-- arch/arm/mach-pxa/include/mach/trizeps4.h | 16 +- arch/arm/mach-pxa/irq.c | 61 +--- arch/arm/mach-pxa/littleton.c | 6 +- arch/arm/mach-pxa/lpd270.c | 4 +- arch/arm/mach-pxa/lubbock.c | 4 +- arch/arm/mach-pxa/magician.c | 8 +- arch/arm/mach-pxa/mainstone.c | 4 +- arch/arm/mach-pxa/mfp-pxa2xx.c | 6 +- arch/arm/mach-pxa/mioa701.c | 8 +- arch/arm/mach-pxa/mxm8x10.c | 4 +- arch/arm/mach-pxa/palm27x.c | 4 +- arch/arm/mach-pxa/palmtc.c | 2 +- arch/arm/mach-pxa/pcm990-baseboard.c | 6 +- arch/arm/mach-pxa/poodle.c | 6 +- arch/arm/mach-pxa/pxa25x.c | 6 +- arch/arm/mach-pxa/pxa27x.c | 6 +- arch/arm/mach-pxa/pxa3xx.c | 8 +- arch/arm/mach-pxa/pxa95x.c | 5 +- arch/arm/mach-pxa/raumfeld.c | 8 +- arch/arm/mach-pxa/saar.c | 6 +- arch/arm/mach-pxa/saarb.c | 2 +- arch/arm/mach-pxa/sharpsl_pm.c | 24 +- arch/arm/mach-pxa/spitz.c | 2 +- arch/arm/mach-pxa/spitz_pm.c | 10 +- arch/arm/mach-pxa/stargate2.c | 26 +- arch/arm/mach-pxa/tavorevb.c | 4 +- arch/arm/mach-pxa/tavorevb3.c | 2 +- arch/arm/mach-pxa/tosa.c | 4 +- arch/arm/mach-pxa/viper.c | 12 +- arch/arm/mach-pxa/vpac270.c | 12 +- arch/arm/mach-pxa/z2.c | 2 +- arch/arm/mach-pxa/zeus.c | 20 +- arch/arm/mach-pxa/zylonite.c | 4 +- arch/arm/mach-pxa/zylonite_pxa300.c | 4 +- arch/arm/mach-s3c64xx/mach-crag6410-module.c | 2 +- arch/arm/plat-mxc/Kconfig | 15 +- arch/arm/plat-mxc/include/mach/common.h | 2 +- arch/arm/plat-mxc/include/mach/mxc.h | 14 - arch/arm/plat-mxc/include/mach/system.h | 7 +- arch/arm/plat-mxc/system.c | 3 +- arch/arm/plat-omap/include/plat/clock.h | 2 +- arch/arm/plat-omap/include/plat/common.h | 4 + arch/arm/plat-pxa/include/plat/gpio-pxa.h | 44 --- arch/arm/plat-pxa/include/plat/gpio.h | 30 -- arch/arm/plat-s3c24xx/cpu-freq-debugfs.c | 2 +- arch/arm/plat-s5p/sysmmu.c | 1 + arch/arm/plat-samsung/include/plat/gpio-cfg.h | 2 + arch/arm/plat-samsung/pd.c | 2 +- arch/arm/plat-samsung/pwm.c | 2 +- arch/avr32/boards/atngw100/setup.c | 2 +- arch/avr32/boards/atstk1000/atstk1002.c | 2 +- arch/avr32/boards/favr-32/setup.c | 2 +- arch/avr32/boards/hammerhead/setup.c | 2 +- arch/avr32/boards/merisc/setup.c | 2 +- arch/avr32/boards/mimc200/setup.c | 2 +- arch/avr32/mach-at32ap/at32ap700x.c | 8 +- arch/avr32/mach-at32ap/include/mach/board.h | 7 +- drivers/ata/pata_at91.c | 6 +- drivers/gpio/Kconfig | 6 + drivers/gpio/Makefile | 2 +- drivers/gpio/gpio-pxa.c | 377 +++++++++++++++++--- drivers/ide/at91_ide.c | 2 +- drivers/mmc/host/at91_mci.c | 30 +- drivers/mtd/nand/atmel_nand.c | 8 +- drivers/net/ethernet/Makefile | 2 +- drivers/net/ethernet/cadence/Kconfig | 16 +- drivers/net/ethernet/cadence/at91_ether.c | 3 +- drivers/net/ethernet/cadence/at91_ether.h | 4 +- drivers/net/ethernet/cadence/macb.c | 344 ++++++++++++------- drivers/net/ethernet/cadence/macb.h | 150 ++++++++- drivers/pcmcia/pxa2xx_cm_x255.c | 16 +- drivers/pcmcia/pxa2xx_cm_x270.c | 9 +- drivers/rtc/rtc-at91rm9200.c | 101 ++++-- drivers/usb/gadget/at91_udc.c | 14 +- drivers/usb/host/ohci-at91.c | 12 +- drivers/watchdog/at91sam9_wdt.c | 22 +- drivers/watchdog/at91sam9_wdt.h | 6 +- include/linux/gpio-pxa.h | 16 + include/linux/platform_data/macb.h | 17 + include/video/omapdss.h | 7 - 305 files changed, 3552 insertions(+), 2845 deletions(-) create mode 100644 arch/arm/arm-soc-for-next-contents.txt rename arch/arm/configs/{at91cap9adk_defconfig => at91cap9_defconfig} (93%) rename arch/arm/configs/{at91sam9260ek_defconfig => at91sam9260_defconfig} (86%) rename arch/arm/configs/{at91sam9g20ek_defconfig => at91sam9g20_defconfig} (90%) rename arch/arm/configs/{at91sam9rlek_defconfig => at91sam9rl_defconfig} (94%) rename arch/arm/configs/{mx5_defconfig => imx_v6_v7_defconfig} (80%) delete mode 100644 arch/arm/configs/mx3_defconfig rename arch/arm/{mach-mx5 => mach-imx}/clock-mx51-mx53.c (99%) rename arch/arm/{mach-mx5/cpu.c => mach-imx/cpu-imx5.c} (97%) rename arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.c (100%) rename arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.h (100%) rename arch/arm/{mach-mx5/crm_regs.h => mach-imx/crm-regs-imx5.h} (100%) rename arch/arm/{mach-mx5 => mach-imx}/devices-imx50.h (100%) rename arch/arm/{mach-mx5 => mach-imx}/devices-imx51.h (100%) rename arch/arm/{mach-mx5 => mach-imx}/devices-imx53.h (100%) rename arch/arm/{mach-mx5 => mach-imx}/efika.h (100%) rename arch/arm/{mach-mx5/ehci.c => mach-imx/ehci-imx5.c} (100%) rename arch/arm/{mach-mx5 => mach-imx}/eukrea_mbimx51-baseboard.c (100%) rename arch/arm/{mach-mx5 => mach-imx}/eukrea_mbimxsd-baseboard.c (100%) rename arch/arm/{mach-mx5 => mach-imx}/imx51-dt.c (100%) rename arch/arm/{mach-mx5 => mach-imx}/imx53-dt.c (100%) rename arch/arm/{mach-mx5/board-cpuimx51.c => mach-imx/mach-cpuimx51.c} (100%) rename arch/arm/{mach-mx5/board-cpuimx51sd.c => mach-imx/mach-cpuimx51sd.c} (100%) rename arch/arm/{mach-mx5/board-mx50_rdp.c => mach-imx/mach-mx50_rdp.c} (100%) rename arch/arm/{mach-mx5/board-mx51_3ds.c => mach-imx/mach-mx51_3ds.c} (100%) rename arch/arm/{mach-mx5/board-mx51_babbage.c => mach-imx/mach-mx51_babbage.c} (100%) rename arch/arm/{mach-mx5/board-mx51_efikamx.c => mach-imx/mach-mx51_efikamx.c} (100%) rename arch/arm/{mach-mx5/board-mx51_efikasb.c => mach-imx/mach-mx51_efikasb.c} (100%) rename arch/arm/{mach-mx5/board-mx53_ard.c => mach-imx/mach-mx53_ard.c} (99%) rename arch/arm/{mach-mx5/board-mx53_evk.c => mach-imx/mach-mx53_evk.c} (99%) rename arch/arm/{mach-mx5/board-mx53_loco.c => mach-imx/mach-mx53_loco.c} (99%) rename arch/arm/{mach-mx5/board-mx53_smd.c => mach-imx/mach-mx53_smd.c} (99%) rename arch/arm/{mach-mx5/mm.c => mach-imx/mm-imx5.c} (98%) rename arch/arm/{mach-mx5 => mach-imx}/mx51_efika.c (100%) rename arch/arm/{mach-mx5/system.c => mach-imx/pm-imx5.c} (58%) delete mode 100644 arch/arm/mach-mx5/Kconfig delete mode 100644 arch/arm/mach-mx5/Makefile delete mode 100644 arch/arm/mach-mx5/Makefile.boot delete mode 100644 arch/arm/mach-mx5/pm-imx5.c create mode 100644 arch/arm/mach-omap2/display.h delete mode 100644 arch/arm/mach-omap2/io.h delete mode 100644 arch/arm/mach-pxa/include/mach/gpio-pxa.h delete mode 100644 arch/arm/plat-pxa/include/plat/gpio-pxa.h delete mode 100644 arch/arm/plat-pxa/include/plat/gpio.h create mode 100644 include/linux/gpio-pxa.h create mode 100644 include/linux/platform_data/macb.h Merging arm-perf/for-next/perf (f2288ad Merge branches 'perf/fixes', 'perf/event-nos', 'perf/omap4' and 'perf/updates' into for-next/perf) $ git merge arm-perf/for-next/perf Auto-merging arch/arm/kernel/perf_event.c Auto-merging arch/arm/include/asm/pmu.h Merge made by the 'recursive' strategy. arch/arm/include/asm/cti.h | 179 ++++++++++++++++ arch/arm/include/asm/perf_event.h | 3 - arch/arm/include/asm/pmu.h | 15 +- arch/arm/kernel/perf_event.c | 19 +- arch/arm/kernel/perf_event_v6.c | 32 ++-- arch/arm/kernel/perf_event_v7.c | 401 +++++++++++++---------------------- arch/arm/kernel/perf_event_xscale.c | 16 +- 7 files changed, 379 insertions(+), 286 deletions(-) create mode 100644 arch/arm/include/asm/cti.h Merging at91/at91-next (8748dfa Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux) $ git merge at91/at91-next Already up-to-date. Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) $ git merge davinci/davinci-next Already up-to-date. Merging i.MX/for-next (5788f4d Merge branches 'imx-fixes', 'imx-cleanup' and 'imx-features' into master) $ git merge i.MX/for-next Resolved 'arch/arm/mach-imx/clock-mx51-mx53.c' using previous resolution. Resolved 'arch/arm/mach-imx/devices-imx53.h' using previous resolution. Resolved 'arch/arm/mach-imx/mm-imx5.c' using previous resolution. Resolved 'arch/arm/plat-mxc/include/mach/hardware.h' using previous resolution. Auto-merging arch/arm/plat-mxc/include/mach/hardware.h CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h Auto-merging arch/arm/mach-mxs/clock-mx28.c CONFLICT (modify/delete): arch/arm/mach-mx5/pm-imx5.c deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/pm-imx5.c left in tree. CONFLICT (modify/delete): arch/arm/mach-mx5/Makefile deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Makefile left in tree. CONFLICT (modify/delete): arch/arm/mach-mx5/Kconfig deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Kconfig left in tree. Auto-merging arch/arm/mach-imx/mm-imx5.c CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx5.c Auto-merging arch/arm/mach-imx/devices-imx53.h CONFLICT (content): Merge conflict in arch/arm/mach-imx/devices-imx53.h Auto-merging arch/arm/mach-imx/clock-mx51-mx53.c CONFLICT (content): Merge conflict in arch/arm/mach-imx/clock-mx51-mx53.c Automatic merge failed; fix conflicts and then commit the result. $ git rm -f arch/arm/mach-mx5/pm-imx5.c arch/arm/mach-mx5/Makefile arch/arm/mach-mx5/Kconfig arch/arm/mach-imx/clock-mx51-mx53.c: needs merge arch/arm/mach-imx/devices-imx53.h: needs merge arch/arm/mach-imx/mm-imx5.c: needs merge arch/arm/mach-mx5/Kconfig: needs merge arch/arm/mach-mx5/Makefile: needs merge arch/arm/mach-mx5/pm-imx5.c: needs merge arch/arm/plat-mxc/include/mach/hardware.h: needs merge rm 'arch/arm/mach-mx5/Kconfig' rm 'arch/arm/mach-mx5/Makefile' rm 'arch/arm/mach-mx5/pm-imx5.c' $ git commit -v -a [master f340ed3] Merge remote-tracking branch 'i.MX/for-next' $ git diff -M --stat --summary HEAD^.. arch/arm/mach-mxs/clock-mx28.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) Merging linux-spec/for-next (5111711 Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux) $ git merge linux-spec/for-next Already up-to-date. Merging omap/for-next (322a8b0 Linux 3.1-rc1) $ git merge omap/for-next Already up-to-date. Merging pxa/for-next (19d6c13 [ARM] pxa/hx4700: actually use platform_lcd driver) $ git merge pxa/for-next Already up-to-date. Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers) $ git merge samsung/next-samsung Already up-to-date. Merging s5p/for-next (a188e1e Merge branch 'next-samsung-devel' into for-next) $ git merge s5p/for-next Resolved 'arch/arm/mach-exynos/cpu.c' using previous resolution. Resolved 'arch/arm/mach-exynos/include/mach/entry-macro.S' using previous resolution. Removing drivers/tty/serial/s5pv210.c Removing drivers/tty/serial/s3c6400.c Removing drivers/tty/serial/s3c2440.c Removing drivers/tty/serial/s3c2412.c Removing drivers/tty/serial/s3c2410.c Auto-merging drivers/tty/serial/Kconfig Removing arch/arm/mach-s5pv210/setup-sdhci.c Removing arch/arm/mach-s5pc100/setup-sdhci.c Removing arch/arm/mach-s3c64xx/setup-sdhci.c Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c Removing arch/arm/mach-s3c2416/setup-sdhci.c Removing arch/arm/mach-exynos/setup-sdhci.c Auto-merging arch/arm/mach-exynos/mach-origen.c Auto-merging arch/arm/mach-exynos/include/mach/entry-macro.S CONFLICT (content): Merge conflict in arch/arm/mach-exynos/include/mach/entry-macro.S Auto-merging arch/arm/mach-exynos/cpu.c CONFLICT (content): Merge conflict in arch/arm/mach-exynos/cpu.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 94fff97] Merge remote-tracking branch 's5p/for-next' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/arm/insignal-boards.txt | 8 + .../devicetree/bindings/arm/samsung-boards.txt | 8 + .../devicetree/bindings/dma/arm-pl330.txt | 30 + .../devicetree/bindings/gpio/gpio-samsung.txt | 40 ++ .../devicetree/bindings/input/samsung-keypad.txt | 88 +++ Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 20 + .../devicetree/bindings/serial/samsung_uart.txt | 14 + arch/arm/boot/dts/exynos4210-origen.dts | 137 +++++ arch/arm/boot/dts/exynos4210-smdkv310.dts | 182 ++++++ arch/arm/boot/dts/exynos4210.dtsi | 397 ++++++++++++ arch/arm/mach-exynos/Kconfig | 24 + arch/arm/mach-exynos/Makefile | 6 +- arch/arm/mach-exynos/clock.c | 229 +++++--- arch/arm/mach-exynos/cpu.c | 38 ++- arch/arm/mach-exynos/dma.c | 229 ++----- arch/arm/mach-exynos/include/mach/io.h | 5 + arch/arm/mach-exynos/include/mach/irqs.h | 8 +- arch/arm/mach-exynos/init.c | 21 +- arch/arm/mach-exynos/mach-exynos4-dt.c | 85 +++ arch/arm/mach-exynos/mach-origen.c | 34 + arch/arm/mach-exynos/pm.c | 24 +- arch/arm/mach-exynos/setup-sdhci.c | 22 - arch/arm/mach-s3c2410/mach-bast.c | 22 - arch/arm/mach-s3c2410/mach-vr1000.c | 24 - arch/arm/mach-s3c2410/s3c2410.c | 6 + arch/arm/mach-s3c2412/clock.c | 7 + arch/arm/mach-s3c2416/Makefile | 1 - arch/arm/mach-s3c2416/clock.c | 68 ++- arch/arm/mach-s3c2416/setup-sdhci.c | 24 - arch/arm/mach-s3c2440/clock.c | 44 ++ arch/arm/mach-s3c2440/mach-anubis.c | 22 +- arch/arm/mach-s3c2440/mach-at2440evb.c | 22 +- arch/arm/mach-s3c2440/mach-osiris.c | 24 +- arch/arm/mach-s3c2440/mach-rx1950.c | 18 +- arch/arm/mach-s3c2440/mach-rx3715.c | 19 +- arch/arm/mach-s3c64xx/Kconfig | 6 +- arch/arm/mach-s3c64xx/Makefile | 1 - arch/arm/mach-s3c64xx/clock.c | 243 +++++--- arch/arm/mach-s3c64xx/dev-spi.c | 7 - arch/arm/mach-s3c64xx/include/mach/crag6410.h | 3 +- arch/arm/mach-s3c64xx/include/mach/gpio.h | 2 +- arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +- arch/arm/mach-s3c64xx/setup-sdhci.c | 24 - arch/arm/mach-s5p64x0/clock-s5p6440.c | 93 ++-- arch/arm/mach-s5p64x0/clock-s5p6450.c | 81 ++- arch/arm/mach-s5p64x0/dev-spi.c | 6 - arch/arm/mach-s5p64x0/dma.c | 227 ++----- arch/arm/mach-s5p64x0/include/mach/irqs.h | 2 + arch/arm/mach-s5p64x0/init.c | 31 - arch/arm/mach-s5pc100/Makefile | 1 - arch/arm/mach-s5pc100/clock.c | 287 ++++++---- arch/arm/mach-s5pc100/dev-spi.c | 7 - arch/arm/mach-s5pc100/dma.c | 247 +++------ arch/arm/mach-s5pc100/include/mach/irqs.h | 2 + arch/arm/mach-s5pc100/setup-sdhci.c | 23 - arch/arm/mach-s5pv210/Makefile | 1 - arch/arm/mach-s5pv210/clock.c | 324 ++++++---- arch/arm/mach-s5pv210/dev-spi.c | 6 - arch/arm/mach-s5pv210/dma.c | 241 +++------ arch/arm/mach-s5pv210/include/mach/irqs.h | 2 + arch/arm/mach-s5pv210/init.c | 19 - arch/arm/mach-s5pv210/setup-sdhci.c | 22 - arch/arm/plat-s3c24xx/s3c2443-clock.c | 39 +- arch/arm/plat-samsung/Kconfig | 8 + arch/arm/plat-samsung/dma-ops.c | 15 +- arch/arm/plat-samsung/include/plat/dma-ops.h | 1 + arch/arm/plat-samsung/include/plat/dma-pl330.h | 3 +- arch/arm/plat-samsung/include/plat/irqs.h | 3 +- arch/arm/plat-samsung/include/plat/regs-serial.h | 45 +- arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 2 - arch/arm/plat-samsung/include/plat/sdhci.h | 31 - drivers/dma/pl330.c | 99 ++-- drivers/gpio/gpio-samsung.c | 72 +++ drivers/input/keyboard/samsung-keypad.c | 174 +++++- drivers/mmc/host/sdhci-s3c.c | 7 +- drivers/rtc/rtc-s3c.c | 21 +- drivers/spi/spi-s3c64xx.c | 14 +- drivers/tty/serial/Kconfig | 45 +-- drivers/tty/serial/Makefile | 5 - drivers/tty/serial/s3c2410.c | 115 ---- drivers/tty/serial/s3c2412.c | 149 ----- drivers/tty/serial/s3c2440.c | 178 ------ drivers/tty/serial/s3c6400.c | 149 ----- drivers/tty/serial/s5pv210.c | 158 ----- drivers/tty/serial/samsung.c | 639 ++++++++++++-------- drivers/tty/serial/samsung.h | 32 +- include/linux/amba/pl330.h | 15 +- 87 files changed, 3076 insertions(+), 2803 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/insignal-boards.txt create mode 100644 Documentation/devicetree/bindings/arm/samsung-boards.txt create mode 100644 Documentation/devicetree/bindings/dma/arm-pl330.txt create mode 100644 Documentation/devicetree/bindings/gpio/gpio-samsung.txt create mode 100644 Documentation/devicetree/bindings/input/samsung-keypad.txt create mode 100644 Documentation/devicetree/bindings/rtc/s3c-rtc.txt create mode 100644 Documentation/devicetree/bindings/serial/samsung_uart.txt create mode 100644 arch/arm/boot/dts/exynos4210-origen.dts create mode 100644 arch/arm/boot/dts/exynos4210-smdkv310.dts create mode 100644 arch/arm/boot/dts/exynos4210.dtsi create mode 100644 arch/arm/mach-exynos/mach-exynos4-dt.c delete mode 100644 arch/arm/mach-exynos/setup-sdhci.c delete mode 100644 arch/arm/mach-s3c2416/setup-sdhci.c delete mode 100644 arch/arm/mach-s3c64xx/setup-sdhci.c delete mode 100644 arch/arm/mach-s5pc100/setup-sdhci.c delete mode 100644 arch/arm/mach-s5pv210/setup-sdhci.c delete mode 100644 drivers/tty/serial/s3c2410.c delete mode 100644 drivers/tty/serial/s3c2412.c delete mode 100644 drivers/tty/serial/s3c2440.c delete mode 100644 drivers/tty/serial/s3c6400.c delete mode 100644 drivers/tty/serial/s5pv210.c Merging tegra/for-next (b48c54e Merge branch 'for-3.3/boards' into for-next) $ git merge tegra/for-next Auto-merging arch/arm/mach-tegra/board-paz00.c Auto-merging arch/arm/mach-tegra/board-dt.c Merge made by the 'recursive' strategy. .../devicetree/bindings/usb/tegra-usb.txt | 13 +++ arch/arm/boot/dts/tegra-paz00.dts | 82 ++++++++++++++++++++ arch/arm/boot/dts/tegra-seaboard.dts | 4 + arch/arm/boot/dts/tegra-trimslice.dts | 38 +++++++++ arch/arm/boot/dts/tegra20.dtsi | 21 +++++ arch/arm/mach-tegra/Makefile | 28 ++++--- arch/arm/mach-tegra/Makefile.boot | 2 + arch/arm/mach-tegra/board-dt.c | 15 ++++ arch/arm/mach-tegra/board-paz00-pinmux.c | 2 +- arch/arm/mach-tegra/board-paz00.c | 27 +++++++ arch/arm/mach-tegra/board-paz00.h | 3 + arch/arm/mach-tegra/irq.c | 4 - arch/arm/mach-tegra/timer.c | 12 ++- drivers/usb/host/ehci-tegra.c | 71 +++++++++++++++++ 14 files changed, 300 insertions(+), 22 deletions(-) create mode 100644 Documentation/devicetree/bindings/usb/tegra-usb.txt create mode 100644 arch/arm/boot/dts/tegra-paz00.dts create mode 100644 arch/arm/boot/dts/tegra-trimslice.dts Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support) $ git merge xilinx/arm-next Already up-to-date. Merging blackfin/for-linus (9059054 blackfin: Fixup export.h includes) $ git merge blackfin/for-linus Already up-to-date. Merging c6x/for-linux-next (2141355 C6X: MAINTAINERS) $ git merge c6x/for-linux-next Auto-merging include/asm-generic/page.h Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/c6x/clocks.txt | 40 + Documentation/devicetree/bindings/c6x/dscr.txt | 127 +++ Documentation/devicetree/bindings/c6x/emifa.txt | 62 ++ .../devicetree/bindings/c6x/interrupt.txt | 104 +++ Documentation/devicetree/bindings/c6x/soc.txt | 28 + Documentation/devicetree/bindings/c6x/timer64.txt | 26 + MAINTAINERS | 8 + arch/c6x/Kconfig | 174 +++++ arch/c6x/Makefile | 60 ++ arch/c6x/boot/Makefile | 30 + arch/c6x/boot/dts/dsk6455.dts | 62 ++ arch/c6x/boot/dts/evmc6457.dts | 48 ++ arch/c6x/boot/dts/evmc6472.dts | 73 ++ arch/c6x/boot/dts/evmc6474.dts | 58 ++ arch/c6x/boot/dts/tms320c6455.dtsi | 96 +++ arch/c6x/boot/dts/tms320c6457.dtsi | 68 ++ arch/c6x/boot/dts/tms320c6472.dtsi | 134 ++++ arch/c6x/boot/dts/tms320c6474.dtsi | 89 +++ arch/c6x/boot/linked_dtb.S | 2 + arch/c6x/configs/dsk6455_defconfig | 44 ++ arch/c6x/configs/evmc6457_defconfig | 41 + arch/c6x/configs/evmc6472_defconfig | 42 + arch/c6x/configs/evmc6474_defconfig | 42 + arch/c6x/include/asm/Kbuild | 54 ++ arch/c6x/include/asm/asm-offsets.h | 1 + arch/c6x/include/asm/bitops.h | 105 +++ arch/c6x/include/asm/byteorder.h | 12 + arch/c6x/include/asm/cache.h | 90 +++ arch/c6x/include/asm/cacheflush.h | 65 ++ arch/c6x/include/asm/checksum.h | 34 + arch/c6x/include/asm/clkdev.h | 22 + arch/c6x/include/asm/clock.h | 148 ++++ arch/c6x/include/asm/delay.h | 67 ++ arch/c6x/include/asm/dma-mapping.h | 91 +++ arch/c6x/include/asm/dscr.h | 34 + arch/c6x/include/asm/elf.h | 113 +++ arch/c6x/include/asm/ftrace.h | 6 + arch/c6x/include/asm/hardirq.h | 20 + arch/c6x/include/asm/irq.h | 302 ++++++++ arch/c6x/include/asm/irqflags.h | 72 ++ arch/c6x/include/asm/linkage.h | 30 + arch/c6x/include/asm/megamod-pic.h | 9 + arch/c6x/include/asm/memblock.h | 4 + arch/c6x/include/asm/mmu.h | 18 + arch/c6x/include/asm/module.h | 33 + arch/c6x/include/asm/mutex.h | 6 + arch/c6x/include/asm/page.h | 11 + arch/c6x/include/asm/pgtable.h | 81 ++ arch/c6x/include/asm/processor.h | 132 ++++ arch/c6x/include/asm/procinfo.h | 28 + arch/c6x/include/asm/prom.h | 1 + arch/c6x/include/asm/ptrace.h | 174 +++++ arch/c6x/include/asm/sections.h | 12 + arch/c6x/include/asm/setup.h | 32 + arch/c6x/include/asm/sigcontext.h | 80 ++ arch/c6x/include/asm/signal.h | 17 + arch/c6x/include/asm/soc.h | 35 + arch/c6x/include/asm/string.h | 21 + arch/c6x/include/asm/swab.h | 54 ++ arch/c6x/include/asm/syscall.h | 123 +++ arch/c6x/include/asm/syscalls.h | 55 ++ arch/c6x/include/asm/system.h | 168 ++++ arch/c6x/include/asm/thread_info.h | 121 +++ arch/c6x/include/asm/timer64.h | 6 + arch/c6x/include/asm/timex.h | 33 + arch/c6x/include/asm/tlb.h | 8 + arch/c6x/include/asm/traps.h | 36 + arch/c6x/include/asm/uaccess.h | 107 +++ arch/c6x/include/asm/unaligned.h | 170 +++++ arch/c6x/include/asm/unistd.h | 26 + arch/c6x/kernel/Makefile | 12 + arch/c6x/kernel/asm-offsets.c | 123 +++ arch/c6x/kernel/c6x_ksyms.c | 66 ++ arch/c6x/kernel/devicetree.c | 53 ++ arch/c6x/kernel/dma.c | 153 ++++ arch/c6x/kernel/entry.S | 803 ++++++++++++++++++++ arch/c6x/kernel/head.S | 84 ++ arch/c6x/kernel/irq.c | 728 ++++++++++++++++++ arch/c6x/kernel/module.c | 123 +++ arch/c6x/kernel/process.c | 263 +++++++ arch/c6x/kernel/ptrace.c | 187 +++++ arch/c6x/kernel/setup.c | 498 ++++++++++++ arch/c6x/kernel/signal.c | 377 +++++++++ arch/c6x/kernel/soc.c | 91 +++ arch/c6x/kernel/switch_to.S | 74 ++ arch/c6x/kernel/sys_c6x.c | 74 ++ arch/c6x/kernel/time.c | 65 ++ arch/c6x/kernel/traps.c | 423 ++++++++++ arch/c6x/kernel/vectors.S | 81 ++ arch/c6x/kernel/vmlinux.lds.S | 162 ++++ arch/c6x/lib/Makefile | 7 + arch/c6x/lib/checksum.c | 36 + arch/c6x/lib/csum_64plus.S | 419 ++++++++++ arch/c6x/lib/divi.S | 53 ++ arch/c6x/lib/divremi.S | 46 ++ arch/c6x/lib/divremu.S | 87 +++ arch/c6x/lib/divu.S | 98 +++ arch/c6x/lib/llshl.S | 37 + arch/c6x/lib/llshr.S | 38 + arch/c6x/lib/llshru.S | 38 + arch/c6x/lib/memcpy_64plus.S | 46 ++ arch/c6x/lib/mpyll.S | 49 ++ arch/c6x/lib/negll.S | 31 + arch/c6x/lib/pop_rts.S | 32 + arch/c6x/lib/push_rts.S | 31 + arch/c6x/lib/remi.S | 64 ++ arch/c6x/lib/remu.S | 82 ++ arch/c6x/lib/strasgi.S | 89 +++ arch/c6x/lib/strasgi_64plus.S | 39 + arch/c6x/mm/Makefile | 5 + arch/c6x/mm/dma-coherent.c | 143 ++++ arch/c6x/mm/init.c | 113 +++ arch/c6x/platforms/Kconfig | 16 + arch/c6x/platforms/Makefile | 12 + arch/c6x/platforms/cache.c | 445 +++++++++++ arch/c6x/platforms/dscr.c | 598 +++++++++++++++ arch/c6x/platforms/emif.c | 88 +++ arch/c6x/platforms/megamod-pic.c | 349 +++++++++ arch/c6x/platforms/platform.c | 17 + arch/c6x/platforms/pll.c | 444 +++++++++++ arch/c6x/platforms/plldata.c | 404 ++++++++++ arch/c6x/platforms/timer64.c | 236 ++++++ include/asm-generic/io.h | 2 +- include/asm-generic/page.h | 10 +- include/asm-generic/uaccess.h | 7 +- include/linux/elf-em.h | 1 + 126 files changed, 12972 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/c6x/clocks.txt create mode 100644 Documentation/devicetree/bindings/c6x/dscr.txt create mode 100644 Documentation/devicetree/bindings/c6x/emifa.txt create mode 100644 Documentation/devicetree/bindings/c6x/interrupt.txt create mode 100644 Documentation/devicetree/bindings/c6x/soc.txt create mode 100644 Documentation/devicetree/bindings/c6x/timer64.txt create mode 100644 arch/c6x/Kconfig create mode 100644 arch/c6x/Makefile create mode 100644 arch/c6x/boot/Makefile create mode 100644 arch/c6x/boot/dts/dsk6455.dts create mode 100644 arch/c6x/boot/dts/evmc6457.dts create mode 100644 arch/c6x/boot/dts/evmc6472.dts create mode 100644 arch/c6x/boot/dts/evmc6474.dts create mode 100644 arch/c6x/boot/dts/tms320c6455.dtsi create mode 100644 arch/c6x/boot/dts/tms320c6457.dtsi create mode 100644 arch/c6x/boot/dts/tms320c6472.dtsi create mode 100644 arch/c6x/boot/dts/tms320c6474.dtsi create mode 100644 arch/c6x/boot/linked_dtb.S create mode 100644 arch/c6x/configs/dsk6455_defconfig create mode 100644 arch/c6x/configs/evmc6457_defconfig create mode 100644 arch/c6x/configs/evmc6472_defconfig create mode 100644 arch/c6x/configs/evmc6474_defconfig create mode 100644 arch/c6x/include/asm/Kbuild create mode 100644 arch/c6x/include/asm/asm-offsets.h create mode 100644 arch/c6x/include/asm/bitops.h create mode 100644 arch/c6x/include/asm/byteorder.h create mode 100644 arch/c6x/include/asm/cache.h create mode 100644 arch/c6x/include/asm/cacheflush.h create mode 100644 arch/c6x/include/asm/checksum.h create mode 100644 arch/c6x/include/asm/clkdev.h create mode 100644 arch/c6x/include/asm/clock.h create mode 100644 arch/c6x/include/asm/delay.h create mode 100644 arch/c6x/include/asm/dma-mapping.h create mode 100644 arch/c6x/include/asm/dscr.h create mode 100644 arch/c6x/include/asm/elf.h create mode 100644 arch/c6x/include/asm/ftrace.h create mode 100644 arch/c6x/include/asm/hardirq.h create mode 100644 arch/c6x/include/asm/irq.h create mode 100644 arch/c6x/include/asm/irqflags.h create mode 100644 arch/c6x/include/asm/linkage.h create mode 100644 arch/c6x/include/asm/megamod-pic.h create mode 100644 arch/c6x/include/asm/memblock.h create mode 100644 arch/c6x/include/asm/mmu.h create mode 100644 arch/c6x/include/asm/module.h create mode 100644 arch/c6x/include/asm/mutex.h create mode 100644 arch/c6x/include/asm/page.h create mode 100644 arch/c6x/include/asm/pgtable.h create mode 100644 arch/c6x/include/asm/processor.h create mode 100644 arch/c6x/include/asm/procinfo.h create mode 100644 arch/c6x/include/asm/prom.h create mode 100644 arch/c6x/include/asm/ptrace.h create mode 100644 arch/c6x/include/asm/sections.h create mode 100644 arch/c6x/include/asm/setup.h create mode 100644 arch/c6x/include/asm/sigcontext.h create mode 100644 arch/c6x/include/asm/signal.h create mode 100644 arch/c6x/include/asm/soc.h create mode 100644 arch/c6x/include/asm/string.h create mode 100644 arch/c6x/include/asm/swab.h create mode 100644 arch/c6x/include/asm/syscall.h create mode 100644 arch/c6x/include/asm/syscalls.h create mode 100644 arch/c6x/include/asm/system.h create mode 100644 arch/c6x/include/asm/thread_info.h create mode 100644 arch/c6x/include/asm/timer64.h create mode 100644 arch/c6x/include/asm/timex.h create mode 100644 arch/c6x/include/asm/tlb.h create mode 100644 arch/c6x/include/asm/traps.h create mode 100644 arch/c6x/include/asm/uaccess.h create mode 100644 arch/c6x/include/asm/unaligned.h create mode 100644 arch/c6x/include/asm/unistd.h create mode 100644 arch/c6x/kernel/Makefile create mode 100644 arch/c6x/kernel/asm-offsets.c create mode 100644 arch/c6x/kernel/c6x_ksyms.c create mode 100644 arch/c6x/kernel/devicetree.c create mode 100644 arch/c6x/kernel/dma.c create mode 100644 arch/c6x/kernel/entry.S create mode 100644 arch/c6x/kernel/head.S create mode 100644 arch/c6x/kernel/irq.c create mode 100644 arch/c6x/kernel/module.c create mode 100644 arch/c6x/kernel/process.c create mode 100644 arch/c6x/kernel/ptrace.c create mode 100644 arch/c6x/kernel/setup.c create mode 100644 arch/c6x/kernel/signal.c create mode 100644 arch/c6x/kernel/soc.c create mode 100644 arch/c6x/kernel/switch_to.S create mode 100644 arch/c6x/kernel/sys_c6x.c create mode 100644 arch/c6x/kernel/time.c create mode 100644 arch/c6x/kernel/traps.c create mode 100644 arch/c6x/kernel/vectors.S create mode 100644 arch/c6x/kernel/vmlinux.lds.S create mode 100644 arch/c6x/lib/Makefile create mode 100644 arch/c6x/lib/checksum.c create mode 100644 arch/c6x/lib/csum_64plus.S create mode 100644 arch/c6x/lib/divi.S create mode 100644 arch/c6x/lib/divremi.S create mode 100644 arch/c6x/lib/divremu.S create mode 100644 arch/c6x/lib/divu.S create mode 100644 arch/c6x/lib/llshl.S create mode 100644 arch/c6x/lib/llshr.S create mode 100644 arch/c6x/lib/llshru.S create mode 100644 arch/c6x/lib/memcpy_64plus.S create mode 100644 arch/c6x/lib/mpyll.S create mode 100644 arch/c6x/lib/negll.S create mode 100644 arch/c6x/lib/pop_rts.S create mode 100644 arch/c6x/lib/push_rts.S create mode 100644 arch/c6x/lib/remi.S create mode 100644 arch/c6x/lib/remu.S create mode 100644 arch/c6x/lib/strasgi.S create mode 100644 arch/c6x/lib/strasgi_64plus.S create mode 100644 arch/c6x/mm/Makefile create mode 100644 arch/c6x/mm/dma-coherent.c create mode 100644 arch/c6x/mm/init.c create mode 100644 arch/c6x/platforms/Kconfig create mode 100644 arch/c6x/platforms/Makefile create mode 100644 arch/c6x/platforms/cache.c create mode 100644 arch/c6x/platforms/dscr.c create mode 100644 arch/c6x/platforms/emif.c create mode 100644 arch/c6x/platforms/megamod-pic.c create mode 100644 arch/c6x/platforms/platform.c create mode 100644 arch/c6x/platforms/pll.c create mode 100644 arch/c6x/platforms/plldata.c create mode 100644 arch/c6x/platforms/timer64.c Merging cris/for-next (ea78f5b CRIS: Update documentation) $ git merge cris/for-next Auto-merging drivers/net/cris/eth_v10.c Auto-merging arch/cris/arch-v32/drivers/cryptocop.c Merge made by the 'recursive' strategy. Documentation/cris/README | 62 +++++++++++++++--------------- arch/cris/arch-v32/drivers/cryptocop.c | 6 +-- arch/cris/arch-v32/kernel/ptrace.c | 2 - arch/cris/include/arch-v32/arch/cache.h | 2 +- drivers/net/cris/eth_v10.c | 1 - 5 files changed, 34 insertions(+), 39 deletions(-) Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h) $ git merge quilt/hexagon Merge made by the 'recursive' strategy. arch/hexagon/Kconfig | 23 ++++------------------- arch/hexagon/Makefile | 4 ---- arch/hexagon/include/asm/spinlock_types.h | 2 -- arch/hexagon/kernel/dma.c | 1 + arch/hexagon/kernel/ptrace.c | 1 + arch/hexagon/kernel/time.c | 7 +++---- arch/hexagon/kernel/vdso.c | 1 + 7 files changed, 10 insertions(+), 29 deletions(-) Merging ia64/next (2174f6d pstore: gracefully handle NULL pstore_info functions) $ git merge ia64/next Auto-merging drivers/firmware/efivars.c Merge made by the 'recursive' strategy. drivers/acpi/apei/erst.c | 6 ++++-- drivers/firmware/efivars.c | 8 +++++--- fs/pstore/inode.c | 3 ++- fs/pstore/platform.c | 36 ++++-------------------------------- include/linux/pstore.h | 12 +++++------- 5 files changed, 20 insertions(+), 45 deletions(-) Merging m68k/for-next (2e50d63 m68k: Don't comment out syscalls used by glibc) $ git merge m68k/for-next Merge made by the 'recursive' strategy. arch/m68k/Kconfig.debug | 11 ++ arch/m68k/Kconfig.devices | 2 +- arch/m68k/atari/ataints.c | 2 - arch/m68k/atari/debug.c | 1 - arch/m68k/configs/multi_defconfig | 1 - arch/m68k/configs/mvme16x_defconfig | 1 - arch/m68k/emu/nfeth.c | 2 +- arch/m68k/hp300/config.c | 3 +- arch/m68k/include/asm/atarihw.h | 2 + arch/m68k/include/asm/blinken.h | 8 +- arch/m68k/include/asm/mac_baboon.h | 6 + arch/m68k/include/asm/mac_iop.h | 2 + arch/m68k/include/asm/mac_oss.h | 23 +--- arch/m68k/include/asm/mac_psc.h | 4 + arch/m68k/include/asm/mac_via.h | 9 ++ arch/m68k/include/asm/macintosh.h | 10 +- arch/m68k/include/asm/macints.h | 6 +- arch/m68k/include/asm/serial.h | 2 + arch/m68k/include/asm/unistd.h | 10 +- arch/m68k/kernel/head.S | 117 ++++++++-------- arch/m68k/mac/baboon.c | 41 +----- arch/m68k/mac/config.c | 93 +++++++++----- arch/m68k/mac/iop.c | 8 +- arch/m68k/mac/macints.c | 197 +++++++-------------------- arch/m68k/mac/oss.c | 157 +++++++-------------- arch/m68k/mac/psc.c | 17 --- arch/m68k/mac/via.c | 255 +++++++++++++++++------------------ arch/m68k/mvme16x/config.c | 160 ++++++++++++++++++++++ drivers/block/swim.c | 1 - drivers/scsi/mac_esp.c | 3 +- 30 files changed, 574 insertions(+), 580 deletions(-) Merging m68knommu/for-next (285aa94 m68knommu: fix broken ColdFire slice timer read_clk() code) $ git merge m68knommu/for-next Resolved 'arch/m68k/Kconfig.debug' using previous resolution. Removing arch/m68k/lib/checksum_no.c Auto-merging arch/m68k/Kconfig.debug CONFLICT (content): Merge conflict in arch/m68k/Kconfig.debug Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master ab433ed] Merge remote-tracking branch 'm68knommu/for-next' $ git diff -M --stat --summary HEAD^.. arch/m68k/Kconfig | 7 +- arch/m68k/Kconfig.cpu | 8 ++ arch/m68k/Kconfig.debug | 16 ++-- arch/m68k/include/asm/checksum.h | 31 +----- arch/m68k/include/asm/div64.h | 8 +- arch/m68k/include/asm/gpio.h | 3 +- arch/m68k/include/asm/processor.h | 2 - arch/m68k/include/asm/sigcontext.h | 4 - arch/m68k/include/asm/thread_info.h | 30 ----- arch/m68k/include/asm/traps.h | 1 + arch/m68k/include/asm/ucontext.h | 4 - arch/m68k/kernel/Makefile | 7 +- arch/m68k/kernel/asm-offsets.c | 3 +- arch/m68k/kernel/entry_mm.S | 31 ++++-- arch/m68k/kernel/entry_no.S | 6 - arch/m68k/kernel/init_task.c | 3 +- arch/m68k/kernel/m68k_ksyms.c | 2 +- arch/m68k/kernel/process_mm.c | 16 --- arch/m68k/kernel/setup_mm.c | 4 + arch/m68k/kernel/setup_no.c | 1 - arch/m68k/kernel/time_no.c | 3 + arch/m68k/kernel/vmlinux-std.lds | 2 + arch/m68k/kernel/vmlinux-sun3.lds | 2 + arch/m68k/lib/Makefile | 10 +- arch/m68k/lib/{checksum_mm.c => checksum.c} | 0 arch/m68k/lib/checksum_no.c | 156 --------------------------- arch/m68k/mm/init_mm.c | 34 ++++++ arch/m68k/platform/68328/timers.c | 4 +- arch/m68k/platform/coldfire/dma_timer.c | 5 +- arch/m68k/platform/coldfire/entry.S | 1 - arch/m68k/platform/coldfire/head.S | 6 +- arch/m68k/platform/coldfire/pit.c | 4 +- arch/m68k/platform/coldfire/sltimers.c | 13 ++- arch/m68k/platform/coldfire/timers.c | 4 +- 34 files changed, 125 insertions(+), 306 deletions(-) rename arch/m68k/lib/{checksum_mm.c => checksum.c} (100%) delete mode 100644 arch/m68k/lib/checksum_no.c Merging microblaze/next (7f80850 Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh) $ git merge microblaze/next Already up-to-date. Merging mips/mips-for-linux-next (1fc140c Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next) $ git merge mips/mips-for-linux-next Auto-merging drivers/tty/serial/Makefile Auto-merging drivers/tty/serial/Kconfig Removing drivers/staging/octeon/cvmx-smix-defs.h Removing drivers/staging/octeon/cvmx-packet.h Removing drivers/pcmcia/au1000_pb1x00.c Removing drivers/pcmcia/au1000_generic.h Removing drivers/pcmcia/au1000_generic.c Removing drivers/net/irda/au1000_ircc.h Auto-merging arch/mips/netlogic/xlr/wakeup.c Removing arch/mips/netlogic/xlr/irq.c Auto-merging arch/mips/netlogic/common/time.c Auto-merging arch/mips/netlogic/common/smp.c Auto-merging arch/mips/include/asm/octeon/cvmx-helper.h Auto-merging arch/mips/include/asm/octeon/cvmx-helper-xaui.h Auto-merging arch/mips/include/asm/octeon/cvmx-helper-spi.h Auto-merging arch/mips/include/asm/octeon/cvmx-helper-sgmii.h Auto-merging arch/mips/include/asm/octeon/cvmx-helper-rgmii.h Auto-merging arch/mips/include/asm/octeon/cvmx-helper-npi.h Auto-merging arch/mips/include/asm/octeon/cvmx-helper-loop.h Auto-merging arch/mips/include/asm/octeon/cvmx-helper-board.h Auto-merging arch/mips/include/asm/octeon/cvmx-config.h Auto-merging arch/mips/include/asm/netlogic/xlp-hal/xlp.h Removing arch/mips/include/asm/mach-pb1x00/pb1550.h Removing arch/mips/include/asm/mach-pb1x00/pb1200.h Removing arch/mips/include/asm/mach-pb1x00/pb1000.h Removing arch/mips/include/asm/mach-pb1x00/mc146818rtc.h Removing arch/mips/include/asm/mach-db1x00/db1x00.h Removing arch/mips/configs/pb1200_defconfig Removing arch/mips/configs/db1500_defconfig Removing arch/mips/configs/db1100_defconfig Auto-merging arch/mips/cavium-octeon/executive/cvmx-spi.c Auto-merging arch/mips/cavium-octeon/executive/cvmx-pko.c Auto-merging arch/mips/cavium-octeon/executive/cvmx-interrupt-rsl.c Auto-merging arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper.c Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-util.c Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-spi.c Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-npi.c Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-loop.c Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-board.c Auto-merging arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c Auto-merging arch/mips/ath79/dev-usb.h Removing arch/mips/ath79/dev-ar913x-wmac.c Removing arch/mips/alchemy/xxs1500/platform.c Removing arch/mips/alchemy/xxs1500/init.c Removing arch/mips/alchemy/xxs1500/board_setup.c Removing arch/mips/alchemy/xxs1500/Makefile Removing arch/mips/alchemy/mtx-1/init.c Removing arch/mips/alchemy/mtx-1/board_setup.c Removing arch/mips/alchemy/mtx-1/Makefile Removing arch/mips/alchemy/gpr/init.c Removing arch/mips/alchemy/gpr/board_setup.c Removing arch/mips/alchemy/gpr/Makefile Removing arch/mips/alchemy/devboards/pb1550/board_setup.c Removing arch/mips/alchemy/devboards/pb1550/Makefile Auto-merging arch/mips/alchemy/devboards/pb1550.c Removing arch/mips/alchemy/devboards/pb1500/platform.c Removing arch/mips/alchemy/devboards/pb1500/Makefile Auto-merging arch/mips/alchemy/devboards/pb1500.c Removing arch/mips/alchemy/devboards/pb1200/platform.c Removing arch/mips/alchemy/devboards/pb1200/board_setup.c Removing arch/mips/alchemy/devboards/pb1200/Makefile Removing arch/mips/alchemy/devboards/pb1100/platform.c Removing arch/mips/alchemy/devboards/pb1100/Makefile Auto-merging arch/mips/alchemy/devboards/pb1100.c Removing arch/mips/alchemy/devboards/pb1000/board_setup.c Removing arch/mips/alchemy/devboards/pb1000/Makefile Removing arch/mips/alchemy/devboards/db1x00/platform.c Removing arch/mips/alchemy/devboards/db1x00/board_setup.c Removing arch/mips/alchemy/devboards/db1x00/Makefile Removing arch/mips/alchemy/devboards/db1200/setup.c Removing arch/mips/alchemy/devboards/db1200/Makefile Auto-merging arch/mips/alchemy/devboards/db1200.c Auto-merging arch/mips/alchemy/board-mtx1.c Auto-merging arch/mips/alchemy/board-gpr.c Merge made by the 'recursive' strategy. arch/mips/Kconfig | 84 +- arch/mips/Makefile | 1 + arch/mips/alchemy/Kconfig | 60 +- arch/mips/alchemy/Makefile | 3 + arch/mips/alchemy/Platform | 58 +- arch/mips/alchemy/{gpr/platform.c => board-gpr.c} | 81 +- .../alchemy/{mtx-1/platform.c => board-mtx1.c} | 93 +- arch/mips/alchemy/board-xxs1500.c | 154 ++ arch/mips/alchemy/common/Makefile | 4 +- arch/mips/alchemy/common/dbdma.c | 49 +- arch/mips/alchemy/common/gpiolib.c | 42 + arch/mips/alchemy/common/irq.c | 875 ++++++--- arch/mips/alchemy/common/platform.c | 31 +- arch/mips/alchemy/common/power.c | 3 + arch/mips/alchemy/common/sleeper.S | 73 + arch/mips/alchemy/common/time.c | 3 +- arch/mips/alchemy/common/vss.c | 84 + arch/mips/alchemy/devboards/Makefile | 19 +- arch/mips/alchemy/devboards/bcsr.c | 11 +- arch/mips/alchemy/devboards/db1000.c | 565 +++++ .../devboards/{db1200/platform.c => db1200.c} | 401 +++- arch/mips/alchemy/devboards/db1200/Makefile | 1 - arch/mips/alchemy/devboards/db1200/setup.c | 81 - arch/mips/alchemy/devboards/db1300.c | 785 +++++++ arch/mips/alchemy/devboards/db1550.c | 498 +++++ arch/mips/alchemy/devboards/db1x00/Makefile | 8 - arch/mips/alchemy/devboards/db1x00/board_setup.c | 229 -- arch/mips/alchemy/devboards/db1x00/platform.c | 316 --- arch/mips/alchemy/devboards/pb1000/Makefile | 8 - arch/mips/alchemy/devboards/pb1000/board_setup.c | 209 -- .../devboards/{pb1100/board_setup.c => pb1100.c} | 92 +- arch/mips/alchemy/devboards/pb1100/Makefile | 8 - arch/mips/alchemy/devboards/pb1100/platform.c | 77 - arch/mips/alchemy/devboards/pb1200/Makefile | 5 - arch/mips/alchemy/devboards/pb1200/board_setup.c | 174 -- arch/mips/alchemy/devboards/pb1200/platform.c | 339 --- .../devboards/{pb1500/board_setup.c => pb1500.c} | 113 +- arch/mips/alchemy/devboards/pb1500/Makefile | 8 - arch/mips/alchemy/devboards/pb1500/platform.c | 94 - .../devboards/{pb1550/platform.c => pb1550.c} | 112 +- arch/mips/alchemy/devboards/pb1550/Makefile | 8 - arch/mips/alchemy/devboards/pb1550/board_setup.c | 80 - arch/mips/alchemy/devboards/platform.c | 13 +- arch/mips/alchemy/devboards/prom.c | 11 +- arch/mips/alchemy/gpr/Makefile | 8 - arch/mips/alchemy/gpr/board_setup.c | 75 - arch/mips/alchemy/gpr/init.c | 63 - arch/mips/alchemy/mtx-1/Makefile | 9 - arch/mips/alchemy/mtx-1/board_setup.c | 94 - arch/mips/alchemy/mtx-1/init.c | 66 - arch/mips/alchemy/xxs1500/Makefile | 8 - arch/mips/alchemy/xxs1500/board_setup.c | 93 - arch/mips/alchemy/xxs1500/init.c | 63 - arch/mips/alchemy/xxs1500/platform.c | 63 - arch/mips/ar7/gpio.c | 2 +- arch/mips/ar7/platform.c | 39 +- arch/mips/ar7/prom.c | 4 +- arch/mips/ar7/setup.c | 2 +- arch/mips/ath79/Kconfig | 38 +- arch/mips/ath79/Makefile | 5 +- arch/mips/ath79/clock.c | 55 + arch/mips/ath79/common.c | 5 + arch/mips/ath79/dev-ar913x-wmac.c | 60 - arch/mips/ath79/dev-common.c | 38 +- arch/mips/ath79/dev-usb.c | 197 ++ arch/mips/ath79/{dev-ar913x-wmac.h => dev-usb.h} | 10 +- arch/mips/ath79/dev-wmac.c | 109 + arch/mips/ath79/dev-wmac.h | 17 + arch/mips/ath79/early_printk.c | 76 +- arch/mips/ath79/gpio.c | 2 + arch/mips/ath79/irq.c | 17 +- arch/mips/ath79/mach-ap121.c | 92 + arch/mips/ath79/mach-ap81.c | 6 +- arch/mips/ath79/mach-pb44.c | 2 + arch/mips/ath79/mach-ubnt-xm.c | 119 ++ arch/mips/ath79/machtypes.h | 2 + arch/mips/ath79/setup.c | 22 +- arch/mips/bcm47xx/setup.c | 4 +- arch/mips/bcm63xx/Kconfig | 4 + arch/mips/bcm63xx/boards/board_bcm963xx.c | 46 +- arch/mips/bcm63xx/clk.c | 70 +- arch/mips/bcm63xx/cpu.c | 261 +-- arch/mips/bcm63xx/dev-uart.c | 2 +- arch/mips/bcm63xx/gpio.c | 41 +- arch/mips/bcm63xx/irq.c | 403 +++- arch/mips/bcm63xx/prom.c | 7 +- arch/mips/bcm63xx/setup.c | 32 +- arch/mips/boot/compressed/uart-alchemy.c | 5 +- arch/mips/cavium-octeon/Kconfig | 4 - arch/mips/cavium-octeon/dma-octeon.c | 23 +- arch/mips/cavium-octeon/executive/Makefile | 7 +- .../mips/cavium-octeon/executive}/cvmx-cmd-queue.c | 8 +- .../mips/cavium-octeon/executive}/cvmx-fpa.c | 0 .../cavium-octeon/executive}/cvmx-helper-board.c | 38 +- .../cavium-octeon/executive}/cvmx-helper-fpa.c | 0 .../cavium-octeon/executive}/cvmx-helper-loop.c | 6 +- .../cavium-octeon/executive}/cvmx-helper-npi.c | 6 +- .../cavium-octeon/executive}/cvmx-helper-rgmii.c | 17 +- .../cavium-octeon/executive}/cvmx-helper-sgmii.c | 18 +- .../cavium-octeon/executive}/cvmx-helper-spi.c | 20 +- .../cavium-octeon/executive}/cvmx-helper-util.c | 16 +- .../cavium-octeon/executive}/cvmx-helper-xaui.c | 32 +- .../mips/cavium-octeon/executive}/cvmx-helper.c | 120 +- .../executive}/cvmx-interrupt-decodes.c | 10 +- .../cavium-octeon/executive}/cvmx-interrupt-rsl.c | 4 +- .../mips/cavium-octeon/executive}/cvmx-pko.c | 8 +- .../mips/cavium-octeon/executive}/cvmx-spi.c | 12 +- arch/mips/cavium-octeon/executive/octeon-model.c | 119 +- arch/mips/cavium-octeon/setup.c | 14 +- arch/mips/cavium-octeon/smp.c | 2 +- arch/mips/configs/db1000_defconfig | 369 +++- arch/mips/configs/db1100_defconfig | 122 -- arch/mips/configs/db1300_defconfig | 391 ++++ arch/mips/configs/db1500_defconfig | 128 -- arch/mips/configs/db1550_defconfig | 288 ++- arch/mips/configs/nlm_xlp_defconfig | 570 +++++ arch/mips/configs/nlm_xlr_defconfig | 16 +- arch/mips/configs/pb1200_defconfig | 170 -- arch/mips/dec/setup.c | 1 - arch/mips/include/asm/bmips.h | 110 + arch/mips/include/asm/bootinfo.h | 1 + arch/mips/include/asm/branch.h | 5 + arch/mips/include/asm/cpu.h | 6 +- arch/mips/include/asm/gio_device.h | 56 + arch/mips/include/asm/hazards.h | 7 +- arch/mips/include/asm/hugetlb.h | 2 +- arch/mips/include/asm/kprobes.h | 5 + arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 81 +- arch/mips/include/asm/mach-ath79/ar933x_uart.h | 67 + .../include/asm/mach-ath79/ar933x_uart_platform.h | 18 + arch/mips/include/asm/mach-ath79/ath79.h | 11 +- arch/mips/include/asm/mach-ath79/irq.h | 8 +- arch/mips/include/asm/mach-ath79/pci-ath724x.h | 21 + arch/mips/include/asm/mach-au1x00/au1000.h | 273 ++- arch/mips/include/asm/mach-au1x00/au1100_mmc.h | 2 + arch/mips/include/asm/mach-au1x00/au1200fb.h | 14 + arch/mips/include/asm/mach-au1x00/au1550nd.h | 16 + arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 31 + .../asm/mach-au1x00/cpu-feature-overrides.h | 3 + arch/mips/include/asm/mach-au1x00/gpio-au1300.h | 241 +++ arch/mips/include/asm/mach-au1x00/gpio.h | 3 + arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 597 ++++-- arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h | 2 + arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h | 2 + arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h | 12 +- arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 231 ++- arch/mips/include/asm/mach-bcm63xx/ioremap.h | 42 + arch/mips/include/asm/mach-bcm63xx/irq.h | 7 + arch/mips/include/asm/mach-db1x00/bcsr.h | 36 +- arch/mips/include/asm/mach-db1x00/db1200.h | 11 +- arch/mips/include/asm/mach-db1x00/db1300.h | 40 + arch/mips/include/asm/mach-db1x00/db1x00.h | 79 - arch/mips/include/asm/mach-db1x00/irq.h | 23 + arch/mips/include/asm/mach-generic/floppy.h | 2 +- arch/mips/include/asm/mach-jazz/floppy.h | 2 +- .../asm/mach-netlogic/cpu-feature-overrides.h | 23 +- arch/mips/include/asm/mach-pb1x00/mc146818rtc.h | 34 - arch/mips/include/asm/mach-pb1x00/pb1000.h | 87 - arch/mips/include/asm/mach-pb1x00/pb1200.h | 139 -- arch/mips/include/asm/mach-pb1x00/pb1550.h | 73 - arch/mips/include/asm/mipsregs.h | 9 +- arch/mips/include/asm/module.h | 6 +- arch/mips/include/asm/netlogic/common.h | 76 + arch/mips/include/asm/netlogic/haldefs.h | 163 ++ arch/mips/include/asm/netlogic/xlp-hal/bridge.h | 187 ++ .../mips/include/asm/netlogic/xlp-hal/cpucontrol.h | 83 + arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 153 ++ arch/mips/include/asm/netlogic/xlp-hal/pic.h | 411 ++++ arch/mips/include/asm/netlogic/xlp-hal/sys.h | 129 ++ arch/mips/include/asm/netlogic/xlp-hal/uart.h | 191 ++ .../asm/netlogic/xlp-hal/xlp.h} | 25 +- arch/mips/include/asm/netlogic/xlr/iomap.h | 22 - arch/mips/include/asm/netlogic/xlr/msidef.h | 84 + arch/mips/include/asm/netlogic/xlr/pic.h | 69 +- arch/mips/include/asm/netlogic/xlr/xlr.h | 13 +- .../mips/include/asm}/octeon/cvmx-address.h | 0 .../mips/include/asm}/octeon/cvmx-asxx-defs.h | 0 arch/mips/include/asm/octeon/cvmx-bootinfo.h | 82 +- .../mips/include/asm}/octeon/cvmx-cmd-queue.h | 0 .../mips/include/asm}/octeon/cvmx-config.h | 1 - .../mips/include/asm}/octeon/cvmx-dbg-defs.h | 0 arch/mips/include/asm/octeon/cvmx-dpi-defs.h | 643 ++++++ .../mips/include/asm}/octeon/cvmx-fau.h | 0 .../mips/include/asm}/octeon/cvmx-fpa-defs.h | 0 .../mips/include/asm}/octeon/cvmx-fpa.h | 0 .../mips/include/asm}/octeon/cvmx-gmxx-defs.h | 0 .../mips/include/asm}/octeon/cvmx-helper-board.h | 6 + .../mips/include/asm}/octeon/cvmx-helper-fpa.h | 0 .../mips/include/asm}/octeon/cvmx-helper-loop.h | 1 + .../mips/include/asm}/octeon/cvmx-helper-npi.h | 1 + .../mips/include/asm}/octeon/cvmx-helper-rgmii.h | 1 + .../mips/include/asm}/octeon/cvmx-helper-sgmii.h | 1 + .../mips/include/asm}/octeon/cvmx-helper-spi.h | 1 + .../mips/include/asm}/octeon/cvmx-helper-util.h | 0 .../mips/include/asm}/octeon/cvmx-helper-xaui.h | 1 + .../mips/include/asm}/octeon/cvmx-helper.h | 1 + .../mips/include/asm}/octeon/cvmx-ipd.h | 0 .../mips/include/asm}/octeon/cvmx-mdio.h | 0 arch/mips/include/asm/octeon/cvmx-mio-defs.h | 1033 +++++++++- arch/mips/include/asm/octeon/cvmx-npei-defs.h | 4 +- arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 609 +++++- .../mips/include/asm}/octeon/cvmx-pcsx-defs.h | 0 .../mips/include/asm}/octeon/cvmx-pcsxx-defs.h | 0 arch/mips/include/asm/octeon/cvmx-pemx-defs.h | 509 +++++ arch/mips/include/asm/octeon/cvmx-pexp-defs.h | 19 +- .../mips/include/asm}/octeon/cvmx-pip-defs.h | 0 .../mips/include/asm}/octeon/cvmx-pip.h | 0 .../mips/include/asm}/octeon/cvmx-pko-defs.h | 0 .../mips/include/asm}/octeon/cvmx-pko.h | 0 .../mips/include/asm}/octeon/cvmx-pow.h | 0 .../mips/include/asm}/octeon/cvmx-scratch.h | 0 arch/mips/include/asm/octeon/cvmx-sli-defs.h | 2172 ++++++++++++++++++++ .../mips/include/asm}/octeon/cvmx-spi.h | 0 .../mips/include/asm}/octeon/cvmx-spxx-defs.h | 0 arch/mips/include/asm/octeon/cvmx-sriox-defs.h | 1036 ++++++++++ .../mips/include/asm}/octeon/cvmx-srxx-defs.h | 0 .../mips/include/asm}/octeon/cvmx-stxx-defs.h | 0 .../mips/include/asm}/octeon/cvmx-wqe.h | 0 arch/mips/include/asm/octeon/cvmx.h | 42 +- arch/mips/include/asm/octeon/octeon-feature.h | 114 +- arch/mips/include/asm/octeon/octeon-model.h | 215 +-- arch/mips/include/asm/octeon/pci-octeon.h | 3 +- arch/mips/include/asm/pgtable-32.h | 18 +- arch/mips/include/asm/tlbmisc.h | 10 + arch/mips/include/asm/traps.h | 13 + arch/mips/jazz/irq.c | 3 +- arch/mips/jazz/setup.c | 1 + arch/mips/jz4740/board-qi_lb60.c | 2 +- arch/mips/kernel/Makefile | 2 + arch/mips/kernel/bmips_vec.S | 255 +++ arch/mips/kernel/branch.c | 128 +- arch/mips/kernel/cevt-bcm1480.c | 2 +- arch/mips/kernel/cevt-ds1287.c | 2 +- arch/mips/kernel/cevt-gt641xx.c | 2 +- arch/mips/kernel/cevt-r4k.c | 2 +- arch/mips/kernel/cevt-sb1250.c | 2 +- arch/mips/kernel/cevt-txx9.c | 2 +- arch/mips/kernel/cpu-probe.c | 28 +- arch/mips/kernel/i8253.c | 2 +- arch/mips/kernel/kprobes.c | 177 ++- arch/mips/kernel/perf_event_mipsxx.c | 72 +- arch/mips/kernel/rtlx.c | 1 - arch/mips/kernel/setup.c | 43 +- arch/mips/kernel/smp-bmips.c | 458 ++++ arch/mips/kernel/smtc.c | 6 +- arch/mips/kernel/traps.c | 16 +- arch/mips/lantiq/clk.c | 4 +- arch/mips/lantiq/irq.c | 13 +- arch/mips/lantiq/xway/dma.c | 6 +- arch/mips/lantiq/xway/ebu.c | 6 +- arch/mips/lantiq/xway/pmu.c | 8 +- arch/mips/lantiq/xway/reset.c | 6 +- arch/mips/lib/Makefile | 1 + arch/mips/loongson/common/cs5536/cs5536_mfgpt.c | 2 +- arch/mips/math-emu/cp1emu.c | 2 +- arch/mips/mm/Makefile | 5 +- arch/mips/mm/c-octeon.c | 2 +- arch/mips/mm/c-r4k.c | 3 + arch/mips/mm/gup.c | 315 +++ arch/mips/mm/init.c | 9 +- arch/mips/mm/tlb-r3k.c | 1 + arch/mips/mm/tlb-r4k.c | 68 +- arch/mips/mti-malta/malta-int.c | 4 +- arch/mips/netlogic/Kconfig | 3 - arch/mips/netlogic/Makefile | 3 + arch/mips/netlogic/Platform | 13 +- arch/mips/netlogic/common/Makefile | 3 + arch/mips/netlogic/common/earlycons.c | 60 + arch/mips/netlogic/common/irq.c | 238 +++ arch/mips/netlogic/{xlr => common}/smp.c | 152 +- arch/mips/netlogic/common/smpboot.S | 272 +++ arch/mips/netlogic/{xlr => common}/time.c | 6 +- arch/mips/netlogic/xlp/Makefile | 2 + arch/mips/netlogic/xlp/nlm_hal.c | 111 + arch/mips/netlogic/xlp/platform.c | 108 + arch/mips/netlogic/xlp/setup.c | 105 + arch/mips/netlogic/xlp/wakeup.c | 102 + arch/mips/netlogic/xlr/Makefile | 7 +- arch/mips/netlogic/xlr/irq.c | 300 --- arch/mips/netlogic/xlr/platform.c | 31 +- arch/mips/netlogic/xlr/setup.c | 31 +- arch/mips/netlogic/xlr/{smpboot.S => wakeup.c} | 80 +- arch/mips/pci/Makefile | 3 +- arch/mips/pci/msi-octeon.c | 2 +- arch/mips/pci/ops-pmcmsp.c | 2 +- arch/mips/pci/ops-tx3927.c | 2 +- arch/mips/pci/pci-alchemy.c | 138 +- arch/mips/pci/pci-ath724x.c | 174 ++ arch/mips/pci/pci-bcm63xx.c | 4 +- arch/mips/pci/pci-octeon.c | 26 +- arch/mips/pci/pci-tx4927.c | 2 +- arch/mips/pci/pci-tx4938.c | 2 +- arch/mips/pci/pci-tx4939.c | 2 +- arch/mips/pci/pci-xlr.c | 128 ++- arch/mips/pci/pci.c | 29 +- arch/mips/pci/pcie-octeon.c | 1349 +++++++++--- arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c | 2 +- arch/mips/pmc-sierra/msp71xx/msp_setup.c | 2 +- arch/mips/pmc-sierra/msp71xx/msp_smp.c | 4 +- arch/mips/pnx8550/common/int.c | 4 +- arch/mips/pnx8550/common/time.c | 4 +- arch/mips/sgi-ip22/Makefile | 2 +- arch/mips/sgi-ip22/ip22-gio.c | 428 ++++ arch/mips/sgi-ip22/ip22-int.c | 10 +- arch/mips/sgi-ip22/ip22-mc.c | 10 +- arch/mips/sgi-ip22/ip22-setup.c | 21 - arch/mips/sgi-ip27/ip27-irq.c | 6 +- arch/mips/sgi-ip27/ip27-timer.c | 2 +- arch/mips/sgi-ip32/ip32-irq.c | 2 - arch/mips/sni/irq.c | 2 +- arch/mips/sni/time.c | 2 +- arch/mips/txx9/generic/pci.c | 2 +- drivers/i2c/busses/Kconfig | 4 +- drivers/mmc/host/au1xmmc.c | 45 +- drivers/mtd/nand/au1550nd.c | 308 ++-- drivers/net/irda/Kconfig | 6 +- drivers/net/irda/au1000_ircc.h | 125 -- drivers/net/irda/au1k_ir.c | 1229 ++++++----- drivers/pcmcia/Kconfig | 8 +- drivers/pcmcia/Makefile | 4 - drivers/pcmcia/au1000_generic.c | 545 ----- drivers/pcmcia/au1000_generic.h | 135 -- drivers/pcmcia/au1000_pb1x00.c | 294 --- drivers/pcmcia/db1xxx_ss.c | 26 +- drivers/spi/Kconfig | 4 +- drivers/staging/octeon/Makefile | 5 - drivers/staging/octeon/cvmx-packet.h | 65 - drivers/staging/octeon/cvmx-smix-defs.h | 178 -- drivers/staging/octeon/ethernet-defines.h | 2 +- drivers/staging/octeon/ethernet-mdio.c | 4 +- drivers/staging/octeon/ethernet-mem.c | 2 +- drivers/staging/octeon/ethernet-rgmii.c | 4 +- drivers/staging/octeon/ethernet-rx.c | 16 +- drivers/staging/octeon/ethernet-rx.h | 2 +- drivers/staging/octeon/ethernet-sgmii.c | 4 +- drivers/staging/octeon/ethernet-spi.c | 6 +- drivers/staging/octeon/ethernet-tx.c | 12 +- drivers/staging/octeon/ethernet-xaui.c | 4 +- drivers/staging/octeon/ethernet.c | 16 +- drivers/tty/serial/Kconfig | 23 + drivers/tty/serial/Makefile | 1 + drivers/tty/serial/ar933x_uart.c | 688 +++++++ drivers/usb/host/Kconfig | 2 +- drivers/usb/host/alchemy-common.c | 277 +++ drivers/usb/host/ehci-ath79.c | 4 + drivers/usb/host/ohci-au1xxx.c | 13 +- drivers/video/Kconfig | 8 +- drivers/video/au1100fb.c | 12 - drivers/video/au1200fb.c | 273 ++-- drivers/video/console/newport_con.c | 63 +- include/linux/serial_core.h | 4 + sound/soc/au1x/Kconfig | 14 +- sound/soc/au1x/db1200.c | 73 +- 353 files changed, 23184 insertions(+), 8396 deletions(-) create mode 100644 arch/mips/alchemy/Makefile rename arch/mips/alchemy/{gpr/platform.c => board-gpr.c} (75%) rename arch/mips/alchemy/{mtx-1/platform.c => board-mtx1.c} (71%) create mode 100644 arch/mips/alchemy/board-xxs1500.c create mode 100644 arch/mips/alchemy/common/vss.c create mode 100644 arch/mips/alchemy/devboards/db1000.c rename arch/mips/alchemy/devboards/{db1200/platform.c => db1200.c} (62%) delete mode 100644 arch/mips/alchemy/devboards/db1200/Makefile delete mode 100644 arch/mips/alchemy/devboards/db1200/setup.c create mode 100644 arch/mips/alchemy/devboards/db1300.c create mode 100644 arch/mips/alchemy/devboards/db1550.c delete mode 100644 arch/mips/alchemy/devboards/db1x00/Makefile delete mode 100644 arch/mips/alchemy/devboards/db1x00/board_setup.c delete mode 100644 arch/mips/alchemy/devboards/db1x00/platform.c delete mode 100644 arch/mips/alchemy/devboards/pb1000/Makefile delete mode 100644 arch/mips/alchemy/devboards/pb1000/board_setup.c rename arch/mips/alchemy/devboards/{pb1100/board_setup.c => pb1100.c} (55%) delete mode 100644 arch/mips/alchemy/devboards/pb1100/Makefile delete mode 100644 arch/mips/alchemy/devboards/pb1100/platform.c delete mode 100644 arch/mips/alchemy/devboards/pb1200/Makefile delete mode 100644 arch/mips/alchemy/devboards/pb1200/board_setup.c delete mode 100644 arch/mips/alchemy/devboards/pb1200/platform.c rename arch/mips/alchemy/devboards/{pb1500/board_setup.c => pb1500.c} (51%) delete mode 100644 arch/mips/alchemy/devboards/pb1500/Makefile delete mode 100644 arch/mips/alchemy/devboards/pb1500/platform.c rename arch/mips/alchemy/devboards/{pb1550/platform.c => pb1550.c} (61%) delete mode 100644 arch/mips/alchemy/devboards/pb1550/Makefile delete mode 100644 arch/mips/alchemy/devboards/pb1550/board_setup.c delete mode 100644 arch/mips/alchemy/gpr/Makefile delete mode 100644 arch/mips/alchemy/gpr/board_setup.c delete mode 100644 arch/mips/alchemy/gpr/init.c delete mode 100644 arch/mips/alchemy/mtx-1/Makefile delete mode 100644 arch/mips/alchemy/mtx-1/board_setup.c delete mode 100644 arch/mips/alchemy/mtx-1/init.c delete mode 100644 arch/mips/alchemy/xxs1500/Makefile delete mode 100644 arch/mips/alchemy/xxs1500/board_setup.c delete mode 100644 arch/mips/alchemy/xxs1500/init.c delete mode 100644 arch/mips/alchemy/xxs1500/platform.c delete mode 100644 arch/mips/ath79/dev-ar913x-wmac.c create mode 100644 arch/mips/ath79/dev-usb.c rename arch/mips/ath79/{dev-ar913x-wmac.h => dev-usb.h} (61%) create mode 100644 arch/mips/ath79/dev-wmac.c create mode 100644 arch/mips/ath79/dev-wmac.h create mode 100644 arch/mips/ath79/mach-ap121.c create mode 100644 arch/mips/ath79/mach-ubnt-xm.c rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-cmd-queue.c (98%) rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-fpa.c (100%) rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-board.c (96%) rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-fpa.c (100%) rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-loop.c (95%) rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-npi.c (96%) rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-rgmii.c (97%) rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-sgmii.c (98%) rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-spi.c (94%) rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-util.c (97%) rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-xaui.c (97%) rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper.c (93%) rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-interrupt-decodes.c (98%) rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-interrupt-rsl.c (97%) rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-pko.c (98%) rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-spi.c (99%) delete mode 100644 arch/mips/configs/db1100_defconfig create mode 100644 arch/mips/configs/db1300_defconfig delete mode 100644 arch/mips/configs/db1500_defconfig create mode 100644 arch/mips/configs/nlm_xlp_defconfig delete mode 100644 arch/mips/configs/pb1200_defconfig create mode 100644 arch/mips/include/asm/bmips.h create mode 100644 arch/mips/include/asm/gio_device.h create mode 100644 arch/mips/include/asm/mach-ath79/ar933x_uart.h create mode 100644 arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h create mode 100644 arch/mips/include/asm/mach-ath79/pci-ath724x.h create mode 100644 arch/mips/include/asm/mach-au1x00/au1200fb.h create mode 100644 arch/mips/include/asm/mach-au1x00/au1550nd.h create mode 100644 arch/mips/include/asm/mach-au1x00/gpio-au1300.h create mode 100644 arch/mips/include/asm/mach-bcm63xx/ioremap.h create mode 100644 arch/mips/include/asm/mach-bcm63xx/irq.h create mode 100644 arch/mips/include/asm/mach-db1x00/db1300.h delete mode 100644 arch/mips/include/asm/mach-db1x00/db1x00.h create mode 100644 arch/mips/include/asm/mach-db1x00/irq.h delete mode 100644 arch/mips/include/asm/mach-pb1x00/mc146818rtc.h delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1000.h delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1200.h delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1550.h create mode 100644 arch/mips/include/asm/netlogic/common.h create mode 100644 arch/mips/include/asm/netlogic/haldefs.h create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/bridge.h create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/iomap.h create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/pic.h create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/sys.h create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/uart.h rename arch/mips/{netlogic/xlr/xlr_console.c => include/asm/netlogic/xlp-hal/xlp.h} (82%) create mode 100644 arch/mips/include/asm/netlogic/xlr/msidef.h rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-address.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-asxx-defs.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-cmd-queue.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-config.h (99%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-dbg-defs.h (100%) create mode 100644 arch/mips/include/asm/octeon/cvmx-dpi-defs.h rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-fau.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-fpa-defs.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-fpa.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-gmxx-defs.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-board.h (96%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-fpa.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-loop.h (96%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-npi.h (96%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-rgmii.h (98%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-sgmii.h (98%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-spi.h (98%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-util.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-xaui.h (98%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper.h (99%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-ipd.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-mdio.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pcsx-defs.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pcsxx-defs.h (100%) create mode 100644 arch/mips/include/asm/octeon/cvmx-pemx-defs.h rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pip-defs.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pip.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pko-defs.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pko.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pow.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-scratch.h (100%) create mode 100644 arch/mips/include/asm/octeon/cvmx-sli-defs.h rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-spi.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-spxx-defs.h (100%) create mode 100644 arch/mips/include/asm/octeon/cvmx-sriox-defs.h rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-srxx-defs.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-stxx-defs.h (100%) rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-wqe.h (100%) create mode 100644 arch/mips/include/asm/tlbmisc.h create mode 100644 arch/mips/kernel/bmips_vec.S create mode 100644 arch/mips/kernel/smp-bmips.c create mode 100644 arch/mips/mm/gup.c create mode 100644 arch/mips/netlogic/Makefile create mode 100644 arch/mips/netlogic/common/Makefile create mode 100644 arch/mips/netlogic/common/earlycons.c create mode 100644 arch/mips/netlogic/common/irq.c rename arch/mips/netlogic/{xlr => common}/smp.c (65%) create mode 100644 arch/mips/netlogic/common/smpboot.S rename arch/mips/netlogic/{xlr => common}/time.c (93%) create mode 100644 arch/mips/netlogic/xlp/Makefile create mode 100644 arch/mips/netlogic/xlp/nlm_hal.c create mode 100644 arch/mips/netlogic/xlp/platform.c create mode 100644 arch/mips/netlogic/xlp/setup.c create mode 100644 arch/mips/netlogic/xlp/wakeup.c delete mode 100644 arch/mips/netlogic/xlr/irq.c rename arch/mips/netlogic/xlr/{smpboot.S => wakeup.c} (60%) create mode 100644 arch/mips/pci/pci-ath724x.c create mode 100644 arch/mips/sgi-ip22/ip22-gio.c delete mode 100644 drivers/net/irda/au1000_ircc.h delete mode 100644 drivers/pcmcia/au1000_generic.c delete mode 100644 drivers/pcmcia/au1000_generic.h delete mode 100644 drivers/pcmcia/au1000_pb1x00.c delete mode 100644 drivers/staging/octeon/cvmx-packet.h delete mode 100644 drivers/staging/octeon/cvmx-smix-defs.h create mode 100644 drivers/tty/serial/ar933x_uart.c Merging openrisc/for-upstream (b6fd41e Linux 3.1-rc6) $ git merge openrisc/for-upstream Already up-to-date. Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls) $ git merge parisc/for-next Merge made by the 'recursive' strategy. arch/parisc/include/asm/futex.h | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) Merging powerpc/next (fa8cbaa powerpc+sparc64/mm: Remove hack in mmap randomize layout) $ git merge powerpc/next Removing arch/powerpc/boot/dts/p5020si.dtsi Removing arch/powerpc/boot/dts/p4080si.dtsi Removing arch/powerpc/boot/dts/p3060si.dtsi Removing arch/powerpc/boot/dts/p3041si.dtsi Removing arch/powerpc/boot/dts/p2041si.dtsi Removing arch/powerpc/boot/dts/p2020si.dtsi Removing arch/powerpc/boot/dts/p1020si.dtsi Removing arch/powerpc/boot/dts/p1010si.dtsi Merge made by the 'recursive' strategy. .../devicetree/bindings/powerpc/fsl/srio-rmu.txt | 163 +++ .../devicetree/bindings/powerpc/fsl/srio.txt | 103 ++ arch/powerpc/Kconfig | 1 + arch/powerpc/Kconfig.debug | 12 + arch/powerpc/Makefile | 3 +- arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi | 248 ++++ arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi | 63 + arch/powerpc/boot/dts/fsl/mpc8544si-post.dtsi | 191 +++ arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi | 63 + arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi | 143 ++ arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi | 62 + arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi | 270 ++++ arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi | 65 + arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi | 304 ++++ arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi | 64 + arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi | 196 +++ arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi | 70 + arch/powerpc/boot/dts/fsl/p1010si-post.dtsi | 198 +++ arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi | 64 + arch/powerpc/boot/dts/fsl/p1020si-post.dtsi | 174 +++ arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi | 68 + arch/powerpc/boot/dts/fsl/p1021si-post.dtsi | 225 +++ arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi | 68 + arch/powerpc/boot/dts/fsl/p1022si-post.dtsi | 235 +++ arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi | 68 + arch/powerpc/boot/dts/fsl/p1023si-post.dtsi | 224 +++ arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi | 76 + arch/powerpc/boot/dts/fsl/p2020si-post.dtsi | 194 +++ arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi | 69 + arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 325 +++++ arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi | 111 ++ arch/powerpc/boot/dts/fsl/p3041si-post.dtsi | 352 +++++ arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi | 112 ++ arch/powerpc/boot/dts/fsl/p3060si-post.dtsi | 296 ++++ arch/powerpc/boot/dts/fsl/p3060si-pre.dtsi | 125 ++ arch/powerpc/boot/dts/fsl/p4080si-post.dtsi | 350 +++++ arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi | 143 ++ arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 355 +++++ arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi | 96 ++ arch/powerpc/boot/dts/fsl/pq3-dma-0.dtsi | 66 + arch/powerpc/boot/dts/fsl/pq3-dma-1.dtsi | 66 + arch/powerpc/boot/dts/fsl/pq3-duart-0.dtsi | 51 + arch/powerpc/boot/dts/fsl/pq3-esdhc-0.dtsi | 41 + arch/powerpc/boot/dts/fsl/pq3-espi-0.dtsi | 41 + arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi | 53 + arch/powerpc/boot/dts/fsl/pq3-etsec1-1.dtsi | 53 + arch/powerpc/boot/dts/fsl/pq3-etsec1-2.dtsi | 53 + arch/powerpc/boot/dts/fsl/pq3-etsec1-3.dtsi | 53 + arch/powerpc/boot/dts/fsl/pq3-etsec1-timer-0.dtsi | 39 + arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi | 60 + arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi | 60 + arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi | 59 + arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-0.dtsi | 42 + arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-1.dtsi | 42 + arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-2.dtsi | 42 + arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi | 41 + arch/powerpc/boot/dts/fsl/pq3-i2c-0.dtsi | 43 + arch/powerpc/boot/dts/fsl/pq3-i2c-1.dtsi | 43 + arch/powerpc/boot/dts/fsl/pq3-mpic-timer-B.dtsi | 42 + arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi | 66 + arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi | 68 + arch/powerpc/boot/dts/fsl/pq3-sata2-0.dtsi | 40 + arch/powerpc/boot/dts/fsl/pq3-sata2-1.dtsi | 40 + arch/powerpc/boot/dts/fsl/pq3-sec2.1-0.dtsi | 43 + arch/powerpc/boot/dts/fsl/pq3-sec3.0-0.dtsi | 45 + arch/powerpc/boot/dts/fsl/pq3-sec3.1-0.dtsi | 45 + arch/powerpc/boot/dts/fsl/pq3-sec3.3-0.dtsi | 45 + arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi | 65 + arch/powerpc/boot/dts/fsl/pq3-usb2-dr-0.dtsi | 41 + arch/powerpc/boot/dts/fsl/pq3-usb2-dr-1.dtsi | 41 + arch/powerpc/boot/dts/fsl/qoriq-dma-0.dtsi | 66 + arch/powerpc/boot/dts/fsl/qoriq-dma-1.dtsi | 66 + arch/powerpc/boot/dts/fsl/qoriq-duart-0.dtsi | 51 + arch/powerpc/boot/dts/fsl/qoriq-duart-1.dtsi | 51 + arch/powerpc/boot/dts/fsl/qoriq-esdhc-0.dtsi | 40 + arch/powerpc/boot/dts/fsl/qoriq-espi-0.dtsi | 41 + arch/powerpc/boot/dts/fsl/qoriq-gpio-0.dtsi | 41 + arch/powerpc/boot/dts/fsl/qoriq-i2c-0.dtsi | 53 + arch/powerpc/boot/dts/fsl/qoriq-i2c-1.dtsi | 53 + arch/powerpc/boot/dts/fsl/qoriq-mpic.dtsi | 106 ++ arch/powerpc/boot/dts/fsl/qoriq-rmu-0.dtsi | 68 + arch/powerpc/boot/dts/fsl/qoriq-sata2-0.dtsi | 39 + arch/powerpc/boot/dts/fsl/qoriq-sata2-1.dtsi | 39 + arch/powerpc/boot/dts/fsl/qoriq-sec4.0-0.dtsi | 100 ++ arch/powerpc/boot/dts/fsl/qoriq-sec4.1-0.dtsi | 109 ++ arch/powerpc/boot/dts/fsl/qoriq-sec4.2-0.dtsi | 109 ++ arch/powerpc/boot/dts/fsl/qoriq-usb2-dr-0.dtsi | 41 + arch/powerpc/boot/dts/fsl/qoriq-usb2-mph-0.dtsi | 41 + arch/powerpc/boot/dts/mpc8536ds.dts | 456 +------ arch/powerpc/boot/dts/mpc8536ds.dtsi | 141 ++ arch/powerpc/boot/dts/mpc8536ds_36b.dts | 410 +----- arch/powerpc/boot/dts/mpc8544ds.dts | 473 +------ arch/powerpc/boot/dts/mpc8544ds.dtsi | 161 +++ arch/powerpc/boot/dts/mpc8548cds.dts | 505 ++----- arch/powerpc/boot/dts/mpc8568mds.dts | 482 +------ arch/powerpc/boot/dts/mpc8569mds.dts | 414 +----- arch/powerpc/boot/dts/mpc8572ds.dts | 757 +---------- arch/powerpc/boot/dts/mpc8572ds.dtsi | 397 +++++ arch/powerpc/boot/dts/mpc8572ds_36b.dts | 746 +---------- arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | 487 +------ arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts | 245 +--- arch/powerpc/boot/dts/mpc8641_hpcn.dts | 69 +- arch/powerpc/boot/dts/p1010rdb.dts | 228 +--- arch/powerpc/boot/dts/p1010rdb.dtsi | 229 +++ arch/powerpc/boot/dts/p1010rdb_36b.dts | 89 ++ arch/powerpc/boot/dts/p1010si.dtsi | 374 ----- arch/powerpc/boot/dts/p1020rdb.dts | 262 +---- arch/powerpc/boot/dts/p1020rdb.dtsi | 242 ++++ arch/powerpc/boot/dts/p1020rdb_36b.dts | 66 + arch/powerpc/boot/dts/p1020rdb_camp_core0.dts | 154 +-- arch/powerpc/boot/dts/p1020rdb_camp_core1.dts | 11 +- arch/powerpc/boot/dts/p1020si.dtsi | 377 ----- arch/powerpc/boot/dts/p1021mds.dts | 421 +----- arch/powerpc/boot/dts/p1022ds.dts | 449 +------ arch/powerpc/boot/dts/p1023rds.dts | 380 +----- arch/powerpc/boot/dts/p2020ds.dts | 353 +----- arch/powerpc/boot/dts/p2020ds.dtsi | 316 ++++ arch/powerpc/boot/dts/p2020rdb.dts | 63 +- arch/powerpc/boot/dts/p2020rdb_camp_core0.dts | 141 +-- arch/powerpc/boot/dts/p2020rdb_camp_core1.dts | 107 +-- arch/powerpc/boot/dts/p2020si.dtsi | 382 ----- arch/powerpc/boot/dts/p2041rdb.dts | 22 +- arch/powerpc/boot/dts/p2041si.dtsi | 692 --------- arch/powerpc/boot/dts/p3041ds.dts | 23 +- arch/powerpc/boot/dts/p3041si.dtsi | 729 ---------- arch/powerpc/boot/dts/p3060qds.dts | 12 +- arch/powerpc/boot/dts/p3060si.dtsi | 719 --------- arch/powerpc/boot/dts/p4080ds.dts | 24 +- arch/powerpc/boot/dts/p4080si.dtsi | 755 ---------- arch/powerpc/boot/dts/p5020ds.dts | 24 +- arch/powerpc/boot/dts/p5020si.dtsi | 716 --------- arch/powerpc/configs/chroma_defconfig | 307 ++++ arch/powerpc/include/asm/cputable.h | 2 +- arch/powerpc/include/asm/fsl_lbc.h | 7 +- arch/powerpc/include/asm/machdep.h | 3 + arch/powerpc/include/asm/mmu-book3e.h | 4 + arch/powerpc/include/asm/page.h | 1 + arch/powerpc/include/asm/pci-bridge.h | 6 +- arch/powerpc/include/asm/pgtable.h | 3 + arch/powerpc/include/asm/reg_booke.h | 4 + arch/powerpc/include/asm/rtas.h | 6 + arch/powerpc/include/asm/tce.h | 10 +- arch/powerpc/include/asm/time.h | 2 + arch/powerpc/kernel/cpu_setup_a2.S | 10 +- arch/powerpc/kernel/irq.c | 24 +- arch/powerpc/kernel/pci-common.c | 75 +- arch/powerpc/kernel/pci_dn.c | 3 + arch/powerpc/kernel/process.c | 22 +- arch/powerpc/kernel/rtas_flash.c | 6 + arch/powerpc/kernel/rtasd.c | 7 + arch/powerpc/kernel/smp.c | 3 +- arch/powerpc/kernel/sysfs.c | 8 + arch/powerpc/kernel/time.c | 95 +- arch/powerpc/mm/Makefile | 2 + arch/powerpc/mm/fault.c | 17 + arch/powerpc/mm/icswx.c | 273 ++++ arch/powerpc/mm/icswx.h | 62 + arch/powerpc/mm/icswx_pid.c | 87 ++ arch/powerpc/mm/mem.c | 18 + arch/powerpc/mm/mmap_64.c | 14 +- arch/powerpc/mm/mmu_context_hash64.c | 195 +--- arch/powerpc/platforms/83xx/asp834x.c | 35 +- arch/powerpc/platforms/83xx/km83xx.c | 58 +- arch/powerpc/platforms/83xx/misc.c | 77 + arch/powerpc/platforms/83xx/mpc830x_rdb.c | 40 +- arch/powerpc/platforms/83xx/mpc831x_rdb.c | 43 +- arch/powerpc/platforms/83xx/mpc832x_mds.c | 53 +- arch/powerpc/platforms/83xx/mpc832x_rdb.c | 56 +- arch/powerpc/platforms/83xx/mpc834x_itx.c | 30 +- arch/powerpc/platforms/83xx/mpc834x_mds.c | 42 +- arch/powerpc/platforms/83xx/mpc836x_mds.c | 53 +- arch/powerpc/platforms/83xx/mpc836x_rdk.c | 48 +- arch/powerpc/platforms/83xx/mpc837x_mds.c | 46 +- arch/powerpc/platforms/83xx/mpc837x_rdb.c | 47 +- arch/powerpc/platforms/83xx/mpc83xx.h | 16 + arch/powerpc/platforms/83xx/sbc834x.c | 45 +- arch/powerpc/platforms/85xx/Makefile | 2 + arch/powerpc/platforms/85xx/common.c | 66 + arch/powerpc/platforms/85xx/corenet_ds.c | 2 +- arch/powerpc/platforms/85xx/ksi8560.c | 46 +- arch/powerpc/platforms/85xx/mpc8536_ds.c | 16 +- arch/powerpc/platforms/85xx/mpc85xx.h | 11 + arch/powerpc/platforms/85xx/mpc85xx_ads.c | 52 +- arch/powerpc/platforms/85xx/mpc85xx_cds.c | 18 +- arch/powerpc/platforms/85xx/mpc85xx_ds.c | 20 +- arch/powerpc/platforms/85xx/mpc85xx_mds.c | 47 +- arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 18 +- arch/powerpc/platforms/85xx/p1010rdb.c | 15 +- arch/powerpc/platforms/85xx/p1022_ds.c | 7 +- arch/powerpc/platforms/85xx/p1023_rds.c | 19 +- arch/powerpc/platforms/85xx/sbc8548.c | 18 +- arch/powerpc/platforms/85xx/sbc8560.c | 52 +- arch/powerpc/platforms/85xx/socrates.c | 13 +- arch/powerpc/platforms/85xx/stx_gp3.c | 51 +- arch/powerpc/platforms/85xx/tqm85xx.c | 51 +- arch/powerpc/platforms/85xx/xes_mpc85xx.c | 20 +- arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 2 +- arch/powerpc/platforms/Kconfig.cputype | 21 +- arch/powerpc/platforms/cell/iommu.c | 2 + arch/powerpc/platforms/maple/pci.c | 55 + arch/powerpc/platforms/powermac/setup.c | 8 +- arch/powerpc/platforms/powermac/smp.c | 4 +- arch/powerpc/platforms/powernv/Makefile | 2 +- arch/powerpc/platforms/powernv/pci-ioda.c | 1325 +++++++++++++++++ arch/powerpc/platforms/powernv/pci.c | 111 ++- arch/powerpc/platforms/powernv/pci.h | 84 ++ arch/powerpc/platforms/pseries/iommu.c | 61 +- arch/powerpc/platforms/wsp/Kconfig | 12 +- arch/powerpc/platforms/wsp/Makefile | 8 +- arch/powerpc/platforms/wsp/chroma.c | 56 + arch/powerpc/platforms/wsp/h8.c | 134 ++ arch/powerpc/platforms/wsp/opb_pic.c | 3 +- arch/powerpc/platforms/wsp/psr2.c | 56 +- arch/powerpc/platforms/wsp/wsp.c | 115 ++ arch/powerpc/platforms/wsp/wsp.h | 16 +- arch/powerpc/sysdev/Makefile | 2 +- arch/powerpc/sysdev/fsl_lbc.c | 36 + arch/powerpc/sysdev/fsl_msi.c | 39 + arch/powerpc/sysdev/fsl_msi.h | 3 + arch/powerpc/sysdev/fsl_rio.c | 1519 ++++---------------- arch/powerpc/sysdev/fsl_rio.h | 135 ++ arch/powerpc/sysdev/fsl_rmu.c | 1103 ++++++++++++++ arch/powerpc/sysdev/mpic.c | 2 +- arch/powerpc/sysdev/xics/icp-hv.c | 38 +- arch/powerpc/sysdev/xics/xics-common.c | 2 +- arch/powerpc/xmon/xmon.c | 16 +- arch/sparc/kernel/sys_sparc_64.c | 6 +- drivers/tty/serial/ucc_uart.c | 3 + tools/perf/arch/powerpc/util/dwarf-regs.c | 3 + 229 files changed, 15786 insertions(+), 14400 deletions(-) create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/srio-rmu.txt create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/srio.txt create mode 100644 arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/mpc8544si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p1010si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p1020si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p1021si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p1022si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p1023si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p2020si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p2041si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p3041si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p3060si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p3060si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p4080si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p5020si-post.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-dma-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-dma-1.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-duart-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-esdhc-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-espi-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-1.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-2.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-3.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-timer-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-1.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-2.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-i2c-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-i2c-1.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-mpic-timer-B.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sata2-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sata2-1.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec2.1-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec3.0-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec3.1-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec3.3-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-usb2-dr-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/pq3-usb2-dr-1.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-dma-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-dma-1.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-duart-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-duart-1.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-esdhc-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-espi-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-i2c-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-i2c-1.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-mpic.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-rmu-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sata2-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sata2-1.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec4.0-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec4.1-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec4.2-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-usb2-dr-0.dtsi create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-usb2-mph-0.dtsi create mode 100644 arch/powerpc/boot/dts/mpc8536ds.dtsi create mode 100644 arch/powerpc/boot/dts/mpc8544ds.dtsi create mode 100644 arch/powerpc/boot/dts/mpc8572ds.dtsi create mode 100644 arch/powerpc/boot/dts/p1010rdb.dtsi create mode 100644 arch/powerpc/boot/dts/p1010rdb_36b.dts delete mode 100644 arch/powerpc/boot/dts/p1010si.dtsi create mode 100644 arch/powerpc/boot/dts/p1020rdb.dtsi create mode 100644 arch/powerpc/boot/dts/p1020rdb_36b.dts delete mode 100644 arch/powerpc/boot/dts/p1020si.dtsi create mode 100644 arch/powerpc/boot/dts/p2020ds.dtsi delete mode 100644 arch/powerpc/boot/dts/p2020si.dtsi delete mode 100644 arch/powerpc/boot/dts/p2041si.dtsi delete mode 100644 arch/powerpc/boot/dts/p3041si.dtsi delete mode 100644 arch/powerpc/boot/dts/p3060si.dtsi delete mode 100644 arch/powerpc/boot/dts/p4080si.dtsi delete mode 100644 arch/powerpc/boot/dts/p5020si.dtsi create mode 100644 arch/powerpc/configs/chroma_defconfig create mode 100644 arch/powerpc/mm/icswx.c create mode 100644 arch/powerpc/mm/icswx.h create mode 100644 arch/powerpc/mm/icswx_pid.c create mode 100644 arch/powerpc/platforms/85xx/common.c create mode 100644 arch/powerpc/platforms/85xx/mpc85xx.h create mode 100644 arch/powerpc/platforms/powernv/pci-ioda.c create mode 100644 arch/powerpc/platforms/wsp/chroma.c create mode 100644 arch/powerpc/platforms/wsp/h8.c create mode 100644 arch/powerpc/platforms/wsp/wsp.c create mode 100644 arch/powerpc/sysdev/fsl_rio.h create mode 100644 arch/powerpc/sysdev/fsl_rmu.c Merging 4xx/next (f1ab937 MAINTAINERS: Update PowerPC 4xx git tree) $ git merge 4xx/next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 2 +- arch/powerpc/boot/dts/klondike.dts | 227 +++++++++++++++++++++++++++ arch/powerpc/configs/40x/klondike_defconfig | 55 +++++++ arch/powerpc/kernel/cputable.c | 13 ++ arch/powerpc/platforms/40x/Kconfig | 11 ++ arch/powerpc/platforms/40x/ppc40x_simple.c | 1 + 6 files changed, 308 insertions(+), 1 deletions(-) create mode 100644 arch/powerpc/boot/dts/klondike.dts create mode 100644 arch/powerpc/configs/40x/klondike_defconfig Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries) $ git merge 52xx-and-virtex/powerpc/next Merge made by the 'recursive' strategy. Merging galak/next (fa8cbaa powerpc+sparc64/mm: Remove hack in mmap randomize layout) $ git merge galak/next Already up-to-date. Merging s390/features (4a6f04b [S390] topology: increase poll frequency if change is anticipated) $ git merge s390/features Merge made by the 'recursive' strategy. arch/s390/Kbuild | 13 +- arch/s390/Kconfig | 11 +- arch/s390/Makefile | 1 - arch/s390/include/asm/lowcore.h | 142 +++--- arch/s390/include/asm/pgtable.h | 31 +- arch/s390/include/asm/smp.h | 1 - arch/s390/include/asm/sparsemem.h | 4 +- arch/s390/include/asm/topology.h | 40 ++- arch/s390/kernel/Makefile | 3 +- arch/s390/kernel/asm-offsets.c | 5 +- arch/s390/kernel/base.S | 16 +- arch/s390/kernel/entry.S | 1099 ++++++++++++++++--------------------- arch/s390/kernel/entry64.S | 973 +++++++++++++++------------------ arch/s390/kernel/head.S | 4 +- arch/s390/kernel/mem_detect.c | 122 +++-- arch/s390/kernel/ptrace.c | 18 + arch/s390/kernel/reipl64.S | 4 +- arch/s390/kernel/setup.c | 71 ++- arch/s390/kernel/signal.c | 8 +- arch/s390/kernel/smp.c | 121 +---- arch/s390/kernel/topology.c | 275 +++++++--- arch/s390/mm/fault.c | 6 +- arch/s390/mm/init.c | 16 +- arch/s390/mm/pgtable.c | 11 - drivers/s390/cio/cio.h | 5 + drivers/s390/cio/css.c | 104 ++-- drivers/s390/cio/device.c | 4 +- drivers/s390/cio/qdio_setup.c | 7 +- 28 files changed, 1496 insertions(+), 1619 deletions(-) Merging sh/sh-latest (b9a3acf Merge branch 'sh/stable-updates' into sh-latest) $ git merge sh/sh-latest Already up-to-date. Merging rmobile/rmobile-latest (b58c580 Merge branch 'rmobile-fixes-for-linus' into rmobile-latest) $ git merge rmobile/rmobile-latest Already up-to-date. Merging sparc-next/master (3ee72ca Merge git://github.com/davem330/net) $ git merge sparc-next/master Already up-to-date. Merging tile/master (1583171 Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile) $ git merge tile/master Already up-to-date. Merging unicore32/unicore32 (ed96dfb unicore32, exec: remove redundant set_fs(USER_DS)) $ git merge unicore32/unicore32 Already up-to-date. Merging xtensa/master (29aced6 xtensa: remove defining register numbers) $ git merge xtensa/master Merge made by the 'recursive' strategy. arch/xtensa/include/asm/irqflags.h | 1 + arch/xtensa/include/asm/regs.h | 91 ++++++++++++++++++--------------- arch/xtensa/include/asm/timex.h | 4 +- arch/xtensa/include/asm/uaccess.h | 2 +- arch/xtensa/kernel/align.S | 14 +++--- arch/xtensa/kernel/coprocessor.S | 10 ++-- arch/xtensa/kernel/entry.S | 98 ++++++++++++++++++------------------ arch/xtensa/kernel/head.S | 12 ++-- arch/xtensa/kernel/irq.c | 5 ++ arch/xtensa/kernel/traps.c | 4 +- arch/xtensa/kernel/vectors.S | 22 ++++---- arch/xtensa/kernel/vmlinux.lds.S | 1 + 12 files changed, 139 insertions(+), 125 deletions(-) Merging ceph/for-next (3395734 libceph: fix double-free of page vector) $ git merge ceph/for-next Already up-to-date. Merging cifs/master (9c32c63 cifs: Fix sparse warning when calling cifs_strtoUCS) $ git merge cifs/master Merge made by the 'recursive' strategy. fs/cifs/file.c | 26 ++++++++++++++++++++++++++ fs/cifs/smbencrypt.c | 6 +++--- 2 files changed, 29 insertions(+), 3 deletions(-) Merging configfs/linux-next (420118c configfs: Rework configfs_depend_item() locking and make lockdep happy) $ git merge configfs/linux-next Already up-to-date. Merging ecryptfs/next (aaef29d eCryptfs: Flush file in vma close) $ git merge ecryptfs/next Merge made by the 'recursive' strategy. Merging ext3/for_next (ed47a7d udf: Cleanup metadata flags handling) $ git merge ext3/for_next Already up-to-date. Merging ext4/dev (4c81f04 ext4: fix racy use-after-free in ext4_end_io_dio()) $ git merge ext4/dev Already up-to-date. Merging fatfs/master (710d440 fat: fat16 support maximum 4GB file/vol size as WinXP or 7.) $ git merge fatfs/master Already up-to-date. Merging fuse/for-next (cfcfc9e Linux 3.2-rc2) $ git merge fuse/for-next Already up-to-date. Merging gfs2/master (018a01c GFS2: We only need one ACL getting function) $ git merge gfs2/master Merge made by the 'recursive' strategy. fs/gfs2/acl.c | 14 +-- fs/gfs2/aops.c | 18 ++-- fs/gfs2/bmap.c | 26 ++--- fs/gfs2/dir.c | 64 ++++++++++- fs/gfs2/dir.h | 2 +- fs/gfs2/export.c | 3 +- fs/gfs2/file.c | 34 +++--- fs/gfs2/incore.h | 20 ++-- fs/gfs2/inode.c | 70 ++++++------ fs/gfs2/log.c | 2 +- fs/gfs2/main.c | 3 +- fs/gfs2/meta_io.c | 4 +- fs/gfs2/ops_fstype.c | 2 +- fs/gfs2/quota.c | 87 ++++++--------- fs/gfs2/rgrp.c | 293 +++++++++++++++++++++++++++---------------------- fs/gfs2/rgrp.h | 16 ++-- fs/gfs2/super.c | 14 ++-- fs/gfs2/trans.h | 6 +- fs/gfs2/xattr.c | 48 ++++----- 19 files changed, 393 insertions(+), 333 deletions(-) Merging hfsplus/for-next (6596528 hfsplus: ensure bio requests are not smaller than the hardware sectors) $ git merge hfsplus/for-next Already up-to-date. Merging jfs/next (1c8007b jfs: flush journal completely before releasing metadata inodes) $ git merge jfs/next Already up-to-date. Merging logfs/master (21f3eb8 logfs: update page reference count for pined pages) $ git merge logfs/master Resolved 'fs/logfs/file.c' using previous resolution. Auto-merging fs/logfs/super.c Auto-merging fs/logfs/readwrite.c Auto-merging fs/logfs/logfs.h Auto-merging fs/logfs/inode.c Auto-merging fs/logfs/file.c CONFLICT (content): Merge conflict in fs/logfs/file.c Auto-merging fs/logfs/dir.c Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 7b2d286] Merge remote-tracking branch 'logfs/master' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 1 + fs/logfs/dev_mtd.c | 26 +++++++++++------------- fs/logfs/dir.c | 2 +- fs/logfs/file.c | 2 + fs/logfs/gc.c | 2 +- fs/logfs/inode.c | 4 ++- fs/logfs/journal.c | 1 - fs/logfs/logfs.h | 5 +++- fs/logfs/readwrite.c | 51 +++++++++++++++++++++++++++++++++---------------- fs/logfs/segment.c | 51 ++++++++++++++++++++++++++++++++++++++----------- fs/logfs/super.c | 3 +- 11 files changed, 99 insertions(+), 49 deletions(-) Merging nfs/linux-next (883381d Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) $ git merge nfs/linux-next Already up-to-date. Merging nfsd/nfsd-next (353de31 nfsd4: fix CONFIG_NFSD_FAULT_INJECTION compile error) $ git merge nfsd/nfsd-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. CREDITS | 5 + Documentation/filesystems/nfs/00-INDEX | 2 + Documentation/filesystems/nfs/fault_injection.txt | 69 +++++ MAINTAINERS | 1 - fs/nfsd/Kconfig | 10 + fs/nfsd/Makefile | 1 + fs/nfsd/fault_inject.c | 91 +++++++ fs/nfsd/fault_inject.h | 28 ++ fs/nfsd/nfs4state.c | 297 +++++++++++++++------ fs/nfsd/nfsctl.c | 10 +- fs/nfsd/nfsd.h | 20 +- tools/nfsd/inject_fault.sh | 49 ++++ 12 files changed, 486 insertions(+), 97 deletions(-) create mode 100644 Documentation/filesystems/nfs/fault_injection.txt create mode 100644 fs/nfsd/fault_inject.c create mode 100644 fs/nfsd/fault_inject.h create mode 100755 tools/nfsd/inject_fault.sh Merging nilfs2/for-next (93ee7a9 Linux 3.1-rc2) $ git merge nilfs2/for-next Already up-to-date. Merging ocfs2/linux-next (249ec93 ocfs2: Use filemap_write_and_wait() instead of write_inode_now()) $ git merge ocfs2/linux-next Auto-merging fs/ocfs2/xattr.c Auto-merging fs/ocfs2/move_extents.c Auto-merging fs/ocfs2/inode.c Auto-merging fs/ocfs2/file.c Auto-merging fs/ocfs2/dlmglue.c Auto-merging fs/ocfs2/dir.c Auto-merging fs/ocfs2/cluster/tcp.c Merge made by the 'recursive' strategy. fs/ocfs2/alloc.c | 2 +- fs/ocfs2/aops.c | 69 +++++++++++++-- fs/ocfs2/aops.h | 14 +++ fs/ocfs2/cluster/heartbeat.c | 194 ++++++++++++++++++++++++++---------------- fs/ocfs2/cluster/netdebug.c | 102 +++++++++++++++------- fs/ocfs2/cluster/tcp.c | 138 ++++++++++++++++-------------- fs/ocfs2/cluster/tcp.h | 2 + fs/ocfs2/dir.c | 3 +- fs/ocfs2/dlm/dlmcommon.h | 56 +++---------- fs/ocfs2/dlm/dlmdomain.c | 44 +++++----- fs/ocfs2/dlm/dlmlock.c | 54 ++++++------ fs/ocfs2/dlm/dlmmaster.c | 175 +++++++++++++++++++------------------- fs/ocfs2/dlm/dlmrecovery.c | 164 ++++++++++++++++++------------------ fs/ocfs2/dlm/dlmthread.c | 16 ++-- fs/ocfs2/dlmglue.c | 21 +++-- fs/ocfs2/extent_map.c | 96 +++++++++++++++++++++ fs/ocfs2/extent_map.h | 2 + fs/ocfs2/file.c | 96 ++++++++++++++++++++- fs/ocfs2/inode.c | 2 +- fs/ocfs2/inode.h | 3 + fs/ocfs2/ioctl.c | 11 ++- fs/ocfs2/journal.c | 23 +++++- fs/ocfs2/journal.h | 5 +- fs/ocfs2/mmap.c | 53 +++++------ fs/ocfs2/move_extents.c | 2 +- fs/ocfs2/ocfs2.h | 4 +- fs/ocfs2/quota_local.c | 13 ++- fs/ocfs2/slot_map.c | 4 +- fs/ocfs2/stack_o2cb.c | 71 ++++++++++++++-- fs/ocfs2/super.c | 25 ++++-- fs/ocfs2/xattr.c | 10 ++- 31 files changed, 943 insertions(+), 531 deletions(-) Merging omfs/for-next (976d167 Linux 3.1-rc9) $ git merge omfs/for-next Already up-to-date. Merging squashfs/master (7657cac Squashfs: Add an option to set dev block size to 4K) $ git merge squashfs/master Already up-to-date. Merging v9fs/for-next (be9e4aa 9p: Reduce object size with CONFIG_NET_9P_DEBUG) $ git merge v9fs/for-next Merge made by the 'recursive' strategy. fs/9p/cache.c | 64 +++++++------- fs/9p/fid.c | 8 +- fs/9p/v9fs.c | 83 +++++++++++------ fs/9p/vfs_addr.c | 13 +-- fs/9p/vfs_dentry.c | 12 +- fs/9p/vfs_dir.c | 13 +-- fs/9p/vfs_file.c | 31 +++--- fs/9p/vfs_inode.c | 86 +++++++++--------- fs/9p/vfs_inode_dotl.c | 85 ++++++++--------- fs/9p/vfs_super.c | 12 +- fs/9p/xattr.c | 16 ++-- include/net/9p/9p.h | 28 ++---- net/9p/client.c | 242 ++++++++++++++++++++++++------------------------ net/9p/error.c | 6 +- net/9p/mod.c | 6 +- net/9p/protocol.c | 8 +- net/9p/trans_fd.c | 113 ++++++++++++----------- net/9p/trans_rdma.c | 26 +++--- net/9p/trans_virtio.c | 34 ++++---- net/9p/util.c | 4 +- 20 files changed, 451 insertions(+), 439 deletions(-) $ git reset --hard HEAD^ HEAD is now at 0f71666 Merge remote-tracking branch 'ocfs2/linux-next' Merging refs/next/20111130/v9fs $ git merge refs/next/20111130/v9fs Already up-to-date. Merging ubifs/linux-next (eaecf43 UBIFS: Use kmemdup rather than duplicating its implementation) $ git merge ubifs/linux-next Merge made by the 'recursive' strategy. fs/ubifs/lpt.c | 6 ++---- fs/ubifs/tnc.c | 3 +-- fs/ubifs/xattr.c | 6 ++---- 3 files changed, 5 insertions(+), 10 deletions(-) Merging xfs/master (4c393a6 xfs: fix attr2 vs large data fork assert) $ git merge xfs/master Merge made by the 'recursive' strategy. fs/xfs/xfs_acl.c | 2 + fs/xfs/xfs_attr_leaf.c | 64 +++++++++++++++++++++++++++++------------------ fs/xfs/xfs_inode.c | 21 +++++++++++++++ fs/xfs/xfs_inode.h | 1 + fs/xfs/xfs_sync.c | 11 ++++++++ 5 files changed, 74 insertions(+), 25 deletions(-) Merging vfs/for-next (206b1d0 Fix POSIX ACL permission check) $ git merge vfs/for-next Already up-to-date. Merging vfs-scale/vfs-scale-working (32385c7 kernel: fix hlist_bl again) $ git merge vfs-scale/vfs-scale-working Already up-to-date. Merging pci/linux-next (cfbf1bd PCI: msi: Disable msi interrupts when we initialize a pci device) $ git merge pci/linux-next Auto-merging drivers/pci/msi.c Auto-merging drivers/pci/ats.c Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-bus-pci | 18 +++++ drivers/acpi/pci_root.c | 7 ++ drivers/pci/ats.c | 20 +++--- drivers/pci/hotplug/acpiphp_glue.c | 4 +- drivers/pci/hotplug/pciehp.h | 1 - drivers/pci/hotplug/pciehp_core.c | 11 +--- drivers/pci/hotplug/pciehp_ctrl.c | 4 +- drivers/pci/hotplug/pciehp_hpc.c | 1 - drivers/pci/msi.c | 121 +++++++++++++++++++++++++++++++ drivers/pci/pci-acpi.c | 13 ++-- drivers/pci/pcie/aspm.c | 58 ++++++++++------ include/linux/acpi.h | 4 + include/linux/msi.h | 3 + include/linux/pci-aspm.h | 4 +- include/linux/pci.h | 1 + include/linux/pci_regs.h | 4 +- 16 files changed, 218 insertions(+), 56 deletions(-) Merging hid/for-next (2ddfbbc Merge branch 'multitouch' into for-next) $ git merge hid/for-next Auto-merging include/linux/hid.h Auto-merging drivers/hid/hid-wiimote-core.c Auto-merging drivers/hid/hid-roccat-common.c Removing drivers/hid/hid-quanta.c Auto-merging drivers/hid/hid-picolcd.c Auto-merging drivers/hid/hid-hyperv.c Auto-merging drivers/hid/hid-debug.c Merge made by the 'recursive' strategy. .../ABI/testing/sysfs-driver-hid-multitouch | 9 + Documentation/ABI/testing/sysfs-driver-hid-wiimote | 12 + drivers/hid/Kconfig | 27 +- drivers/hid/Makefile | 10 +- drivers/hid/hid-core.c | 17 +- drivers/hid/hid-debug.c | 8 + .../{staging/hv/hv_mouse.c => hid/hid-hyperv.c} | 299 ++++---- drivers/hid/hid-ids.h | 21 +- drivers/hid/hid-input.c | 117 +++ drivers/hid/hid-lg4ff.c | 2 +- drivers/hid/hid-multitouch.c | 161 +++-- drivers/hid/hid-picolcd.c | 4 +- drivers/hid/hid-quanta.c | 261 ------- drivers/hid/hid-roccat-common.c | 4 +- drivers/hid/hid-roccat-kone.c | 4 +- drivers/hid/hid-wacom.c | 179 ++++- drivers/hid/{hid-wiimote.c => hid-wiimote-core.c} | 246 +++---- drivers/hid/hid-wiimote-debug.c | 227 ++++++ drivers/hid/hid-wiimote-ext.c | 752 ++++++++++++++++++++ drivers/hid/hid-wiimote.h | 208 ++++++ drivers/hid/usbhid/usbkbd.c | 64 ++- drivers/staging/hv/Kconfig | 6 - drivers/staging/hv/Makefile | 1 - drivers/usb/misc/usbled.c | 2 + include/linux/hid.h | 16 + 25 files changed, 1994 insertions(+), 663 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-multitouch rename drivers/{staging/hv/hv_mouse.c => hid/hid-hyperv.c} (75%) delete mode 100644 drivers/hid/hid-quanta.c rename drivers/hid/{hid-wiimote.c => hid-wiimote-core.c} (89%) create mode 100644 drivers/hid/hid-wiimote-debug.c create mode 100644 drivers/hid/hid-wiimote-ext.c create mode 100644 drivers/hid/hid-wiimote.h Merging quilt/i2c (caca6a0 Linux 3.2-rc3) $ git merge quilt/i2c Already up-to-date. Merging bjdooks-i2c/next-i2c (f8420b7 fixup merge) $ git merge bjdooks-i2c/next-i2c Resolved 'drivers/i2c/busses/i2c-designware-platdrv.c' using previous resolution. Auto-merging drivers/i2c/busses/i2c-designware-platdrv.c CONFLICT (add/add): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 7fd4933] Merge remote-tracking branch 'bjdooks-i2c/next-i2c' $ git diff -M --stat --summary HEAD^.. drivers/i2c/busses/i2c-designware-platdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging quilt/jdelvare-hwmon (dda4fa1 hwmon: (lm63) Add support for LM96163) $ git merge quilt/jdelvare-hwmon Auto-merging drivers/hwmon/Kconfig Merge made by the 'recursive' strategy. Documentation/hwmon/lm63 | 8 +++ drivers/hwmon/Kconfig | 4 +- drivers/hwmon/lm63.c | 132 ++++++++++++++++++++++++++++++++++++---------- drivers/hwmon/max1111.c | 15 +++-- 4 files changed, 122 insertions(+), 37 deletions(-) Merging hwmon-staging/hwmon-next (a976c2a hwmon: (pmbus/zl6100) Only instantiate external temperature sensor if enabled) $ git merge hwmon-staging/hwmon-next Merge made by the 'recursive' strategy. Documentation/hwmon/pmbus | 5 +-- Documentation/hwmon/zl6100 | 15 +++++++++ drivers/hwmon/pmbus/Kconfig | 9 +++-- drivers/hwmon/pmbus/adm1275.c | 71 +++++++++++++++++++++++++++++------------ drivers/hwmon/pmbus/pmbus.c | 2 - drivers/hwmon/pmbus/zl6100.c | 43 +++++++++++++++++++++---- 6 files changed, 108 insertions(+), 37 deletions(-) Merging quilt/kernel-doc (c3b92c8 Linux 3.1) $ git merge quilt/kernel-doc Already up-to-date. Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move) $ git merge docs/docs-move Already up-to-date. Merging v4l-dvb/master (ed3825f Merge branch 'poll-pwc2' of /home/v4l/v4l/patchwork) $ git merge v4l-dvb/master Resolved 'drivers/staging/media/as102/as102_drv.h' using previous resolution. Auto-merging drivers/staging/media/as102/as102_drv.h CONFLICT (content): Merge conflict in drivers/staging/media/as102/as102_drv.h Auto-merging drivers/staging/media/as102/as102_drv.c Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master ad268e8] Merge remote-tracking branch 'v4l-dvb/master' $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/media/dvb/dvbproperty.xml | 4 + Documentation/DocBook/media/v4l/dev-rds.xml | 8 +- Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml | 14 +- Documentation/DocBook/media/v4l/vidioc-g-tuner.xml | 10 + Documentation/dvb/get_dvb_firmware | 22 +- Documentation/video4linux/CARDLIST.bttv | 2 +- Documentation/video4linux/CARDLIST.cx23885 | 2 + Documentation/video4linux/CARDLIST.cx88 | 2 + Documentation/video4linux/CARDLIST.em28xx | 6 +- Documentation/video4linux/CARDLIST.saa7134 | 1 + Documentation/video4linux/CARDLIST.saa7164 | 2 + Documentation/video4linux/v4l2-framework.txt | 11 + MAINTAINERS | 10 + arch/arm/mach-davinci/board-dm646x-evm.c | 6 +- drivers/media/common/tuners/mt2060.c | 9 +- drivers/media/common/tuners/mxl5007t.c | 52 +- drivers/media/common/tuners/qt1010.c | 9 +- drivers/media/common/tuners/tda18212.c | 66 +- drivers/media/common/tuners/tda18212.h | 4 + drivers/media/common/tuners/tda18218.c | 18 +- drivers/media/common/tuners/tda18218_priv.h | 2 + drivers/media/common/tuners/tda18271-fe.c | 10 + drivers/media/common/tuners/tda18271-priv.h | 2 + drivers/media/common/tuners/tuner-simple.c | 11 + drivers/media/common/tuners/xc5000.c | 39 +- drivers/media/dvb/dvb-core/dvb_frontend.c | 2 + drivers/media/dvb/dvb-usb/Kconfig | 5 +- drivers/media/dvb/dvb-usb/af9015.c | 97 ++ drivers/media/dvb/dvb-usb/af9015.h | 7 + drivers/media/dvb/dvb-usb/anysee.c | 411 +++++++-- drivers/media/dvb/dvb-usb/anysee.h | 6 + drivers/media/dvb/dvb-usb/dib0700_devices.c | 676 ++++++++++++- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 4 + drivers/media/dvb/dvb-usb/dw2102.c | 15 +- drivers/media/dvb/dvb-usb/it913x.c | 79 +- drivers/media/dvb/dvb-usb/mxl111sf-tuner.c | 56 +- drivers/media/dvb/dvb-usb/ttusb2.c | 19 +- drivers/media/dvb/firewire/firedtv-avc.c | 3 +- drivers/media/dvb/frontends/af9013.c | 41 +- drivers/media/dvb/frontends/au8522_dig.c | 31 +- drivers/media/dvb/frontends/cxd2820r.h | 13 - drivers/media/dvb/frontends/cxd2820r_c.c | 13 +- drivers/media/dvb/frontends/cxd2820r_t.c | 55 +- drivers/media/dvb/frontends/cxd2820r_t2.c | 62 +- drivers/media/dvb/frontends/dib0090.c | 163 +++- drivers/media/dvb/frontends/dib0090.h | 54 +- drivers/media/dvb/frontends/dib7000p.c | 332 ++++--- drivers/media/dvb/frontends/dib7000p.h | 16 +- drivers/media/dvb/frontends/dib8000.c | 1061 ++++++++++++++++++-- drivers/media/dvb/frontends/dib8000.h | 42 +- drivers/media/dvb/frontends/dibx000_common.h | 7 + drivers/media/dvb/frontends/drxd_hard.c | 3 +- drivers/media/dvb/frontends/drxk.h | 2 + drivers/media/dvb/frontends/drxk_hard.c | 11 +- drivers/media/dvb/frontends/it913x-fe-priv.h | 722 +++++++++++++- drivers/media/dvb/frontends/it913x-fe.c | 167 +++- drivers/media/dvb/frontends/it913x-fe.h | 24 +- drivers/media/dvb/frontends/s5h1409.c | 31 +- drivers/media/dvb/frontends/s5h1411.c | 31 +- drivers/media/dvb/frontends/tda18271c2dd.c | 32 +- drivers/media/dvb/ttpci/av7110.c | 2 +- drivers/media/radio/Kconfig | 297 +++--- drivers/media/radio/tef6862.c | 8 +- drivers/media/radio/wl128x/fmdrv_v4l2.c | 1 + drivers/media/rc/Kconfig | 10 + drivers/media/rc/Makefile | 1 + drivers/media/rc/ir-nec-decoder.c | 4 +- drivers/media/rc/ir-raw.c | 1 + drivers/media/rc/ir-rc6-decoder.c | 67 +- drivers/media/rc/ir-sanyo-decoder.c | 205 ++++ drivers/media/rc/keymaps/rc-hauppauge.c | 51 + drivers/media/rc/rc-core-priv.h | 12 + drivers/media/rc/rc-main.c | 1 + drivers/media/rc/redrat3.c | 52 +- drivers/media/video/Kconfig | 412 +++++---- drivers/media/video/Makefile | 2 + drivers/media/video/adv7170.c | 62 ++ drivers/media/video/atmel-isi.c | 2 +- drivers/media/video/au0828/au0828-i2c.c | 2 +- drivers/media/video/bt8xx/bt848.h | 5 +- drivers/media/video/bt8xx/bttv-cards.c | 58 +- drivers/media/video/bt8xx/bttv-driver.c | 1 + drivers/media/video/bt8xx/bttv-i2c.c | 2 +- drivers/media/video/bt8xx/bttv.h | 3 +- drivers/media/video/cx18/cx18-i2c.c | 2 +- drivers/media/video/cx18/cx18-i2c.h | 2 +- drivers/media/video/cx231xx/Kconfig | 4 +- drivers/media/video/cx23885/cx23885-cards.c | 36 + drivers/media/video/cx23885/cx23885-i2c.c | 2 +- drivers/media/video/cx23885/cx23885-video.c | 3 +- drivers/media/video/cx23885/cx23885.h | 1 + drivers/media/video/cx25821/cx25821-alsa.c | 73 +- .../media/video/cx25821/cx25821-audio-upstream.c | 113 +-- drivers/media/video/cx25821/cx25821-audio.h | 39 +- drivers/media/video/cx25821/cx25821-cards.c | 2 +- drivers/media/video/cx25821/cx25821-core.c | 57 +- drivers/media/video/cx25821/cx25821-i2c.c | 12 +- .../media/video/cx25821/cx25821-medusa-defines.h | 6 +- drivers/media/video/cx25821/cx25821-medusa-reg.h | 518 +++++----- drivers/media/video/cx25821/cx25821-medusa-video.c | 410 +++----- .../video/cx25821/cx25821-video-upstream-ch2.c | 138 ++-- .../media/video/cx25821/cx25821-video-upstream.c | 156 ++-- drivers/media/video/cx25821/cx25821-video.c | 145 ++-- drivers/media/video/cx25821/cx25821.h | 4 +- drivers/media/video/cx88/Kconfig | 10 +- drivers/media/video/cx88/cx88-i2c.c | 2 +- drivers/media/video/davinci/vpbe_display.c | 5 +- drivers/media/video/em28xx/em28xx-cards.c | 62 ++- drivers/media/video/em28xx/em28xx-dvb.c | 131 +++- drivers/media/video/em28xx/em28xx-input.c | 7 +- drivers/media/video/em28xx/em28xx.h | 3 + drivers/media/video/gspca/pac207.c | 10 +- drivers/media/video/ivtv/ivtv-fileops.c | 6 +- drivers/media/video/ivtv/ivtv-i2c.h | 2 +- drivers/media/video/m5mols/m5mols.h | 2 - drivers/media/video/m5mols/m5mols_core.c | 20 +- drivers/media/video/mt9m001.c | 5 +- drivers/media/video/mt9m111.c | 7 +- drivers/media/video/mt9p031.c | 5 +- drivers/media/video/mt9t001.c | 5 +- drivers/media/video/mt9t031.c | 5 +- drivers/media/video/mt9t112.c | 4 +- drivers/media/video/mt9v022.c | 5 +- drivers/media/video/mt9v032.c | 8 +- drivers/media/video/omap/omap_vout.c | 187 ++-- drivers/media/video/omap/omap_voutdef.h | 2 +- drivers/media/video/omap3isp/ispvideo.c | 1 + drivers/media/video/pwc/pwc-ctrl.c | 137 ++-- drivers/media/video/pwc/pwc-dec23.c | 7 + drivers/media/video/pwc/pwc-dec23.h | 2 + drivers/media/video/pwc/pwc-if.c | 155 ++-- drivers/media/video/pwc/pwc-v4l.c | 155 ++- drivers/media/video/pwc/pwc.h | 11 +- drivers/media/video/s5p-fimc/fimc-capture.c | 13 +- drivers/media/video/s5p-fimc/fimc-core.c | 24 +- drivers/media/video/s5p-fimc/fimc-core.h | 2 + drivers/media/video/s5p-fimc/fimc-mdevice.c | 43 +- drivers/media/video/s5p-fimc/fimc-reg.c | 15 +- drivers/media/video/s5p-g2d/Makefile | 3 + drivers/media/video/s5p-g2d/g2d-hw.c | 106 ++ drivers/media/video/s5p-g2d/g2d-regs.h | 115 +++ drivers/media/video/s5p-g2d/g2d.c | 824 +++++++++++++++ drivers/media/video/s5p-g2d/g2d.h | 83 ++ drivers/media/video/s5p-tv/mixer_video.c | 1 + drivers/media/video/saa7134/saa7134-cards.c | 33 + drivers/media/video/saa7134/saa7134.h | 1 + drivers/media/video/tvp5150.c | 14 +- drivers/media/video/usbvision/usbvision-i2c.c | 46 +- drivers/media/video/via-camera.c | 10 +- drivers/media/video/videobuf-core.c | 3 +- drivers/media/video/videobuf2-core.c | 48 +- drivers/media/video/vino.c | 2 +- drivers/media/video/vivi.c | 9 +- drivers/staging/media/as102/Kconfig | 1 + drivers/staging/media/as102/Makefile | 2 +- drivers/staging/media/as102/as102_drv.c | 126 +-- drivers/staging/media/as102/as102_drv.h | 59 +- drivers/staging/media/as102/as102_fe.c | 4 - drivers/staging/media/as102/as102_fw.c | 44 +- drivers/staging/media/as102/as102_fw.h | 10 +- drivers/staging/media/as102/as102_usb_drv.c | 36 +- drivers/staging/media/as102/as102_usb_drv.h | 6 +- drivers/staging/media/as102/as10x_cmd.c | 139 ++-- drivers/staging/media/as102/as10x_cmd.h | 895 ++++++++--------- drivers/staging/media/as102/as10x_cmd_cfg.c | 66 +- drivers/staging/media/as102/as10x_cmd_stream.c | 56 +- drivers/staging/media/as102/as10x_handle.h | 26 +- drivers/staging/media/as102/as10x_types.h | 250 +++--- drivers/staging/media/easycap/easycap.h | 93 +-- drivers/staging/media/easycap/easycap_ioctl.c | 60 +- drivers/staging/media/easycap/easycap_low.c | 273 +---- drivers/staging/media/easycap/easycap_main.c | 379 +++----- drivers/staging/media/easycap/easycap_settings.c | 2 +- drivers/staging/media/easycap/easycap_sound.c | 340 +++---- drivers/staging/media/go7007/go7007-usb.c | 8 +- drivers/staging/media/lirc/lirc_imon.c | 4 +- drivers/staging/media/lirc/lirc_serial.c | 113 +-- drivers/staging/media/solo6x10/Makefile | 2 +- .../media/solo6x10/{jpeg.h => solo6x10-jpeg.h} | 0 drivers/staging/media/solo6x10/v4l2-enc.c | 2 +- fs/eventpoll.c | 18 +- fs/select.c | 38 +- include/linux/dvb/frontend.h | 2 + include/linux/poll.h | 13 +- include/media/rc-map.h | 8 +- 185 files changed, 8887 insertions(+), 4143 deletions(-) create mode 100644 drivers/media/rc/ir-sanyo-decoder.c create mode 100644 drivers/media/video/s5p-g2d/Makefile create mode 100644 drivers/media/video/s5p-g2d/g2d-hw.c create mode 100644 drivers/media/video/s5p-g2d/g2d-regs.h create mode 100644 drivers/media/video/s5p-g2d/g2d.c create mode 100644 drivers/media/video/s5p-g2d/g2d.h rename drivers/staging/media/solo6x10/{jpeg.h => solo6x10-jpeg.h} (100%) Merging kbuild/for-next (ddb550d Merge branch 'kbuild/misc' into kbuild/for-next) $ git merge kbuild/for-next Merge made by the 'recursive' strategy. scripts/tags.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 44 insertions(+), 2 deletions(-) Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next) $ git merge kconfig/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging libata/NEXT (3fab0c1 ahci: start engine only during soft/hard resets) $ git merge libata/NEXT Merge made by the 'recursive' strategy. drivers/ata/libahci.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) Merging infiniband/for-next (a493f1a Merge branches 'cxgb4', 'ipoib', 'misc' and 'qib' into for-next) $ git merge infiniband/for-next Merge made by the 'recursive' strategy. drivers/infiniband/core/addr.c | 9 ++++++--- drivers/infiniband/hw/cxgb3/iwch_cm.c | 4 ++++ drivers/infiniband/hw/cxgb4/cm.c | 10 +++++++++- drivers/infiniband/hw/cxgb4/cq.c | 2 +- drivers/infiniband/hw/nes/nes_cm.c | 6 ++++-- drivers/infiniband/hw/qib/qib_iba7322.c | 18 +++++++++--------- drivers/infiniband/hw/qib/qib_qsfp.c | 12 ------------ drivers/infiniband/ulp/ipoib/ipoib_ib.c | 13 ++++++++----- drivers/infiniband/ulp/ipoib/ipoib_main.c | 20 ++++++++++++-------- drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 13 +++++++++---- 10 files changed, 62 insertions(+), 45 deletions(-) Merging acpi/next (efb9058 Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next) $ git merge acpi/next Already up-to-date. Merging cpupowerutils/master (498ca79 cpupower: use man(1) when calling "cpupower help subcommand") $ git merge cpupowerutils/master Already up-to-date. Merging ieee1394/for-next (a572e68 firewire: ohci: fix isochronous DMA synchronization) $ git merge ieee1394/for-next Already up-to-date. Merging ubi/linux-next (93ee7a9 Linux 3.1-rc2) $ git merge ubi/linux-next Already up-to-date. Merging dlm/next (9beb3bf dlm: convert rsb list to rb_tree) $ git merge dlm/next Merge made by the 'recursive' strategy. fs/dlm/debug_fs.c | 28 ++++++++------- fs/dlm/dlm_internal.h | 9 +++-- fs/dlm/lock.c | 87 +++++++++++++++++++++++++++++++++++++++--------- fs/dlm/lockspace.c | 23 +++++-------- fs/dlm/recover.c | 21 +++++++---- 5 files changed, 113 insertions(+), 55 deletions(-) Merging scsi/master (f7c9c6b [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev) $ git merge scsi/master Already up-to-date. Merging target-updates/for-next (5bda90c target: use ->exectute_task for all CDB emulation) $ git merge target-updates/for-next Already up-to-date. Merging target-merge/for-next-merge (e0d85e5 ib_srpt: Initial SRP Target merge for v3.2-rc1) $ git merge target-merge/for-next-merge Merge made by the 'recursive' strategy. drivers/infiniband/Kconfig | 1 + drivers/infiniband/Makefile | 1 + drivers/infiniband/ulp/srpt/Kconfig | 12 + drivers/infiniband/ulp/srpt/Makefile | 2 + drivers/infiniband/ulp/srpt/ib_dm_mad.h | 139 ++ drivers/infiniband/ulp/srpt/ib_srpt.c | 4081 +++++++++++++++++++++++++++++++ drivers/infiniband/ulp/srpt/ib_srpt.h | 444 ++++ 7 files changed, 4680 insertions(+), 0 deletions(-) create mode 100644 drivers/infiniband/ulp/srpt/Kconfig create mode 100644 drivers/infiniband/ulp/srpt/Makefile create mode 100644 drivers/infiniband/ulp/srpt/ib_dm_mad.h create mode 100644 drivers/infiniband/ulp/srpt/ib_srpt.c create mode 100644 drivers/infiniband/ulp/srpt/ib_srpt.h Merging slave-dma/next (02f88be dmaengine: at_hdmac: simplify device selection from platform data or DT) $ git merge slave-dma/next Resolved 'drivers/dma/pl330.c' using previous resolution. Auto-merging drivers/usb/renesas_usbhs/fifo.c Auto-merging drivers/tty/serial/sh-sci.c Auto-merging drivers/tty/serial/pch_uart.c Auto-merging drivers/spi/spi-pl022.c Auto-merging drivers/misc/carma/carma-fpga-program.c Auto-merging drivers/dma/pl330.c CONFLICT (content): Merge conflict in drivers/dma/pl330.c Auto-merging arch/arm/plat-samsung/include/plat/dma-ops.h Auto-merging arch/arm/plat-samsung/dma-ops.c Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 9761e04] Merge remote-tracking branch 'slave-dma/next' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/dma/atmel-dma.txt | 14 + Documentation/dmaengine.txt | 8 + MAINTAINERS | 1 + arch/arm/mach-ep93xx/include/mach/dma.h | 6 +- arch/arm/plat-nomadik/include/plat/ste_dma40.h | 5 +- arch/arm/plat-samsung/dma-ops.c | 4 +- arch/arm/plat-samsung/include/plat/dma-ops.h | 4 +- drivers/dma/Kconfig | 27 +- drivers/dma/Makefile | 1 + drivers/dma/amba-pl08x.c | 24 +- drivers/dma/at_hdmac.c | 103 +++- drivers/dma/at_hdmac_regs.h | 1 + drivers/dma/coh901318.c | 12 +- drivers/dma/coh901318_lli.c | 23 +- drivers/dma/coh901318_lli.h | 4 +- drivers/dma/dmaengine.c | 4 +- drivers/dma/dw_dmac.c | 83 ++- drivers/dma/dw_dmac_regs.h | 1 + drivers/dma/ep93xx_dma.c | 22 +- drivers/dma/fsldma.c | 4 +- drivers/dma/imx-dma.c | 10 +- drivers/dma/imx-sdma.c | 11 +- drivers/dma/intel_mid_dma.c | 14 +- drivers/dma/intel_mid_dma_regs.h | 2 +- drivers/dma/iop-adma.c | 4 +- drivers/dma/ipu/ipu_idmac.c | 4 +- drivers/dma/mxs-dma.c | 8 +- drivers/dma/pch_dma.c | 20 +- drivers/dma/pl330.c | 18 +- drivers/dma/shdma.c | 25 +- drivers/dma/sirf-dma.c | 717 ++++++++++++++++++++ drivers/dma/ste_dma40.c | 386 ++++++++++-- drivers/dma/ste_dma40_ll.h | 11 + drivers/dma/timb_dma.c | 18 +- drivers/dma/txx9dmac.c | 12 +- drivers/media/video/mx3_camera.c | 2 +- drivers/media/video/timblogiw.c | 2 +- drivers/misc/carma/carma-fpga-program.c | 2 +- drivers/mmc/host/atmel-mci.c | 10 +- drivers/mmc/host/mmci.c | 11 +- drivers/mmc/host/mxcmmc.c | 10 +- drivers/mmc/host/mxs-mmc.c | 7 +- drivers/mmc/host/sh_mmcif.c | 4 +- drivers/mmc/host/tmio_mmc_dma.c | 4 +- drivers/net/ethernet/micrel/ks8842.c | 4 +- drivers/spi/spi-dw-mid.c | 8 +- drivers/spi/spi-ep93xx.c | 9 +- drivers/spi/spi-pl022.c | 8 +- drivers/spi/spi-topcliff-pch.c | 4 +- drivers/tty/serial/amba-pl011.c | 8 +- drivers/tty/serial/pch_uart.c | 4 +- drivers/tty/serial/sh-sci.c | 4 +- drivers/usb/musb/ux500_dma.c | 4 +- drivers/usb/renesas_usbhs/fifo.c | 4 +- drivers/video/mx3fb.c | 4 +- include/linux/amba/pl08x.h | 4 +- include/linux/dmaengine.h | 98 +++- include/linux/dw_dmac.h | 2 +- include/linux/sh_dma.h | 2 +- include/linux/sirfsoc_dma.h | 6 + sound/atmel/abdac.c | 2 +- sound/atmel/ac97c.c | 10 +- sound/soc/ep93xx/ep93xx-pcm.c | 4 +- sound/soc/imx/imx-pcm-dma-mx2.c | 6 +- sound/soc/samsung/dma.c | 4 +- sound/soc/sh/siu_pcm.c | 4 +- sound/soc/txx9/txx9aclc.c | 2 +- 67 files changed, 1559 insertions(+), 309 deletions(-) create mode 100644 Documentation/devicetree/bindings/dma/atmel-dma.txt create mode 100644 drivers/dma/sirf-dma.c create mode 100644 include/linux/sirfsoc_dma.h Merging async_tx/next (21ef4b8 dmaengine: use DEFINE_IDR for static initialization) $ git merge async_tx/next Already up-to-date. Merging net-next/master (449fa02 sfc: fix race in efx_enqueue_skb_tso()) $ git merge net-next/master Auto-merging net/wireless/reg.c Auto-merging net/wireless/nl80211.c Auto-merging net/sched/sch_teql.c Auto-merging net/netlabel/netlabel_kapi.c Auto-merging net/mac80211/main.c Auto-merging net/mac80211/agg-tx.c Auto-merging net/ipv6/ipv6_sockglue.c Auto-merging net/core/dev.c Auto-merging include/net/inetpeer.h Auto-merging include/linux/virtio_config.h Auto-merging include/linux/netdevice.h Auto-merging drivers/virtio/virtio_pci.c Auto-merging drivers/virtio/virtio_mmio.c Auto-merging drivers/net/wireless/iwlegacy/prph.h Removing drivers/net/wireless/iwlegacy/iwl4965-base.c Removing drivers/net/wireless/iwlegacy/iwl3945-base.c Removing drivers/net/wireless/iwlegacy/iwl-tx.c Removing drivers/net/wireless/iwlegacy/iwl-sta.h Removing drivers/net/wireless/iwlegacy/iwl-scan.c Removing drivers/net/wireless/iwlegacy/iwl-rx.c Removing drivers/net/wireless/iwlegacy/iwl-power.h Removing drivers/net/wireless/iwlegacy/iwl-power.c Removing drivers/net/wireless/iwlegacy/iwl-legacy-rs.h Removing drivers/net/wireless/iwlegacy/iwl-led.h Removing drivers/net/wireless/iwlegacy/iwl-led.c Removing drivers/net/wireless/iwlegacy/iwl-io.h Removing drivers/net/wireless/iwlegacy/iwl-helpers.h Removing drivers/net/wireless/iwlegacy/iwl-hcmd.c Removing drivers/net/wireless/iwlegacy/iwl-fh.h Removing drivers/net/wireless/iwlegacy/iwl-eeprom.h Removing drivers/net/wireless/iwlegacy/iwl-eeprom.c Removing drivers/net/wireless/iwlegacy/iwl-devtrace.h Removing drivers/net/wireless/iwlegacy/iwl-devtrace.c Removing drivers/net/wireless/iwlegacy/iwl-dev.h Removing drivers/net/wireless/iwlegacy/iwl-debugfs.c Removing drivers/net/wireless/iwlegacy/iwl-debug.h Removing drivers/net/wireless/iwlegacy/iwl-core.h Removing drivers/net/wireless/iwlegacy/iwl-core.c Removing drivers/net/wireless/iwlegacy/iwl-4965.h Removing drivers/net/wireless/iwlegacy/iwl-4965.c Removing drivers/net/wireless/iwlegacy/iwl-4965-ucode.c Removing drivers/net/wireless/iwlegacy/iwl-4965-tx.c Removing drivers/net/wireless/iwlegacy/iwl-4965-sta.c Removing drivers/net/wireless/iwlegacy/iwl-4965-rx.c Removing drivers/net/wireless/iwlegacy/iwl-4965-rs.c Removing drivers/net/wireless/iwlegacy/iwl-4965-lib.c Removing drivers/net/wireless/iwlegacy/iwl-4965-led.h Removing drivers/net/wireless/iwlegacy/iwl-4965-led.c Removing drivers/net/wireless/iwlegacy/iwl-4965-hw.h Removing drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c Removing drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h Removing drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c Removing drivers/net/wireless/iwlegacy/iwl-4965-calib.h Removing drivers/net/wireless/iwlegacy/iwl-3945.h Removing drivers/net/wireless/iwlegacy/iwl-3945.c Removing drivers/net/wireless/iwlegacy/iwl-3945-rs.c Removing drivers/net/wireless/iwlegacy/iwl-3945-led.h Removing drivers/net/wireless/iwlegacy/iwl-3945-led.c Removing drivers/net/wireless/iwlegacy/iwl-3945-hw.h Removing drivers/net/wireless/iwlegacy/iwl-3945-fh.h Removing drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h Removing drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c Auto-merging drivers/net/wireless/iwlegacy/csr.h Auto-merging drivers/net/wireless/iwlegacy/commands.h Auto-merging drivers/net/wireless/iwlegacy/4965-calib.c Auto-merging drivers/net/wireless/ath/ath9k/hw.c Removing drivers/net/wireless/ath/ath6kl/htc_hif.h Auto-merging drivers/net/wireless/ath/ath6kl/hif.c Auto-merging drivers/net/ethernet/micrel/ks8842.c Auto-merging drivers/net/ethernet/jme.c Auto-merging drivers/net/ethernet/davicom/dm9000.c Auto-merging drivers/net/ethernet/Makefile Auto-merging drivers/net/dsa/mv88e6xxx.h Auto-merging drivers/net/dsa/mv88e6xxx.c Auto-merging drivers/net/dsa/mv88e6131.c Auto-merging drivers/net/dsa/mv88e6123_61_65.c Auto-merging drivers/net/dsa/mv88e6060.c Removing drivers/net/bonding/bond_ipv6.c Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c Auto-merging drivers/infiniband/core/addr.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/cgroups/net_prio.txt | 53 + .../devicetree/bindings/net/calxeda-xgmac.txt | 15 + Documentation/networking/ieee802154.txt | 27 + Documentation/networking/ifenslave.c | 2 + Documentation/networking/ip-sysctl.txt | 13 + Documentation/networking/team.txt | 2 + MAINTAINERS | 7 + arch/alpha/include/asm/socket.h | 3 + arch/arm/include/asm/socket.h | 3 + arch/avr32/include/asm/socket.h | 3 + arch/cris/include/asm/socket.h | 3 + arch/frv/include/asm/socket.h | 3 + arch/h8300/include/asm/socket.h | 3 + arch/ia64/include/asm/socket.h | 3 + arch/m32r/include/asm/socket.h | 3 + arch/m68k/include/asm/socket.h | 3 + arch/mips/include/asm/socket.h | 3 + arch/mn10300/include/asm/socket.h | 3 + arch/parisc/include/asm/socket.h | 3 + arch/powerpc/include/asm/socket.h | 3 + arch/s390/include/asm/socket.h | 3 + arch/sparc/include/asm/socket.h | 3 + arch/xtensa/include/asm/socket.h | 3 + drivers/atm/iphase.c | 4 +- drivers/bluetooth/ath3k.c | 15 +- drivers/bluetooth/bfusb.c | 4 +- drivers/bluetooth/bluecard_cs.c | 4 +- drivers/bluetooth/bt3c_cs.c | 4 +- drivers/bluetooth/btuart_cs.c | 4 +- drivers/bluetooth/btusb.c | 16 +- drivers/bluetooth/dtl1_cs.c | 4 +- drivers/bluetooth/hci_vhci.c | 5 +- drivers/ieee802154/fakehard.c | 2 +- drivers/infiniband/core/addr.c | 6 +- drivers/infiniband/core/cma.c | 8 +- drivers/infiniband/hw/nes/nes_nic.c | 6 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- drivers/isdn/gigaset/i4l.c | 3 +- drivers/lguest/lguest_device.c | 6 + drivers/misc/eeprom/eeprom_93cx6.c | 88 + drivers/misc/sgi-xp/xpnet.c | 2 +- drivers/net/Kconfig | 4 + drivers/net/Makefile | 2 + drivers/net/bonding/bond_ipv6.c | 225 - drivers/net/bonding/bond_main.c | 11 +- drivers/net/can/at91_can.c | 13 +- drivers/net/can/bfin_can.c | 12 +- drivers/net/can/c_can/c_can_platform.c | 12 +- drivers/net/can/dev.c | 2 +- drivers/net/can/flexcan.c | 15 +- drivers/net/can/janz-ican3.c | 13 +- drivers/net/can/mscan/mpc5xxx_can.c | 12 +- drivers/net/can/mscan/mscan.c | 8 +- drivers/net/can/sja1000/Kconfig | 1 - drivers/net/can/sja1000/sja1000_isa.c | 118 +- drivers/net/can/sja1000/sja1000_of_platform.c | 12 +- drivers/net/can/sja1000/sja1000_platform.c | 13 +- drivers/net/can/slcan.c | 2 +- drivers/net/can/softing/softing_main.c | 16 +- drivers/net/can/ti_hecc.c | 15 +- drivers/net/dsa/Kconfig | 36 + drivers/net/dsa/Makefile | 9 + {net => drivers/net}/dsa/mv88e6060.c | 7 +- {net => drivers/net}/dsa/mv88e6123_61_65.c | 19 +- {net => drivers/net}/dsa/mv88e6131.c | 20 +- {net => drivers/net}/dsa/mv88e6xxx.c | 29 +- {net => drivers/net}/dsa/mv88e6xxx.h | 3 + drivers/net/dummy.c | 2 +- drivers/net/ethernet/3com/3c589_cs.c | 7 +- drivers/net/ethernet/3com/3c59x.c | 12 +- drivers/net/ethernet/3com/typhoon.c | 16 +- drivers/net/ethernet/8390/8390.h | 2 - drivers/net/ethernet/8390/apne.c | 2 +- drivers/net/ethernet/8390/ax88796.c | 18 +- drivers/net/ethernet/8390/es3210.c | 2 +- drivers/net/ethernet/8390/hp-plus.c | 2 +- drivers/net/ethernet/8390/hp.c | 2 +- drivers/net/ethernet/8390/hydra.c | 2 +- drivers/net/ethernet/8390/lne390.c | 4 +- drivers/net/ethernet/8390/ne-h8300.c | 2 +- drivers/net/ethernet/8390/ne.c | 4 +- drivers/net/ethernet/8390/ne2.c | 2 +- drivers/net/ethernet/8390/ne2k-pci.c | 6 +- drivers/net/ethernet/8390/ne3210.c | 2 +- drivers/net/ethernet/8390/stnic.c | 2 +- drivers/net/ethernet/8390/zorro8390.c | 2 +- drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/adaptec/starfire.c | 6 +- drivers/net/ethernet/aeroflex/greth.c | 13 +- drivers/net/ethernet/amd/amd8111e.c | 15 +- drivers/net/ethernet/amd/amd8111e.h | 1 - drivers/net/ethernet/amd/au1000_eth.c | 15 +- drivers/net/ethernet/amd/nmclan_cs.c | 19 +- drivers/net/ethernet/amd/pcnet32.c | 10 +- drivers/net/ethernet/amd/sunlance.c | 15 +- drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c | 1 - drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 13 +- drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c | 10 +- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 13 +- drivers/net/ethernet/atheros/atlx/atl1.c | 1 - drivers/net/ethernet/atheros/atlx/atl2.c | 23 +- drivers/net/ethernet/atheros/atlx/atlx.c | 13 +- drivers/net/ethernet/broadcom/bnx2.c | 188 +- drivers/net/ethernet/broadcom/bnx2.h | 17 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 60 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 341 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 118 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 61 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h | 4 +- .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 30 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 1060 ++-- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 156 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 69 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 4 +- drivers/net/ethernet/broadcom/cnic.c | 8 +- drivers/net/ethernet/broadcom/sb1250-mac.c | 16 +- drivers/net/ethernet/broadcom/tg3.c | 298 +- drivers/net/ethernet/broadcom/tg3.h | 11 +- drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 11 +- drivers/net/ethernet/brocade/bna/cna.h | 3 +- drivers/net/ethernet/calxeda/Kconfig | 7 + drivers/net/ethernet/calxeda/Makefile | 1 + drivers/net/ethernet/calxeda/xgmac.c | 1928 ++++++ drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 15 +- drivers/net/ethernet/chelsio/cxgb/sge.c | 2 +- drivers/net/ethernet/chelsio/cxgb/sge.h | 2 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 21 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 4 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 23 +- drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +- .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 15 +- drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 5 +- drivers/net/ethernet/cisco/enic/enic_main.c | 8 +- drivers/net/ethernet/davicom/dm9000.c | 5 +- drivers/net/ethernet/dec/tulip/de2104x.c | 6 +- drivers/net/ethernet/dec/tulip/dmfe.c | 7 +- drivers/net/ethernet/dec/tulip/tulip_core.c | 6 +- drivers/net/ethernet/dec/tulip/uli526x.c | 7 +- drivers/net/ethernet/dec/tulip/winbond-840.c | 6 +- drivers/net/ethernet/dlink/sundance.c | 6 +- drivers/net/ethernet/dnet.c | 19 +- drivers/net/ethernet/emulex/benet/be.h | 16 +- drivers/net/ethernet/emulex/benet/be_cmds.c | 218 +- drivers/net/ethernet/emulex/benet/be_cmds.h | 77 +- drivers/net/ethernet/emulex/benet/be_ethtool.c | 102 +- drivers/net/ethernet/emulex/benet/be_main.c | 318 +- drivers/net/ethernet/ethoc.c | 13 +- drivers/net/ethernet/fealnx.c | 6 +- .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 15 +- .../net/ethernet/freescale/fs_enet/mii-bitbang.c | 13 +- drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 13 +- drivers/net/ethernet/freescale/fsl_pq_mdio.c | 76 +- drivers/net/ethernet/freescale/gianfar.c | 28 +- drivers/net/ethernet/freescale/gianfar.h | 7 +- drivers/net/ethernet/freescale/gianfar_ethtool.c | 7 +- drivers/net/ethernet/freescale/gianfar_ptp.c | 16 +- drivers/net/ethernet/freescale/ucc_geth.c | 2 +- drivers/net/ethernet/freescale/ucc_geth.h | 6 +- drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 7 +- drivers/net/ethernet/i825xx/eepro.c | 7 +- drivers/net/ethernet/ibm/emac/core.c | 3 + drivers/net/ethernet/ibm/ibmveth.c | 6 +- drivers/net/ethernet/intel/e100.c | 8 +- drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 12 +- drivers/net/ethernet/intel/e1000/e1000_hw.h | 1 - drivers/net/ethernet/intel/e1000/e1000_main.c | 14 +- drivers/net/ethernet/intel/e1000e/ethtool.c | 18 +- drivers/net/ethernet/intel/e1000e/netdev.c | 402 +- drivers/net/ethernet/intel/igb/e1000_82575.c | 5 +- drivers/net/ethernet/intel/igb/igb_ethtool.c | 15 +- drivers/net/ethernet/intel/igb/igb_main.c | 179 +- drivers/net/ethernet/intel/igbvf/ethtool.c | 10 +- drivers/net/ethernet/intel/igbvf/netdev.c | 17 +- drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 10 +- drivers/net/ethernet/intel/ixgb/ixgb_main.c | 8 +- drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 16 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 8 +- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 8 +- drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 18 +- drivers/net/ethernet/intel/ixgbevf/defines.h | 1 - drivers/net/ethernet/intel/ixgbevf/ethtool.c | 16 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 32 +- drivers/net/ethernet/intel/ixgbevf/vf.c | 4 +- drivers/net/ethernet/jme.c | 16 +- drivers/net/ethernet/korina.c | 13 +- drivers/net/ethernet/marvell/mv643xx_eth.c | 14 +- drivers/net/ethernet/marvell/pxa168_eth.c | 13 +- drivers/net/ethernet/marvell/skge.c | 8 +- drivers/net/ethernet/marvell/sky2.c | 39 +- drivers/net/ethernet/mellanox/mlx4/en_cq.c | 7 +- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 31 +- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 19 + drivers/net/ethernet/mellanox/mlx4/en_resources.c | 2 +- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 16 +- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 76 +- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 13 +- drivers/net/ethernet/micrel/Kconfig | 2 + drivers/net/ethernet/micrel/ks8842.c | 13 +- drivers/net/ethernet/micrel/ks8851.c | 513 +- drivers/net/ethernet/micrel/ks8851.h | 15 +- drivers/net/ethernet/micrel/ks8851_mll.c | 16 +- drivers/net/ethernet/micrel/ksz884x.c | 75 +- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 5 +- drivers/net/ethernet/natsemi/jazzsonic.c | 13 +- drivers/net/ethernet/natsemi/macsonic.c | 13 +- drivers/net/ethernet/natsemi/natsemi.c | 6 +- drivers/net/ethernet/natsemi/ns83820.c | 6 +- drivers/net/ethernet/natsemi/xtsonic.c | 13 +- drivers/net/ethernet/neterion/s2io.c | 11 +- drivers/net/ethernet/neterion/vxge/vxge-main.c | 9 +- drivers/net/ethernet/nuvoton/w90p910_ether.c | 13 +- drivers/net/ethernet/nvidia/forcedeth.c | 502 ++- .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 8 +- .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 5 +- .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 12 +- .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 6 +- drivers/net/ethernet/qlogic/qla3xxx.c | 9 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 5 +- .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 13 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 9 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +- drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 11 +- drivers/net/ethernet/qlogic/qlge/qlge_main.c | 10 +- drivers/net/ethernet/realtek/8139cp.c | 8 +- drivers/net/ethernet/realtek/8139too.c | 6 +- drivers/net/ethernet/realtek/r8169.c | 22 +- drivers/net/ethernet/renesas/sh_eth.c | 13 +- drivers/net/ethernet/seeq/sgiseeq.c | 18 +- drivers/net/ethernet/sfc/efx.c | 2 +- drivers/net/ethernet/sfc/net_driver.h | 2 +- drivers/net/ethernet/sfc/tx.c | 27 +- drivers/net/ethernet/sgi/meth.c | 19 +- drivers/net/ethernet/sis/sis190.c | 15 +- drivers/net/ethernet/sis/sis900.c | 7 +- drivers/net/ethernet/smsc/epic100.c | 6 +- drivers/net/ethernet/smsc/smc911x.c | 13 +- drivers/net/ethernet/smsc/smc91c92_cs.c | 4 +- drivers/net/ethernet/smsc/smc91x.c | 13 +- drivers/net/ethernet/smsc/smsc911x.c | 111 +- drivers/net/ethernet/smsc/smsc9420.c | 7 +- .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 5 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 27 +- drivers/net/ethernet/sun/cassini.c | 7 +- drivers/net/ethernet/sun/niu.c | 24 +- drivers/net/ethernet/sun/sunbmac.c | 13 +- drivers/net/ethernet/sun/sungem.c | 6 +- drivers/net/ethernet/sun/sunhme.c | 9 +- drivers/net/ethernet/tundra/tsi108_eth.c | 20 +- drivers/net/ethernet/via/via-rhine.c | 6 +- drivers/net/ethernet/via/via-velocity.c | 6 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 26 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 22 +- drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- drivers/net/ifb.c | 2 +- drivers/net/irda/bfin_sir.c | 13 +- drivers/net/irda/pxaficp_ir.c | 13 +- drivers/net/irda/sh_irda.c | 13 +- drivers/net/irda/sh_sir.c | 13 +- drivers/net/loopback.c | 2 +- drivers/net/macvtap.c | 8 +- drivers/net/mii.c | 53 +- drivers/net/phy/mdio-bitbang.c | 9 + drivers/net/phy/mdio-gpio.c | 1 + drivers/net/phy/phy_device.c | 20 +- drivers/net/ppp/pptp.c | 2 +- drivers/net/team/Kconfig | 43 + drivers/net/team/Makefile | 7 + drivers/net/team/team.c | 1661 +++++ drivers/net/team/team_mode_activebackup.c | 136 + drivers/net/team/team_mode_roundrobin.c | 107 + drivers/net/tun.c | 16 +- drivers/net/usb/cdc-phonet.c | 10 +- drivers/net/usb/cdc_ncm.c | 4 +- drivers/net/usb/smsc75xx.c | 3 +- drivers/net/usb/smsc95xx.c | 3 +- drivers/net/veth.c | 9 +- drivers/net/virtio_net.c | 16 + drivers/net/vmxnet3/vmxnet3_ethtool.c | 9 +- drivers/net/vmxnet3/vmxnet3_int.h | 2 +- drivers/net/wireless/Makefile | 8 +- drivers/net/wireless/airo.c | 4 +- drivers/net/wireless/ath/ath.h | 1 + drivers/net/wireless/ath/ath6kl/Makefile | 2 +- drivers/net/wireless/ath/ath6kl/bmi.c | 7 +- drivers/net/wireless/ath/ath6kl/bmi.h | 2 + drivers/net/wireless/ath/ath6kl/cfg80211.c | 1431 ++++-- drivers/net/wireless/ath/ath6kl/cfg80211.h | 30 +- drivers/net/wireless/ath/ath6kl/common.h | 16 +- drivers/net/wireless/ath/ath6kl/core.h | 202 +- drivers/net/wireless/ath/ath6kl/debug.c | 849 +++- drivers/net/wireless/ath/ath6kl/debug.h | 34 +- drivers/net/wireless/ath/ath6kl/hif-ops.h | 49 +- .../net/wireless/ath/ath6kl/{htc_hif.c => hif.c} | 150 +- drivers/net/wireless/ath/ath6kl/hif.h | 61 +- drivers/net/wireless/ath/ath6kl/htc.c | 725 ++- drivers/net/wireless/ath/ath6kl/htc.h | 18 +- drivers/net/wireless/ath/ath6kl/htc_hif.h | 92 - drivers/net/wireless/ath/ath6kl/init.c | 675 +- drivers/net/wireless/ath/ath6kl/main.c | 668 +-- drivers/net/wireless/ath/ath6kl/sdio.c | 335 +- drivers/net/wireless/ath/ath6kl/target.h | 3 + drivers/net/wireless/ath/ath6kl/txrx.c | 221 +- drivers/net/wireless/ath/ath6kl/wmi.c | 688 ++- drivers/net/wireless/ath/ath6kl/wmi.h | 243 +- drivers/net/wireless/ath/ath9k/Kconfig | 1 + drivers/net/wireless/ath/ath9k/Makefile | 1 + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 140 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 10 +- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 4 +- drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 + .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 26 +- drivers/net/wireless/ath/ath9k/ath9k.h | 4 + drivers/net/wireless/ath/ath9k/btcoex.c | 107 +- drivers/net/wireless/ath/ath9k/btcoex.h | 10 +- drivers/net/wireless/ath/ath9k/debug.c | 13 +- drivers/net/wireless/ath/ath9k/eeprom.h | 3 +- drivers/net/wireless/ath/ath9k/gpio.c | 9 +- drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 2 + drivers/net/wireless/ath/ath9k/hw.c | 4 +- drivers/net/wireless/ath/ath9k/hw.h | 16 +- drivers/net/wireless/ath/ath9k/init.c | 3 + drivers/net/wireless/ath/ath9k/main.c | 12 +- drivers/net/wireless/ath/ath9k/mci.c | 254 + drivers/net/wireless/ath/ath9k/mci.h | 118 + drivers/net/wireless/ath/ath9k/recv.c | 10 +- drivers/net/wireless/ath/ath9k/reg.h | 15 +- drivers/net/wireless/ath/ath9k/xmit.c | 5 +- drivers/net/wireless/ath/carl9170/main.c | 12 +- drivers/net/wireless/ath/carl9170/tx.c | 4 +- drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 +- drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h | 7 - drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 18 +- .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 5 +- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 301 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 709 +-- .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 622 ++ .../net/wireless/brcm80211/brcmfmac/sdio_chip.h | 136 + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 41 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 9 - drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 14 +- drivers/net/wireless/brcm80211/brcmsmac/aiutils.h | 76 - drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 6 +- drivers/net/wireless/brcm80211/brcmsmac/channel.c | 118 - drivers/net/wireless/brcm80211/brcmsmac/dma.c | 184 +- drivers/net/wireless/brcm80211/brcmsmac/dma.h | 3 +- .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 124 +- .../net/wireless/brcm80211/brcmsmac/mac80211_if.h | 2 + drivers/net/wireless/brcm80211/brcmsmac/main.c | 687 +-- drivers/net/wireless/brcm80211/brcmsmac/main.h | 19 +- .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 10 +- .../net/wireless/brcm80211/brcmsmac/phy/phy_int.h | 5 - .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 38 +- drivers/net/wireless/brcm80211/brcmsmac/pmu.c | 1 + drivers/net/wireless/brcm80211/brcmsmac/pub.h | 38 +- drivers/net/wireless/brcm80211/brcmsmac/rate.h | 5 +- drivers/net/wireless/brcm80211/brcmsmac/srom.c | 469 +-- drivers/net/wireless/brcm80211/brcmsmac/srom.h | 5 - drivers/net/wireless/brcm80211/brcmutil/utils.c | 218 +- .../net/wireless/brcm80211/include/brcmu_utils.h | 30 +- drivers/net/wireless/brcm80211/include/defs.h | 1 - drivers/net/wireless/brcm80211/include/soc.h | 12 +- drivers/net/wireless/hostap/hostap_ioctl.c | 4 +- drivers/net/wireless/ipw2x00/ipw2100.c | 7 +- drivers/net/wireless/ipw2x00/ipw2200.c | 15 +- drivers/net/wireless/ipw2x00/libipw.h | 8 - drivers/net/wireless/iwlegacy/3945-debug.c | 505 ++ drivers/net/wireless/iwlegacy/3945-mac.c | 3977 ++++++++++++ drivers/net/wireless/iwlegacy/3945-rs.c | 995 +++ drivers/net/wireless/iwlegacy/3945.c | 2751 ++++++++ drivers/net/wireless/iwlegacy/3945.h | 626 ++ .../iwlegacy/{iwl-4965-calib.c => 4965-calib.c} | 613 +- drivers/net/wireless/iwlegacy/4965-debug.c | 746 +++ drivers/net/wireless/iwlegacy/4965-mac.c | 6536 ++++++++++++++++++++ drivers/net/wireless/iwlegacy/4965-rs.c | 2860 +++++++++ drivers/net/wireless/iwlegacy/4965.c | 2421 ++++++++ drivers/net/wireless/iwlegacy/4965.h | 1309 ++++ drivers/net/wireless/iwlegacy/Kconfig | 43 +- drivers/net/wireless/iwlegacy/Makefile | 24 +- .../iwlegacy/{iwl-commands.h => commands.h} | 1134 ++-- drivers/net/wireless/iwlegacy/common.c | 5707 +++++++++++++++++ drivers/net/wireless/iwlegacy/common.h | 3424 ++++++++++ drivers/net/wireless/iwlegacy/{iwl-csr.h => csr.h} | 93 +- drivers/net/wireless/iwlegacy/debug.c | 1411 +++++ drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c | 523 -- drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h | 60 - drivers/net/wireless/iwlegacy/iwl-3945-fh.h | 187 - drivers/net/wireless/iwlegacy/iwl-3945-hw.h | 291 - drivers/net/wireless/iwlegacy/iwl-3945-led.c | 63 - drivers/net/wireless/iwlegacy/iwl-3945-led.h | 32 - drivers/net/wireless/iwlegacy/iwl-3945-rs.c | 996 --- drivers/net/wireless/iwlegacy/iwl-3945.c | 2741 -------- drivers/net/wireless/iwlegacy/iwl-3945.h | 308 - drivers/net/wireless/iwlegacy/iwl-4965-calib.h | 75 - drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c | 774 --- drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h | 59 - drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c | 154 - drivers/net/wireless/iwlegacy/iwl-4965-hw.h | 811 --- drivers/net/wireless/iwlegacy/iwl-4965-led.c | 73 - drivers/net/wireless/iwlegacy/iwl-4965-led.h | 33 - drivers/net/wireless/iwlegacy/iwl-4965-lib.c | 1194 ---- drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 2871 --------- drivers/net/wireless/iwlegacy/iwl-4965-rx.c | 215 - drivers/net/wireless/iwlegacy/iwl-4965-sta.c | 721 --- drivers/net/wireless/iwlegacy/iwl-4965-tx.c | 1378 ----- drivers/net/wireless/iwlegacy/iwl-4965-ucode.c | 166 - drivers/net/wireless/iwlegacy/iwl-4965.c | 2183 ------- drivers/net/wireless/iwlegacy/iwl-4965.h | 282 - drivers/net/wireless/iwlegacy/iwl-core.c | 2661 -------- drivers/net/wireless/iwlegacy/iwl-core.h | 636 -- drivers/net/wireless/iwlegacy/iwl-debug.h | 198 - drivers/net/wireless/iwlegacy/iwl-debugfs.c | 1314 ---- drivers/net/wireless/iwlegacy/iwl-dev.h | 1364 ---- drivers/net/wireless/iwlegacy/iwl-devtrace.c | 42 - drivers/net/wireless/iwlegacy/iwl-devtrace.h | 210 - drivers/net/wireless/iwlegacy/iwl-eeprom.c | 553 -- drivers/net/wireless/iwlegacy/iwl-eeprom.h | 344 - drivers/net/wireless/iwlegacy/iwl-fh.h | 513 -- drivers/net/wireless/iwlegacy/iwl-hcmd.c | 271 - drivers/net/wireless/iwlegacy/iwl-helpers.h | 196 - drivers/net/wireless/iwlegacy/iwl-io.h | 545 -- drivers/net/wireless/iwlegacy/iwl-led.c | 205 - drivers/net/wireless/iwlegacy/iwl-led.h | 56 - drivers/net/wireless/iwlegacy/iwl-legacy-rs.h | 456 -- drivers/net/wireless/iwlegacy/iwl-power.c | 165 - drivers/net/wireless/iwlegacy/iwl-power.h | 55 - drivers/net/wireless/iwlegacy/iwl-rx.c | 282 - drivers/net/wireless/iwlegacy/iwl-scan.c | 550 -- drivers/net/wireless/iwlegacy/iwl-spectrum.h | 4 +- drivers/net/wireless/iwlegacy/iwl-sta.c | 540 +- drivers/net/wireless/iwlegacy/iwl-sta.h | 148 - drivers/net/wireless/iwlegacy/iwl-tx.c | 659 -- drivers/net/wireless/iwlegacy/iwl3945-base.c | 4016 ------------ drivers/net/wireless/iwlegacy/iwl4965-base.c | 3281 ---------- .../net/wireless/iwlegacy/{iwl-prph.h => prph.h} | 133 +- drivers/net/wireless/iwlwifi/Makefile | 2 +- drivers/net/wireless/iwlwifi/iwl-2000.c | 20 - drivers/net/wireless/iwlwifi/iwl-6000.c | 10 - drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 358 ++ drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 8 +- drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 49 +- drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 13 +- drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 78 +- drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 23 +- drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 154 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 1781 +----- drivers/net/wireless/iwlwifi/iwl-agn.h | 31 +- drivers/net/wireless/iwlwifi/iwl-cfg.h | 6 - drivers/net/wireless/iwlwifi/iwl-commands.h | 27 +- drivers/net/wireless/iwlwifi/iwl-core.c | 307 +- drivers/net/wireless/iwlwifi/iwl-core.h | 14 - drivers/net/wireless/iwlwifi/iwl-csr.h | 4 +- drivers/net/wireless/iwlwifi/iwl-debug.h | 42 +- drivers/net/wireless/iwlwifi/iwl-debugfs.c | 8 +- drivers/net/wireless/iwlwifi/iwl-dev.h | 34 +- drivers/net/wireless/iwlwifi/iwl-devtrace.c | 2 +- drivers/net/wireless/iwlwifi/iwl-devtrace.h | 23 +- drivers/net/wireless/iwlwifi/iwl-eeprom.c | 142 +- drivers/net/wireless/iwlwifi/iwl-io.c | 2 +- drivers/net/wireless/iwlwifi/iwl-mac80211.c | 1632 +++++ drivers/net/wireless/iwlwifi/iwl-pci.c | 20 +- drivers/net/wireless/iwlwifi/iwl-scan.c | 50 +- drivers/net/wireless/iwlwifi/iwl-sv-open.c | 7 +- drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h | 40 +- drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 2 +- drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 56 +- drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 35 +- drivers/net/wireless/iwlwifi/iwl-trans.h | 50 +- drivers/net/wireless/iwmc3200wifi/cfg80211.c | 15 +- drivers/net/wireless/libertas/cfg.c | 25 +- drivers/net/wireless/libertas/ethtool.c | 7 +- drivers/net/wireless/mac80211_hwsim.c | 2 + drivers/net/wireless/mwifiex/11n_rxreorder.c | 18 +- drivers/net/wireless/mwifiex/Kconfig | 4 +- drivers/net/wireless/mwifiex/cfg80211.c | 4 +- drivers/net/wireless/mwifiex/cfp.c | 38 +- drivers/net/wireless/mwifiex/fw.h | 3 +- drivers/net/wireless/mwifiex/init.c | 4 +- drivers/net/wireless/mwifiex/join.c | 96 +- drivers/net/wireless/mwifiex/main.h | 3 +- drivers/net/wireless/mwifiex/pcie.c | 11 +- drivers/net/wireless/mwifiex/scan.c | 7 +- drivers/net/wireless/mwifiex/sdio.c | 21 +- drivers/net/wireless/mwifiex/sdio.h | 1 + drivers/net/wireless/mwifiex/sta_cmdresp.c | 2 +- drivers/net/wireless/mwifiex/sta_ioctl.c | 4 +- drivers/net/wireless/mwifiex/sta_rx.c | 12 +- drivers/net/wireless/orinoco/scan.c | 16 +- drivers/net/wireless/p54/p54spi.c | 6 +- drivers/net/wireless/p54/txrx.c | 4 +- drivers/net/wireless/prism54/islpci_dev.c | 4 +- drivers/net/wireless/ray_cs.c | 4 +- drivers/net/wireless/rayctl.h | 4 +- drivers/net/wireless/rndis_wlan.c | 109 +- drivers/net/wireless/rtlwifi/base.c | 6 +- drivers/net/wireless/rtlwifi/base.h | 2 +- drivers/net/wireless/rtlwifi/pci.c | 3 - drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 60 +- drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h | 23 +- drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 9 +- drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 1 + drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 36 +- drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 +- drivers/net/wireless/rtlwifi/usb.c | 55 +- drivers/net/wireless/rtlwifi/wifi.h | 7 +- drivers/net/xen-netback/interface.c | 3 +- drivers/net/xen-netfront.c | 8 +- drivers/s390/kvm/kvm_virtio.c | 6 + drivers/s390/net/qeth_l3_main.c | 6 +- drivers/usb/gadget/f_phonet.c | 11 +- drivers/virtio/virtio_mmio.c | 6 + drivers/virtio/virtio_pci.c | 8 + fs/dlm/lowcomms.c | 2 +- include/asm-generic/socket.h | 3 + include/linux/Kbuild | 1 + include/linux/atmdev.h | 10 - include/linux/cgroup_subsys.h | 8 + include/linux/dynamic_queue_limits.h | 97 + include/linux/eeprom_93cx6.h | 8 + include/linux/errqueue.h | 3 +- include/linux/ethtool.h | 53 - include/linux/ieee80211.h | 6 + include/linux/if.h | 1 + include/linux/if_team.h | 242 + include/linux/mdio-bitbang.h | 2 + include/linux/mdio-gpio.h | 2 + include/linux/mii.h | 200 + include/linux/mlx4/device.h | 3 +- include/linux/mlx4/qp.h | 28 + include/linux/neighbour.h | 1 + include/linux/netdev_features.h | 146 + include/linux/netdevice.h | 295 +- include/linux/netfilter.h | 26 +- include/linux/nl80211.h | 146 + include/linux/phonet.h | 2 + include/linux/skbuff.h | 57 +- include/linux/sunrpc/clnt.h | 2 +- include/linux/virtio_config.h | 14 + include/net/bluetooth/bluetooth.h | 29 +- include/net/bluetooth/hci.h | 22 + include/net/bluetooth/hci_core.h | 136 +- include/net/bluetooth/l2cap.h | 409 ++- include/net/bluetooth/mgmt.h | 47 +- include/net/cfg80211.h | 202 +- include/net/dsa.h | 143 +- include/net/flow_keys.h | 16 + include/net/icmp.h | 4 +- include/net/ieee80211_radiotap.h | 8 - include/net/ieee802154.h | 6 + include/net/inet_connection_sock.h | 6 +- include/net/inetpeer.h | 2 +- include/net/ip.h | 2 +- include/net/ip_vs.h | 8 +- include/net/ipv6.h | 20 +- include/net/mac80211.h | 57 +- include/net/neighbour.h | 3 +- include/net/netns/mib.h | 4 +- include/net/netprio_cgroup.h | 57 + include/net/nfc/nci.h | 171 +- include/net/nfc/nci_core.h | 13 +- include/net/protocol.h | 4 +- include/net/regulatory.h | 6 + include/net/sctp/structs.h | 1 + include/net/snmp.h | 4 +- include/net/sock.h | 19 +- include/net/tcp.h | 11 +- include/net/udp.h | 3 +- include/net/xfrm.h | 12 +- lib/Kconfig | 3 + lib/Makefile | 2 + lib/dynamic_queue_limits.c | 133 + lib/vsprintf.c | 19 + net/8021q/vlan_dev.c | 9 +- net/Kconfig | 13 + net/atm/atm_misc.c | 2 +- net/atm/br2684.c | 38 +- net/atm/clip.c | 36 +- net/atm/common.c | 34 +- net/atm/common.h | 1 + net/atm/pppoatm.c | 4 + net/ax25/af_ax25.c | 17 +- net/batman-adv/bat_sysfs.c | 4 +- net/batman-adv/bitarray.c | 2 +- net/batman-adv/gateway_client.c | 153 +- net/batman-adv/gateway_client.h | 5 +- net/batman-adv/gateway_common.c | 4 +- net/batman-adv/hash.c | 4 +- net/batman-adv/hash.h | 13 +- net/batman-adv/main.h | 2 +- net/batman-adv/originator.c | 13 +- net/batman-adv/originator.h | 2 +- net/batman-adv/routing.c | 22 +- net/batman-adv/soft-interface.c | 43 +- net/batman-adv/translation-table.c | 100 +- net/batman-adv/vis.c | 17 +- net/bluetooth/bnep/core.c | 13 +- net/bluetooth/cmtp/core.c | 13 +- net/bluetooth/hci_conn.c | 69 +- net/bluetooth/hci_core.c | 399 +- net/bluetooth/hci_event.c | 221 +- net/bluetooth/hci_sysfs.c | 40 +- net/bluetooth/hidp/core.c | 157 +- net/bluetooth/l2cap_core.c | 947 +++- net/bluetooth/l2cap_sock.c | 90 +- net/bluetooth/mgmt.c | 500 +- net/bluetooth/rfcomm/core.c | 65 +- net/bluetooth/rfcomm/sock.c | 2 + net/bluetooth/rfcomm/tty.c | 45 +- net/bluetooth/smp.c | 3 +- net/bridge/br_device.c | 7 +- net/bridge/br_fdb.c | 38 +- net/bridge/br_if.c | 5 +- net/bridge/br_multicast.c | 10 +- net/bridge/br_private.h | 3 +- net/core/Makefile | 3 +- net/core/dev.c | 293 +- net/core/ethtool.c | 556 +-- net/core/flow_dissector.c | 143 + net/core/neighbour.c | 162 +- net/core/net-sysfs.c | 281 +- net/core/netpoll.c | 10 +- net/core/netprio_cgroup.c | 344 + net/core/pktgen.c | 17 +- net/core/skbuff.c | 71 +- net/core/sock.c | 69 +- net/core/sysctl_net_core.c | 9 +- net/dccp/ipv6.c | 42 +- net/dccp/minisocks.c | 6 +- net/decnet/dn_neigh.c | 2 +- net/dsa/Kconfig | 38 +- net/dsa/Makefile | 19 +- net/dsa/dsa.c | 51 +- net/dsa/dsa_priv.h | 127 +- net/dsa/tag_dsa.c | 15 +- net/dsa/tag_edsa.c | 15 +- net/dsa/tag_trailer.c | 15 +- net/econet/af_econet.c | 7 +- net/ieee802154/6lowpan.c | 374 ++- net/ieee802154/6lowpan.h | 23 + net/ieee802154/dgram.c | 7 +- net/ieee802154/raw.c | 7 +- net/ipv4/af_inet.c | 11 +- net/ipv4/arp.c | 8 +- net/ipv4/igmp.c | 13 +- net/ipv4/inet_connection_sock.c | 17 +- net/ipv4/inet_diag.c | 19 +- net/ipv4/ip_gre.c | 4 +- net/ipv4/ip_sockglue.c | 35 +- net/ipv4/ipconfig.c | 15 +- net/ipv4/ipip.c | 2 +- net/ipv4/ipmr.c | 4 +- net/ipv4/netfilter/ip_queue.c | 6 +- net/ipv4/proc.c | 9 +- net/ipv4/raw.c | 10 +- net/ipv4/tcp.c | 20 +- net/ipv4/tcp_cong.c | 2 +- net/ipv4/tcp_input.c | 44 +- net/ipv4/tcp_ipv4.c | 1 + net/ipv4/tcp_minisocks.c | 10 +- net/ipv4/tcp_output.c | 2 +- net/ipv4/udp.c | 6 +- net/ipv6/addrconf.c | 8 +- net/ipv6/af_inet6.c | 27 +- net/ipv6/ah6.c | 12 +- net/ipv6/anycast.c | 4 +- net/ipv6/datagram.c | 36 +- net/ipv6/exthdrs.c | 18 +- net/ipv6/fib6_rules.c | 2 +- net/ipv6/icmp.c | 18 +- net/ipv6/inet6_connection_sock.c | 12 +- net/ipv6/ip6_fib.c | 115 +- net/ipv6/ip6_flowlabel.c | 2 +- net/ipv6/ip6_output.c | 26 +- net/ipv6/ip6_tunnel.c | 14 +- net/ipv6/ip6mr.c | 12 +- net/ipv6/ipv6_sockglue.c | 8 +- net/ipv6/mcast.c | 18 +- net/ipv6/mip6.c | 4 +- net/ipv6/ndisc.c | 21 +- net/ipv6/netfilter/ip6_queue.c | 5 +- net/ipv6/netfilter/ip6t_REJECT.c | 8 +- net/ipv6/proc.c | 15 +- net/ipv6/raw.c | 19 +- net/ipv6/reassembly.c | 4 +- net/ipv6/route.c | 55 +- net/ipv6/sit.c | 6 +- net/ipv6/syncookies.c | 8 +- net/ipv6/tcp_ipv6.c | 46 +- net/ipv6/udp.c | 14 +- net/ipv6/xfrm6_mode_beet.c | 8 +- net/ipv6/xfrm6_mode_tunnel.c | 4 +- net/ipv6/xfrm6_output.c | 4 +- net/ipv6/xfrm6_policy.c | 4 +- net/ipv6/xfrm6_state.c | 4 +- net/irda/irttp.c | 4 +- net/key/af_key.c | 2 +- net/mac80211/agg-rx.c | 3 +- net/mac80211/agg-tx.c | 10 +- net/mac80211/cfg.c | 167 +- net/mac80211/debugfs.c | 2 +- net/mac80211/debugfs_sta.c | 4 +- net/mac80211/driver-ops.h | 76 +- net/mac80211/ht.c | 86 +- net/mac80211/ibss.c | 3 + net/mac80211/ieee80211_i.h | 102 +- net/mac80211/iface.c | 44 +- net/mac80211/key.c | 9 +- net/mac80211/main.c | 57 +- net/mac80211/mesh.c | 70 +- net/mac80211/mesh.h | 7 + net/mac80211/mesh_hwmp.c | 53 +- net/mac80211/mesh_pathtbl.c | 30 +- net/mac80211/mesh_plink.c | 51 +- net/mac80211/mlme.c | 120 +- net/mac80211/offchannel.c | 4 +- net/mac80211/pm.c | 2 +- net/mac80211/rc80211_minstrel.c | 7 +- net/mac80211/rc80211_minstrel_ht.c | 62 +- net/mac80211/rx.c | 73 +- net/mac80211/scan.c | 199 +- net/mac80211/sta_info.h | 10 +- net/mac80211/status.c | 87 +- net/mac80211/tx.c | 332 +- net/mac80211/util.c | 300 +- net/mac80211/wep.c | 5 +- net/mac80211/wme.c | 10 +- net/mac80211/work.c | 60 +- net/mac80211/wpa.c | 34 +- net/netfilter/core.c | 13 +- net/netfilter/ipset/ip_set_hash_ip.c | 2 +- net/netfilter/ipset/ip_set_hash_net.c | 2 +- net/netfilter/ipvs/ip_vs_core.c | 2 +- net/netfilter/ipvs/ip_vs_sync.c | 6 +- net/netfilter/ipvs/ip_vs_xmit.c | 10 +- net/netfilter/nf_conntrack_h323_main.c | 4 +- net/netfilter/xt_TCPMSS.c | 2 +- net/netfilter/xt_addrtype.c | 2 +- net/netlabel/netlabel_kapi.c | 4 +- net/netlabel/netlabel_mgmt.c | 4 +- net/netlabel/netlabel_unlabeled.c | 4 +- net/netrom/af_netrom.c | 3 +- net/netrom/nr_route.c | 11 +- net/nfc/nci/core.c | 18 +- net/nfc/nci/data.c | 5 +- net/nfc/nci/lib.c | 8 +- net/nfc/nci/ntf.c | 152 +- net/nfc/nci/rsp.c | 83 +- net/packet/af_packet.c | 21 +- net/phonet/pep.c | 106 +- net/rfkill/core.c | 4 +- net/rxrpc/ar-key.c | 6 +- net/sched/cls_flow.c | 180 +- net/sched/sch_choke.c | 113 +- net/sched/sch_generic.c | 9 +- net/sched/sch_multiq.c | 6 +- net/sched/sch_sfb.c | 17 +- net/sched/sch_sfq.c | 65 +- net/sched/sch_teql.c | 6 +- net/sctp/ipv6.c | 40 +- net/sctp/sm_make_chunk.c | 4 +- net/sctp/sm_sideeffect.c | 8 +- net/sctp/socket.c | 2 +- net/sctp/transport.c | 16 + net/socket.c | 20 + net/sunrpc/svcauth_unix.c | 6 +- net/sunrpc/svcsock.c | 4 +- net/wireless/core.c | 4 + net/wireless/core.h | 14 +- net/wireless/mlme.c | 72 +- net/wireless/nl80211.c | 543 ++- net/wireless/nl80211.h | 5 + net/wireless/reg.c | 39 + net/wireless/reg.h | 1 + net/wireless/scan.c | 117 +- net/wireless/sme.c | 7 +- net/wireless/util.c | 186 +- net/wireless/wext-compat.c | 12 + net/xfrm/xfrm_policy.c | 4 +- net/xfrm/xfrm_state.c | 12 +- security/lsm_audit.c | 4 +- security/selinux/hooks.c | 6 +- security/selinux/netnode.c | 2 +- 784 files changed, 61533 insertions(+), 51654 deletions(-) create mode 100644 Documentation/cgroups/net_prio.txt create mode 100644 Documentation/devicetree/bindings/net/calxeda-xgmac.txt create mode 100644 Documentation/networking/team.txt delete mode 100644 drivers/net/bonding/bond_ipv6.c create mode 100644 drivers/net/dsa/Kconfig create mode 100644 drivers/net/dsa/Makefile rename {net => drivers/net}/dsa/mv88e6060.c (96%) rename {net => drivers/net}/dsa/mv88e6123_61_65.c (96%) rename {net => drivers/net}/dsa/mv88e6131.c (96%) rename {net => drivers/net}/dsa/mv88e6xxx.c (93%) rename {net => drivers/net}/dsa/mv88e6xxx.h (95%) create mode 100644 drivers/net/ethernet/calxeda/Kconfig create mode 100644 drivers/net/ethernet/calxeda/Makefile create mode 100644 drivers/net/ethernet/calxeda/xgmac.c create mode 100644 drivers/net/team/Kconfig create mode 100644 drivers/net/team/Makefile create mode 100644 drivers/net/team/team.c create mode 100644 drivers/net/team/team_mode_activebackup.c create mode 100644 drivers/net/team/team_mode_roundrobin.c rename drivers/net/wireless/ath/ath6kl/{htc_hif.c => hif.c} (80%) delete mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.h create mode 100644 drivers/net/wireless/ath/ath9k/mci.c create mode 100644 drivers/net/wireless/ath/ath9k/mci.h create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h create mode 100644 drivers/net/wireless/iwlegacy/3945-debug.c create mode 100644 drivers/net/wireless/iwlegacy/3945-mac.c create mode 100644 drivers/net/wireless/iwlegacy/3945-rs.c create mode 100644 drivers/net/wireless/iwlegacy/3945.c create mode 100644 drivers/net/wireless/iwlegacy/3945.h rename drivers/net/wireless/iwlegacy/{iwl-4965-calib.c => 4965-calib.c} (55%) create mode 100644 drivers/net/wireless/iwlegacy/4965-debug.c create mode 100644 drivers/net/wireless/iwlegacy/4965-mac.c create mode 100644 drivers/net/wireless/iwlegacy/4965-rs.c create mode 100644 drivers/net/wireless/iwlegacy/4965.c create mode 100644 drivers/net/wireless/iwlegacy/4965.h rename drivers/net/wireless/iwlegacy/{iwl-commands.h => commands.h} (79%) create mode 100644 drivers/net/wireless/iwlegacy/common.c create mode 100644 drivers/net/wireless/iwlegacy/common.h rename drivers/net/wireless/iwlegacy/{iwl-csr.h => csr.h} (84%) create mode 100644 drivers/net/wireless/iwlegacy/debug.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-fh.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-hw.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-led.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-led.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-rs.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-calib.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-hw.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-led.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-led.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-lib.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-rs.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-rx.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-sta.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-tx.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-ucode.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-core.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-core.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-debug.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-debugfs.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-dev.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-devtrace.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-devtrace.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-eeprom.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-eeprom.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-fh.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-hcmd.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-helpers.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-io.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-led.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-led.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-legacy-rs.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-power.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-power.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-rx.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-scan.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl-sta.h delete mode 100644 drivers/net/wireless/iwlegacy/iwl-tx.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl3945-base.c delete mode 100644 drivers/net/wireless/iwlegacy/iwl4965-base.c rename drivers/net/wireless/iwlegacy/{iwl-prph.h => prph.h} (83%) create mode 100644 drivers/net/wireless/iwlwifi/iwl-mac80211.c create mode 100644 include/linux/dynamic_queue_limits.h create mode 100644 include/linux/if_team.h create mode 100644 include/linux/netdev_features.h create mode 100644 include/net/flow_keys.h create mode 100644 include/net/netprio_cgroup.h create mode 100644 lib/dynamic_queue_limits.c create mode 100644 net/core/flow_dissector.c create mode 100644 net/core/netprio_cgroup.c Merging wireless-next/master (ba5736a ath9k_hw: add default chainmask for AR9462) $ git merge wireless-next/master Auto-merging net/wireless/nl80211.c Auto-merging net/mac80211/util.c Auto-merging net/mac80211/rx.c Auto-merging net/mac80211/main.c Auto-merging net/mac80211/agg-tx.c Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c Auto-merging drivers/net/wireless/prism54/isl_ioctl.c Auto-merging drivers/net/wireless/p54/p54spi.c Auto-merging drivers/net/wireless/libertas/if_spi.c Auto-merging drivers/net/wireless/iwlwifi/iwl-trans-pcie.c Removing drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h Auto-merging drivers/net/wireless/ath/ath9k/hw.c Merge made by the 'recursive' strategy. drivers/net/wireless/ath/ath5k/ahb.c | 4 +- drivers/net/wireless/ath/ath5k/ani.c | 91 +- drivers/net/wireless/ath/ath5k/ani.h | 32 +- drivers/net/wireless/ath/ath5k/ath5k.h | 569 ++++++--- drivers/net/wireless/ath/ath5k/attach.c | 16 +- drivers/net/wireless/ath/ath5k/base.c | 287 +++-- drivers/net/wireless/ath/ath5k/caps.c | 27 +- drivers/net/wireless/ath/ath5k/desc.c | 217 +++- drivers/net/wireless/ath/ath5k/desc.h | 124 ++- drivers/net/wireless/ath/ath5k/dma.c | 370 +++-- drivers/net/wireless/ath/ath5k/gpio.c | 81 +- drivers/net/wireless/ath/ath5k/initvals.c | 75 +- drivers/net/wireless/ath/ath5k/pci.c | 2 +- drivers/net/wireless/ath/ath5k/pcu.c | 222 ++- drivers/net/wireless/ath/ath5k/phy.c | 853 +++++++++--- drivers/net/wireless/ath/ath5k/qcu.c | 143 ++- drivers/net/wireless/ath/ath5k/reg.h | 27 +- drivers/net/wireless/ath/ath5k/reset.c | 230 +++- drivers/net/wireless/ath/ath5k/rfbuffer.h | 59 +- drivers/net/wireless/ath/ath5k/rfgain.h | 22 +- drivers/net/wireless/ath/ath9k/Makefile | 3 +- drivers/net/wireless/ath/ath9k/ar9003_calib.c | 45 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 3 +- drivers/net/wireless/ath/ath9k/ar9003_mac.c | 36 +- drivers/net/wireless/ath/ath9k/ar9003_mci.c | 1464 ++++++++++++++++++++ drivers/net/wireless/ath/ath9k/ar9003_mci.h | 102 ++ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 3 + drivers/net/wireless/ath/ath9k/ath9k.h | 3 +- drivers/net/wireless/ath/ath9k/btcoex.c | 2 +- drivers/net/wireless/ath/ath9k/btcoex.h | 31 + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 6 +- drivers/net/wireless/ath/ath9k/eeprom_9287.c | 3 +- drivers/net/wireless/ath/ath9k/eeprom_def.c | 6 +- drivers/net/wireless/ath/ath9k/hw.c | 178 +++- drivers/net/wireless/ath/ath9k/hw.h | 182 +++ drivers/net/wireless/ath/ath9k/init.c | 33 + drivers/net/wireless/ath/ath9k/mac.c | 17 +- drivers/net/wireless/ath/ath9k/main.c | 9 +- drivers/net/wireless/ath/ath9k/mci.c | 419 ++++++ drivers/net/wireless/ath/ath9k/mci.h | 20 + drivers/net/wireless/ath/ath9k/recv.c | 24 +- drivers/net/wireless/ath/ath9k/reg.h | 306 ++++- drivers/net/wireless/ath/ath9k/xmit.c | 13 +- drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h | 25 - drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 148 ++- .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 211 ++-- drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 31 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 19 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 6 +- .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 15 - .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 85 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 320 ++--- .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 30 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 9 +- drivers/net/wireless/brcm80211/brcmsmac/dma.c | 62 +- .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 38 +- drivers/net/wireless/brcm80211/brcmsmac/main.c | 47 +- drivers/net/wireless/brcm80211/brcmsmac/main.h | 6 +- .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 2 +- drivers/net/wireless/hostap/hostap_cs.c | 3 + drivers/net/wireless/iwlwifi/iwl-1000.c | 9 - drivers/net/wireless/iwlwifi/iwl-2000.c | 14 - drivers/net/wireless/iwlwifi/iwl-5000.c | 16 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 22 +- drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 68 +- drivers/net/wireless/iwlwifi/iwl-agn-calib.h | 3 +- drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 1 + drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 48 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 34 + drivers/net/wireless/iwlwifi/iwl-core.h | 5 +- drivers/net/wireless/iwlwifi/iwl-dev.h | 24 +- drivers/net/wireless/iwlwifi/iwl-shared.h | 2 - drivers/net/wireless/iwlwifi/iwl-sv-open.c | 40 +- drivers/net/wireless/iwlwifi/iwl-testmode.h | 20 +- drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 12 +- drivers/net/wireless/libertas/if_spi.c | 1 - drivers/net/wireless/mwifiex/cfg80211.c | 3 +- drivers/net/wireless/p54/p54spi.c | 1 - drivers/net/wireless/prism54/isl_ioctl.c | 333 ----- drivers/net/wireless/prism54/isl_ioctl.h | 2 - drivers/net/wireless/prism54/islpci_dev.c | 1 - drivers/net/wireless/rt2x00/rt2800lib.c | 6 +- drivers/net/wireless/rtlwifi/pci.c | 7 +- drivers/net/wireless/wl1251/spi.c | 1 - drivers/net/wireless/wl12xx/spi.c | 1 - drivers/nfc/pn533.c | 2 +- include/linux/nl80211.h | 15 + include/net/cfg80211.h | 12 +- net/mac80211/Kconfig | 12 - net/mac80211/Makefile | 4 +- net/mac80211/agg-rx.c | 11 +- net/mac80211/agg-tx.c | 39 +- net/mac80211/cfg.c | 22 +- net/mac80211/debugfs.c | 35 - net/mac80211/debugfs_netdev.c | 3 + net/mac80211/driver-ops.h | 14 + net/mac80211/driver-trace.h | 11 - net/mac80211/ht.c | 6 +- net/mac80211/ieee80211_i.h | 10 +- net/mac80211/iface.c | 17 +- net/mac80211/main.c | 41 - net/mac80211/mesh.c | 1 + net/mac80211/mesh.h | 2 + net/mac80211/mesh_hwmp.c | 146 ++- net/mac80211/mesh_pathtbl.c | 29 +- net/mac80211/offchannel.c | 9 +- net/mac80211/rx.c | 105 +- net/mac80211/scan.c | 4 +- net/mac80211/sta_info.c | 4 - net/mac80211/sta_info.h | 3 +- net/mac80211/tx.c | 44 +- net/mac80211/util.c | 7 +- net/mac80211/wme.c | 32 +- net/mac80211/wme.h | 3 + net/mac80211/work.c | 99 +-- net/nfc/core.c | 60 +- net/nfc/nci/core.c | 84 +- net/nfc/nci/data.c | 30 +- net/nfc/nci/ntf.c | 83 +- net/nfc/nci/rsp.c | 84 +- net/nfc/netlink.c | 32 +- net/nfc/nfc.h | 7 - net/nfc/rawsock.c | 28 +- net/rfkill/rfkill-gpio.c | 13 +- net/rfkill/rfkill-regulator.c | 12 +- net/wireless/mesh.c | 2 + net/wireless/nl80211.c | 39 + 127 files changed, 6547 insertions(+), 2759 deletions(-) create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_mci.c create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_mci.h delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h Merging bluetooth/master (c6feeb2 Bluetooth: Use queue in the device list) $ git merge bluetooth/master Auto-merging net/bluetooth/mgmt.c Auto-merging net/bluetooth/l2cap_sock.c Auto-merging include/net/bluetooth/hci_core.h Merge made by the 'recursive' strategy. drivers/bluetooth/hci_vhci.c | 8 + include/net/bluetooth/hci.h | 15 + include/net/bluetooth/hci_core.h | 19 +- include/net/bluetooth/l2cap.h | 2 +- include/net/bluetooth/mgmt.h | 49 +++- net/bluetooth/hci_core.c | 18 +- net/bluetooth/hci_event.c | 53 ++-- net/bluetooth/l2cap_core.c | 72 +++--- net/bluetooth/l2cap_sock.c | 16 +- net/bluetooth/mgmt.c | 588 +++++++++++++++++++++++++++----------- 10 files changed, 596 insertions(+), 244 deletions(-) Merging mtd/master (e0d6511 Merge git://git.infradead.org/mtd-2.6) $ git merge mtd/master Already up-to-date. Merging l2-mtd/master (63c646f mtd: gpmi: add missing include 'module.h') $ git merge l2-mtd/master Merge made by the 'recursive' strategy. drivers/mtd/chips/cfi_cmdset_0020.c | 5 +- drivers/mtd/devices/Kconfig | 9 + drivers/mtd/devices/docg3.c | 1451 +++++++++++++++++++++++++++----- drivers/mtd/devices/docg3.h | 64 ++- drivers/mtd/maps/pxa2xx-flash.c | 2 +- drivers/mtd/mtd_blkdevs.c | 3 +- drivers/mtd/nand/Kconfig | 2 +- drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 2 +- drivers/mtd/nand/nand_base.c | 7 +- drivers/mtd/nand/nand_ids.c | 4 +- drivers/mtd/nand/ndfc.c | 2 +- include/linux/mtd/cfi.h | 16 +- include/linux/mtd/cfi_endian.h | 76 +- include/linux/mtd/map.h | 1 + include/linux/mtd/nand.h | 1 + 15 files changed, 1354 insertions(+), 291 deletions(-) Merging crypto/master (741e8c2 crypto: convert drivers/crypto/* to use module_platform_driver()) $ git merge crypto/master Auto-merging drivers/crypto/mv_cesa.c Removing crypto/serpent.c Auto-merging crypto/crypto_user.c Merge made by the 'recursive' strategy. arch/x86/crypto/Makefile | 4 + arch/x86/crypto/serpent-sse2-i586-asm_32.S | 638 ++++++ arch/x86/crypto/serpent-sse2-x86_64-asm_64.S | 761 +++++++ arch/x86/crypto/serpent_sse2_glue.c | 1110 ++++++++++ arch/x86/crypto/twofish_glue_3way.c | 250 +++ arch/x86/include/asm/serpent.h | 63 + crypto/Kconfig | 38 +- crypto/Makefile | 2 +- crypto/algapi.c | 29 + crypto/ansi_cprng.c | 8 + crypto/crypto_user.c | 2 +- crypto/lrw.c | 156 +- crypto/serpent.c | 587 ----- crypto/serpent_generic.c | 684 ++++++ crypto/tcrypt.c | 310 +++ crypto/tcrypt.h | 2 + crypto/testmgr.c | 150 ++ crypto/testmgr.h | 3029 ++++++++++++++++++++++++-- crypto/twofish_common.c | 13 +- crypto/xts.c | 79 +- drivers/char/hw_random/atmel-rng.c | 12 +- drivers/char/hw_random/n2-drv.c | 13 +- drivers/char/hw_random/octeon-rng.c | 13 +- drivers/char/hw_random/pasemi-rng.c | 12 +- drivers/char/hw_random/picoxcell-rng.c | 12 +- drivers/char/hw_random/ppc4xx-rng.c | 12 +- drivers/char/hw_random/timeriomem-rng.c | 13 +- drivers/crypto/amcc/crypto4xx_core.c | 13 +- drivers/crypto/caam/caamalg.c | 57 + drivers/crypto/caam/compat.h | 1 + drivers/crypto/caam/ctrl.c | 13 +- drivers/crypto/mv_cesa.c | 12 +- drivers/crypto/picoxcell_crypto.c | 12 +- drivers/crypto/s5p-sss.c | 13 +- drivers/crypto/talitos.c | 490 ++++- drivers/crypto/talitos.h | 45 +- include/crypto/algapi.h | 1 + include/crypto/lrw.h | 43 + include/crypto/serpent.h | 27 + include/crypto/twofish.h | 2 + include/crypto/xts.h | 27 + 41 files changed, 7738 insertions(+), 1020 deletions(-) create mode 100644 arch/x86/crypto/serpent-sse2-i586-asm_32.S create mode 100644 arch/x86/crypto/serpent-sse2-x86_64-asm_64.S create mode 100644 arch/x86/crypto/serpent_sse2_glue.c create mode 100644 arch/x86/include/asm/serpent.h delete mode 100644 crypto/serpent.c create mode 100644 crypto/serpent_generic.c create mode 100644 include/crypto/lrw.h create mode 100644 include/crypto/serpent.h create mode 100644 include/crypto/xts.h Merging sound/for-next (ad32d58 Merge branch 'fix/asoc' into for-next) $ git merge sound/for-next Auto-merging sound/soc/txx9/txx9aclc.c Auto-merging sound/soc/samsung/dma.c Auto-merging sound/soc/nuc900/nuc900-ac97.c Auto-merging sound/soc/imx/imx-pcm-dma-mx2.c Auto-merging sound/soc/ep93xx/ep93xx-pcm.c Auto-merging sound/soc/au1x/db1200.c Removing sound/soc/atmel/playpaq_wm8510.c Removing sound/pci/hda/alc262_quirks.c Auto-merging arch/arm/mach-shmobile/board-ap4evb.c Merge made by the 'recursive' strategy. .../devicetree/bindings/sound/tegra20-das.txt | 12 + .../devicetree/bindings/vendor-prefixes.txt | 1 + Documentation/sound/alsa/HD-Audio-Models.txt | 14 +- arch/arm/mach-shmobile/board-ap4evb.c | 15 +- arch/arm/mach-shmobile/board-mackerel.c | 14 +- arch/sh/boards/mach-se/7724/setup.c | 14 +- drivers/base/regmap/internal.h | 1 + drivers/base/regmap/regcache.c | 19 + drivers/base/regmap/regmap.c | 4 +- drivers/firmware/sigma.c | 81 +- include/linux/regmap.h | 1 + include/linux/sigma.h | 13 +- include/sound/sh_fsi.h | 12 + include/sound/soc-dapm.h | 1 + include/sound/soc.h | 7 +- include/sound/sta32x.h | 35 + sound/arm/pxa2xx-ac97.c | 13 +- sound/drivers/ml403-ac97cr.c | 13 +- sound/mips/hal2.c | 13 +- sound/mips/sgio2audio.c | 13 +- sound/pci/hda/alc262_quirks.c | 875 ------ sound/pci/hda/alc880_quirks.c | 193 -- sound/pci/hda/alc882_quirks.c | 2933 +------------------- sound/pci/hda/hda_codec.c | 6 + sound/pci/hda/hda_codec.h | 3 - sound/pci/hda/hda_intel.c | 49 +- sound/pci/hda/patch_hdmi.c | 20 +- sound/pci/hda/patch_realtek.c | 572 ++++- sound/pci/hda/patch_sigmatel.c | 4 +- sound/sh/sh_dac_audio.c | 13 +- sound/soc/Kconfig | 15 - sound/soc/atmel/Kconfig | 21 +- sound/soc/atmel/Makefile | 4 - sound/soc/atmel/atmel-pcm.c | 12 +- sound/soc/atmel/atmel_ssc_dai.c | 14 +- sound/soc/atmel/playpaq_wm8510.c | 473 ---- sound/soc/au1x/ac97c.c | 2 +- sound/soc/au1x/db1000.c | 13 +- sound/soc/au1x/db1200.c | 13 +- sound/soc/au1x/dbdma2.c | 13 +- sound/soc/au1x/dma.c | 13 +- sound/soc/au1x/i2sc.c | 13 +- sound/soc/au1x/psc-ac97.c | 2 +- sound/soc/au1x/psc-i2s.c | 15 +- sound/soc/blackfin/bf5xx-ac97-pcm.c | 12 +- sound/soc/blackfin/bf5xx-ac97.c | 13 +- sound/soc/blackfin/bf5xx-i2s-pcm.c | 12 +- sound/soc/blackfin/bf5xx-i2s.c | 15 +- sound/soc/blackfin/bf5xx-tdm-pcm.c | 12 +- sound/soc/blackfin/bf5xx-tdm.c | 14 +- sound/soc/blackfin/bfin-eval-adau1373.c | 12 +- sound/soc/blackfin/bfin-eval-adau1701.c | 12 +- sound/soc/blackfin/bfin-eval-adav80x.c | 12 +- sound/soc/codecs/88pm860x-codec.c | 16 +- sound/soc/codecs/Kconfig | 7 + sound/soc/codecs/Makefile | 10 +- sound/soc/codecs/ac97.c | 14 +- sound/soc/codecs/ad1836.c | 2 +- sound/soc/codecs/ad1836.h | 2 +- sound/soc/codecs/ad193x.c | 190 +- sound/soc/codecs/ad193x.h | 17 +- sound/soc/codecs/ad1980.c | 12 +- sound/soc/codecs/ad73311.c | 12 +- sound/soc/codecs/ads117x.c | 12 +- sound/soc/codecs/ak4104.c | 2 +- sound/soc/codecs/ak4535.c | 3 +- sound/soc/codecs/ak4641.c | 5 +- sound/soc/codecs/ak4642.c | 142 +- sound/soc/codecs/ak4671.c | 2 +- sound/soc/codecs/alc5623.c | 3 +- sound/soc/codecs/alc5632.c | 1159 ++++++++ sound/soc/codecs/alc5632.h | 251 ++ sound/soc/codecs/cq93vc.c | 14 +- sound/soc/codecs/cs4270.c | 13 +- sound/soc/codecs/cs4271.c | 2 +- sound/soc/codecs/cs42l51.c | 18 +- sound/soc/codecs/cs42l73.c | 1452 ++++++++++ sound/soc/codecs/cs42l73.h | 227 ++ sound/soc/codecs/cx20442.c | 12 +- sound/soc/codecs/da7210.c | 7 +- sound/soc/codecs/dfbmcs320.c | 12 +- sound/soc/codecs/dmic.c | 12 +- sound/soc/codecs/jz4740.c | 14 +- sound/soc/codecs/max98088.c | 5 +- sound/soc/codecs/max98095.c | 7 +- sound/soc/codecs/max9850.c | 2 +- sound/soc/codecs/max9877.c | 10 +- sound/soc/codecs/pcm3008.c | 12 +- sound/soc/codecs/rt5631.c | 3 +- sound/soc/codecs/sgtl5000.c | 3 +- sound/soc/codecs/sn95031.c | 22 +- sound/soc/codecs/spdif_transciever.c | 13 +- sound/soc/codecs/ssm2602.c | 3 +- sound/soc/codecs/sta32x.c | 87 +- sound/soc/codecs/stac9766.c | 16 +- sound/soc/codecs/tlv320aic23.c | 3 +- sound/soc/codecs/tlv320aic26.c | 2 +- sound/soc/codecs/tlv320aic32x4.c | 3 +- sound/soc/codecs/tlv320aic3x.c | 50 +- sound/soc/codecs/tlv320dac33.c | 3 +- sound/soc/codecs/twl4030.c | 16 +- sound/soc/codecs/twl6040.c | 14 +- sound/soc/codecs/uda134x.c | 14 +- sound/soc/codecs/uda1380.c | 6 +- sound/soc/codecs/wl1273.c | 14 +- sound/soc/codecs/wm1250-ev1.c | 10 +- sound/soc/codecs/wm2000.c | 1 - sound/soc/codecs/wm5100-tables.c | 1489 +++++------ sound/soc/codecs/wm5100.c | 404 ++-- sound/soc/codecs/wm5100.h | 7 +- sound/soc/codecs/wm8350.c | 14 +- sound/soc/codecs/wm8400.c | 20 +- sound/soc/codecs/wm8510.c | 3 +- sound/soc/codecs/wm8523.c | 3 +- sound/soc/codecs/wm8580.c | 5 +- sound/soc/codecs/wm8711.c | 3 +- sound/soc/codecs/wm8727.c | 12 +- sound/soc/codecs/wm8728.c | 2 +- sound/soc/codecs/wm8731.c | 8 +- sound/soc/codecs/wm8737.c | 3 +- sound/soc/codecs/wm8741.c | 3 +- sound/soc/codecs/wm8750.c | 3 +- sound/soc/codecs/wm8753.c | 29 +- sound/soc/codecs/wm8770.c | 3 +- sound/soc/codecs/wm8776.c | 19 +- sound/soc/codecs/wm8782.c | 12 +- sound/soc/codecs/wm8804.c | 2 +- sound/soc/codecs/wm8900.c | 5 +- sound/soc/codecs/wm8903.c | 7 +- sound/soc/codecs/wm8904.c | 5 +- sound/soc/codecs/wm8940.c | 7 +- sound/soc/codecs/wm8955.c | 3 +- sound/soc/codecs/wm8958-dsp2.c | 3 +- sound/soc/codecs/wm8960.c | 5 +- sound/soc/codecs/wm8961.c | 5 +- sound/soc/codecs/wm8962.c | 1625 ++++++------ sound/soc/codecs/wm8971.c | 5 +- sound/soc/codecs/wm8974.c | 5 +- sound/soc/codecs/wm8978.c | 3 +- sound/soc/codecs/wm8983.c | 5 +- sound/soc/codecs/wm8985.c | 5 +- sound/soc/codecs/wm8988.c | 5 +- sound/soc/codecs/wm8990.c | 7 +- sound/soc/codecs/wm8991.c | 7 +- sound/soc/codecs/wm8993.c | 2 +- sound/soc/codecs/wm8994.c | 26 +- sound/soc/codecs/wm8995.c | 729 ++++- sound/soc/codecs/wm8996.c | 919 ++++--- sound/soc/codecs/wm9081.c | 367 ++- sound/soc/codecs/wm9705.c | 14 +- sound/soc/codecs/wm9712.c | 16 +- sound/soc/codecs/wm9713.c | 18 +- sound/soc/codecs/wm_hubs.c | 4 +- sound/soc/davinci/davinci-i2s.c | 14 +- sound/soc/davinci/davinci-mcasp.c | 14 +- sound/soc/davinci/davinci-pcm.c | 12 +- sound/soc/davinci/davinci-vcif.c | 14 +- sound/soc/ep93xx/edb93xx.c | 12 +- sound/soc/ep93xx/ep93xx-ac97.c | 14 +- sound/soc/ep93xx/ep93xx-i2s.c | 15 +- sound/soc/ep93xx/ep93xx-pcm.c | 13 +- sound/soc/ep93xx/simone.c | 12 +- sound/soc/ep93xx/snappercl15.c | 13 +- sound/soc/fsl/fsl_dma.c | 15 +- sound/soc/fsl/fsl_ssi.c | 17 +- sound/soc/fsl/mpc5200_dma.c | 12 +- sound/soc/fsl/mpc5200_psc_ac97.c | 20 +- sound/soc/fsl/mpc5200_psc_i2s.c | 18 +- sound/soc/fsl/mpc8610_hpcd.c | 24 +- sound/soc/imx/imx-pcm-dma-mx2.c | 12 +- sound/soc/imx/imx-pcm-fiq.c | 12 +- sound/soc/imx/imx-ssi.c | 15 +- sound/soc/jz4740/jz4740-i2s.c | 14 +- sound/soc/jz4740/jz4740-pcm.c | 12 +- sound/soc/kirkwood/kirkwood-dma.c | 12 +- sound/soc/kirkwood/kirkwood-i2s.c | 14 +- sound/soc/mid-x86/mfld_machine.c | 14 +- sound/soc/mid-x86/sst_platform.c | 14 +- sound/soc/mxs/mxs-pcm.c | 12 +- sound/soc/mxs/mxs-saif.c | 14 +- sound/soc/mxs/mxs-sgtl5000.c | 12 +- sound/soc/nuc900/nuc900-ac97.c | 15 +- sound/soc/nuc900/nuc900-pcm.c | 12 +- sound/soc/omap/Kconfig | 5 + sound/soc/omap/Makefile | 2 + sound/soc/omap/ams-delta.c | 2 +- sound/soc/omap/omap-dmic.c | 549 ++++ sound/soc/omap/omap-dmic.h | 69 + sound/soc/omap/omap-hdmi.c | 14 +- sound/soc/omap/omap-mcbsp.c | 14 +- sound/soc/omap/omap-mcpdm.c | 14 +- sound/soc/omap/omap-pcm.c | 12 +- sound/soc/omap/omap4-hdmi-card.c | 12 +- sound/soc/omap/sdp4430.c | 85 +- sound/soc/pxa/hx4700.c | 13 +- sound/soc/pxa/mioa701_wm9713.c | 13 +- sound/soc/pxa/palm27x.c | 13 +- sound/soc/pxa/pxa-ssp.c | 14 +- sound/soc/pxa/pxa2xx-ac97.c | 18 +- sound/soc/pxa/pxa2xx-i2s.c | 2 +- sound/soc/pxa/pxa2xx-pcm.c | 12 +- sound/soc/s6000/s6000-i2s.c | 14 +- sound/soc/s6000/s6000-pcm.c | 12 +- sound/soc/samsung/Kconfig | 13 + sound/soc/samsung/Makefile | 4 + sound/soc/samsung/ac97.c | 16 +- sound/soc/samsung/dma.c | 12 +- sound/soc/samsung/i2s.c | 14 +- sound/soc/samsung/idma.c | 12 +- sound/soc/samsung/littlemill.c | 227 ++ sound/soc/samsung/lowland.c | 236 ++ sound/soc/samsung/pcm.c | 14 +- sound/soc/samsung/s3c2412-i2s.c | 14 +- sound/soc/samsung/s3c24xx-i2s.c | 14 +- sound/soc/samsung/s3c24xx_simtec_hermes.c | 16 +- sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 16 +- sound/soc/samsung/s3c24xx_uda134x.c | 14 +- sound/soc/samsung/smdk_wm8580pcm.c | 14 +- sound/soc/samsung/smdk_wm8994.c | 1 + sound/soc/samsung/spdif.c | 14 +- sound/soc/samsung/speyside.c | 17 +- sound/soc/samsung/speyside_wm8962.c | 13 +- sound/soc/sh/dma-sh7760.c | 12 +- sound/soc/sh/fsi-ak4642.c | 127 +- sound/soc/sh/fsi-hdmi.c | 13 +- sound/soc/sh/fsi.c | 36 +- sound/soc/sh/hac.c | 14 +- sound/soc/sh/siu_dai.c | 15 +- sound/soc/sh/ssi.c | 14 +- sound/soc/soc-cache.c | 384 --- sound/soc/soc-core.c | 12 +- sound/soc/soc-dapm.c | 73 + sound/soc/soc-pcm.c | 3 +- sound/soc/tegra/tegra_das.c | 53 +- sound/soc/tegra/tegra_i2s.c | 137 +- sound/soc/tegra/tegra_i2s.h | 1 + sound/soc/tegra/tegra_pcm.c | 13 +- sound/soc/tegra/tegra_spdif.c | 14 +- sound/soc/tegra/tegra_wm8903.c | 79 +- sound/soc/tegra/trimslice.c | 45 +- sound/soc/txx9/txx9aclc-ac97.c | 13 +- sound/soc/txx9/txx9aclc.c | 12 +- sound/sparc/cs4231.c | 13 +- sound/sparc/dbri.c | 14 +- 244 files changed, 8937 insertions(+), 9663 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/tegra20-das.txt create mode 100644 include/sound/sta32x.h delete mode 100644 sound/pci/hda/alc262_quirks.c delete mode 100644 sound/soc/atmel/playpaq_wm8510.c create mode 100644 sound/soc/codecs/alc5632.c create mode 100644 sound/soc/codecs/alc5632.h create mode 100644 sound/soc/codecs/cs42l73.c create mode 100644 sound/soc/codecs/cs42l73.h create mode 100644 sound/soc/omap/omap-dmic.c create mode 100644 sound/soc/omap/omap-dmic.h create mode 100644 sound/soc/samsung/littlemill.c create mode 100644 sound/soc/samsung/lowland.c Merging sound-asoc/for-next (a169134 ASoC: Provide debug log of accessory status on WM8958) $ git merge sound-asoc/for-next Auto-merging sound/soc/samsung/tobermory.c Auto-merging sound/soc/codecs/sigmadsp.c Removing include/linux/sigma.h Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/sound/tegra20-i2s.txt | 17 ++ MAINTAINERS | 1 + arch/arm/mach-s3c64xx/mach-crag6410.c | 6 +- drivers/firmware/Kconfig | 12 -- drivers/firmware/Makefile | 1 - include/linux/sigma.h | 55 ------- sound/soc/codecs/Kconfig | 6 +- sound/soc/codecs/Makefile | 2 + sound/soc/codecs/adau1701.c | 2 +- sound/soc/codecs/cs42l73.c | 3 +- .../sigma.c => sound/soc/codecs/sigmadsp.c | 121 +++++++++++++-- sound/soc/codecs/sigmadsp.h | 21 +++ sound/soc/codecs/wm8994.c | 165 ++++++++++++++++++-- sound/soc/codecs/wm8994.h | 2 + sound/soc/samsung/Kconfig | 4 +- sound/soc/samsung/Makefile | 4 +- sound/soc/samsung/i2s.c | 2 +- sound/soc/samsung/idma.c | 2 +- sound/soc/samsung/idma.h | 2 +- sound/soc/samsung/smdk_wm8994pcm.c | 14 +-- .../soc/samsung/{speyside_wm8962.c => tobermory.c} | 66 ++++---- sound/soc/tegra/tegra_i2s.c | 27 +++- 22 files changed, 377 insertions(+), 158 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/tegra20-i2s.txt delete mode 100644 include/linux/sigma.h rename drivers/firmware/sigma.c => sound/soc/codecs/sigmadsp.c (53%) create mode 100644 sound/soc/codecs/sigmadsp.h rename sound/soc/samsung/{speyside_wm8962.c => tobermory.c} (72%) Merging cpufreq/next (5aace58 [CPUFREQ] ARM Exynos4210 PM/Suspend compatibility with different bootloaders) $ git merge cpufreq/next Merge made by the 'recursive' strategy. Merging quilt/rr (78173d1 lguest: switch segment-voodoo-numbers to readable symbols) $ git merge quilt/rr Auto-merging drivers/net/virtio_net.c Merge made by the 'recursive' strategy. drivers/block/virtio_blk.c | 2 +- drivers/char/hw_random/virtio-rng.c | 2 +- drivers/char/virtio_console.c | 6 +- drivers/lguest/segments.c | 28 +++-- drivers/net/virtio_net.c | 12 +- drivers/virtio/virtio_balloon.c | 13 +- drivers/virtio/virtio_ring.c | 213 +++++++++++++++++++++++++++++++---- include/linux/virtio.h | 70 ++---------- kernel/module.c | 58 ++++------ net/9p/trans_virtio.c | 6 +- tools/virtio/linux/virtio.h | 21 +--- tools/virtio/virtio_test.c | 3 +- 12 files changed, 268 insertions(+), 166 deletions(-) Merging input/next (a6c6178 Input: remove redundant spi driver bus initialization) $ git merge input/next Resolved 'drivers/input/keyboard/samsung-keypad.c' using previous resolution. Auto-merging drivers/input/keyboard/samsung-keypad.c CONFLICT (content): Merge conflict in drivers/input/keyboard/samsung-keypad.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 881159d] Merge remote-tracking branch 'input/next' $ git diff -M --stat --summary HEAD^.. Documentation/input/alps.txt | 188 +++++ arch/arm/plat-samsung/include/plat/keypad.h | 27 +- drivers/input/input-polldev.c | 8 +- drivers/input/keyboard/Kconfig | 21 +- drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/atkbd.c | 40 +- drivers/input/keyboard/lm8323.c | 11 +- drivers/input/keyboard/samsung-keypad.c | 15 +- drivers/input/keyboard/tca8418_keypad.c | 430 +++++++++++ drivers/input/misc/adxl34x-spi.c | 1 - drivers/input/misc/adxl34x.c | 16 +- drivers/input/misc/ati_remote2.c | 19 +- drivers/input/mouse/alps.c | 1036 ++++++++++++++++++++++++--- drivers/input/mouse/alps.h | 19 + drivers/input/mouse/elantech.c | 80 ++- drivers/input/mouse/elantech.h | 2 + drivers/input/mouse/hgpk.c | 18 +- drivers/input/mouse/logips2pp.c | 9 +- drivers/input/mouse/psmouse-base.c | 36 +- drivers/input/mouse/psmouse.h | 3 + drivers/input/mouse/sentelic.c | 43 +- drivers/input/mouse/synaptics.c | 197 ++++-- drivers/input/mouse/synaptics.h | 5 + drivers/input/mouse/trackpoint.c | 17 +- drivers/input/serio/i8042.c | 23 +- drivers/input/tablet/aiptek.c | 34 +- drivers/input/tablet/wacom_sys.c | 96 +++- drivers/input/tablet/wacom_wac.c | 110 +++- drivers/input/tablet/wacom_wac.h | 4 +- drivers/input/touchscreen/Kconfig | 16 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/ad7877.c | 17 +- drivers/input/touchscreen/ad7879-i2c.c | 27 +- drivers/input/touchscreen/ad7879-spi.c | 27 +- drivers/input/touchscreen/ad7879.c | 23 +- drivers/input/touchscreen/ad7879.h | 4 +- drivers/input/touchscreen/ads7846.c | 9 +- drivers/input/touchscreen/egalax_ts.c | 303 ++++++++ drivers/input/touchscreen/usbtouchscreen.c | 36 + include/linux/input/samsung-keypad.h | 43 ++ include/linux/input/tca8418_keypad.h | 44 ++ 41 files changed, 2683 insertions(+), 376 deletions(-) create mode 100644 Documentation/input/alps.txt create mode 100644 drivers/input/keyboard/tca8418_keypad.c create mode 100644 drivers/input/touchscreen/egalax_ts.c create mode 100644 include/linux/input/samsung-keypad.h create mode 100644 include/linux/input/tca8418_keypad.h Merging input-mt/next (02f8c6a Linux 3.0) $ git merge input-mt/next Already up-to-date. Merging lsm/for-next (ca05a99 capabilities: remain source compatible with 32-bit raw legacy capability support.) $ git merge lsm/for-next Already up-to-date. Merging block/for-next (5dc34f4 Merge branch 'for-3.3/mtip32xx' into for-next) $ git merge block/for-next Merge made by the 'recursive' strategy. drivers/block/Kconfig | 2 + drivers/block/Makefile | 1 + drivers/block/mtip32xx/Kconfig | 9 + drivers/block/mtip32xx/Makefile | 5 + drivers/block/mtip32xx/mtip32xx.c | 3627 +++++++++++++++++++++++++++++++++++++ drivers/block/mtip32xx/mtip32xx.h | 422 +++++ 6 files changed, 4066 insertions(+), 0 deletions(-) create mode 100644 drivers/block/mtip32xx/Kconfig create mode 100644 drivers/block/mtip32xx/Makefile create mode 100644 drivers/block/mtip32xx/mtip32xx.c create mode 100644 drivers/block/mtip32xx/mtip32xx.h Merging quilt/device-mapper (94956ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge quilt/device-mapper Already up-to-date. Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) $ git merge embedded/master Already up-to-date. Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) $ git merge firmware/master Already up-to-date. Merging pcmcia/master (74411c0 smc91c92_cs.c: fix bogus compiler warning) $ git merge pcmcia/master Already up-to-date. Merging battery/master (00a159a max8925_power: Check at probe time if power to set online) $ git merge battery/master Auto-merging drivers/power/power_supply_sysfs.c Auto-merging drivers/power/max8998_charger.c Auto-merging drivers/power/max8997_charger.c Auto-merging drivers/power/max8903_charger.c Auto-merging drivers/power/max17042_battery.c Auto-merging drivers/power/ds2780_battery.c Merge made by the 'recursive' strategy. .../bindings/power_supply/olpc_battery.txt | 5 + .../bindings/power_supply/ti_bq20z75.txt | 23 +++ drivers/mfd/max8925-core.c | 15 -- drivers/power/bq20z75.c | 77 +++++++ drivers/power/bq27x00_battery.c | 210 +++++++++++++------- drivers/power/collie_battery.c | 53 ++---- drivers/power/ds2760_battery.c | 6 +- drivers/power/ds2780_battery.c | 2 +- drivers/power/intel_mid_battery.c | 12 +- drivers/power/max17042_battery.c | 94 ++++++--- drivers/power/max8903_charger.c | 2 +- drivers/power/max8925_power.c | 63 ++++--- drivers/power/max8997_charger.c | 3 +- drivers/power/max8998_charger.c | 2 + drivers/power/olpc_battery.c | 81 +++++--- drivers/power/pda_power.c | 74 ++++++- drivers/power/power_supply_sysfs.c | 4 +- drivers/power/tosa_battery.c | 66 ++----- drivers/power/wm831x_power.c | 44 +++-- drivers/power/wm97xx_battery.c | 2 +- drivers/power/z2_battery.c | 4 +- include/linux/mfd/max8925.h | 7 +- include/linux/pda_power.h | 2 + 23 files changed, 548 insertions(+), 303 deletions(-) create mode 100644 Documentation/devicetree/bindings/power_supply/olpc_battery.txt create mode 100644 Documentation/devicetree/bindings/power_supply/ti_bq20z75.txt Merging mmc/mmc-next (ce8fda6 mmc: core: Fix typo at mmc_card_sleep) $ git merge mmc/mmc-next Auto-merging drivers/mmc/host/sdhci-tegra.c Auto-merging drivers/mmc/host/sdhci-s3c.c Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c Auto-merging drivers/mmc/host/omap_hsmmc.c Auto-merging drivers/mmc/host/mxcmmc.c Auto-merging drivers/mmc/core/sdio_io.c Auto-merging drivers/mmc/core/sd.c Auto-merging drivers/mmc/core/mmc.c Auto-merging drivers/mmc/core/host.c Auto-merging drivers/mmc/core/debugfs.c Auto-merging drivers/mmc/core/bus.c Merge made by the 'recursive' strategy. Documentation/mmc/mmc-dev-attrs.txt | 10 + drivers/mmc/card/block.c | 33 +++- drivers/mmc/core/bus.c | 2 +- drivers/mmc/core/core.c | 95 +++++++---- drivers/mmc/core/debugfs.c | 2 + drivers/mmc/core/host.c | 57 ++++++- drivers/mmc/core/mmc.c | 12 +- drivers/mmc/core/sd.c | 6 +- drivers/mmc/core/sdio.c | 329 ++++++++++++++++++++++++++++++++--- drivers/mmc/core/sdio_io.c | 8 +- drivers/mmc/core/sdio_ops.c | 14 +- drivers/mmc/host/mxcmmc.c | 1 + drivers/mmc/host/omap_hsmmc.c | 7 +- drivers/mmc/host/sdhci-cns3xxx.c | 6 +- drivers/mmc/host/sdhci-dove.c | 5 +- drivers/mmc/host/sdhci-esdhc-imx.c | 5 +- drivers/mmc/host/sdhci-of-esdhc.c | 5 +- drivers/mmc/host/sdhci-of-hlwd.c | 5 +- drivers/mmc/host/sdhci-pci.c | 26 ++-- drivers/mmc/host/sdhci-pltfm.c | 18 ++- drivers/mmc/host/sdhci-pltfm.h | 6 +- drivers/mmc/host/sdhci-pxav2.c | 5 +- drivers/mmc/host/sdhci-pxav3.c | 5 +- drivers/mmc/host/sdhci-s3c.c | 21 ++- drivers/mmc/host/sdhci-spear.c | 40 +++++ drivers/mmc/host/sdhci-tegra.c | 5 +- drivers/mmc/host/sdhci.c | 12 ++- drivers/mmc/host/sdhci.h | 2 +- include/linux/mmc/card.h | 13 ++- include/linux/mmc/host.h | 6 +- include/linux/mmc/sdio.h | 29 +++- 31 files changed, 632 insertions(+), 158 deletions(-) Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack()) $ git merge kgdb/kgdb-next Merge made by the 'recursive' strategy. Merging slab/for-next (7436099 Merge branch 'slab/next' into for-next) $ git merge slab/for-next Merge made by the 'recursive' strategy. Documentation/kernel-parameters.txt | 6 ++++ Documentation/vm/slub.txt | 2 +- mm/slab.c | 39 ++++++++++++++++++-------- mm/slub.c | 51 ++++++++++++++++++++++------------- 4 files changed, 66 insertions(+), 32 deletions(-) Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**") $ git merge uclinux/for-next Already up-to-date. Merging md/for-next (c7eefaf md/raid1: Mark device replaceable when we see a write error.) $ git merge md/for-next Merge made by the 'recursive' strategy. Documentation/md.txt | 22 ++- drivers/md/md.c | 123 ++++++++--- drivers/md/md.h | 82 ++++--- drivers/md/multipath.c | 7 +- drivers/md/raid1.c | 168 ++++++++++---- drivers/md/raid1.h | 7 +- drivers/md/raid10.c | 572 ++++++++++++++++++++++++++++++++++++--------- drivers/md/raid10.h | 61 +++-- drivers/md/raid5.c | 493 ++++++++++++++++++++++++++++++--------- drivers/md/raid5.h | 98 +++++---- include/linux/raid/md_p.h | 7 +- 11 files changed, 1239 insertions(+), 401 deletions(-) Merging mfd/for-next (b958f7a mfd: Fix missing abx500 header file updates) $ git merge mfd/for-next Already up-to-date. Merging hdlc/hdlc-next (4a6908a Linux 2.6.28) $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next (248dbc2 drm: move the fb bpp/depth helper into the core.) $ git merge drm/drm-next Auto-merging include/drm/drm_mode.h Auto-merging include/drm/drmP.h Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_kms.c Auto-merging drivers/gpu/drm/radeon/radeon_drv.c Auto-merging drivers/gpu/drm/nouveau/nouveau_fbcon.c Auto-merging drivers/gpu/drm/i915/intel_display.c Auto-merging drivers/gpu/drm/i915/i915_drv.c Auto-merging drivers/gpu/drm/drm_drv.c Auto-merging drivers/gpu/drm/drm_crtc_helper.c Auto-merging drivers/gpu/drm/drm_crtc.c Auto-merging drivers/gpu/drm/Kconfig Merge made by the 'recursive' strategy. drivers/gpu/drm/Kconfig | 3 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/drm_crtc.c | 401 +++++++- drivers/gpu/drm/drm_crtc_helper.c | 10 +- drivers/gpu/drm/drm_drv.c | 4 + drivers/gpu/drm/drm_fb_helper.c | 7 + drivers/gpu/drm/drm_fops.c | 2 +- drivers/gpu/drm/gma500/Kconfig | 26 + drivers/gpu/drm/gma500/Makefile | 39 + drivers/gpu/drm/gma500/accel_2d.c | 362 ++++++ drivers/gpu/drm/gma500/backlight.c | 49 + drivers/gpu/drm/gma500/cdv_device.c | 351 ++++++ drivers/gpu/drm/gma500/cdv_device.h | 36 + drivers/gpu/drm/gma500/cdv_intel_crt.c | 326 ++++++ drivers/gpu/drm/gma500/cdv_intel_display.c | 1508 ++++++++++++++++++++++++++ drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 376 +++++++ drivers/gpu/drm/gma500/cdv_intel_lvds.c | 721 ++++++++++++ drivers/gpu/drm/gma500/framebuffer.c | 791 ++++++++++++++ drivers/gpu/drm/gma500/framebuffer.h | 48 + drivers/gpu/drm/gma500/gem.c | 295 +++++ drivers/gpu/drm/gma500/gem_glue.c | 89 ++ drivers/gpu/drm/gma500/gem_glue.h | 2 + drivers/gpu/drm/gma500/gtt.c | 500 +++++++++ drivers/gpu/drm/gma500/gtt.h | 61 + drivers/gpu/drm/gma500/intel_bios.c | 303 ++++++ drivers/gpu/drm/gma500/intel_bios.h | 430 ++++++++ drivers/gpu/drm/gma500/intel_i2c.c | 169 +++ drivers/gpu/drm/gma500/intel_opregion.c | 80 ++ drivers/gpu/drm/gma500/mid_bios.c | 243 +++++ drivers/gpu/drm/gma500/mid_bios.h | 21 + drivers/gpu/drm/gma500/mmu.c | 858 +++++++++++++++ drivers/gpu/drm/gma500/oaktrail.h | 252 +++++ drivers/gpu/drm/gma500/oaktrail_crtc.c | 610 +++++++++++ drivers/gpu/drm/gma500/oaktrail_device.c | 489 +++++++++ drivers/gpu/drm/gma500/oaktrail_hdmi.c | 852 +++++++++++++++ drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c | 328 ++++++ drivers/gpu/drm/gma500/oaktrail_lvds.c | 406 +++++++ drivers/gpu/drm/gma500/power.c | 316 ++++++ drivers/gpu/drm/gma500/power.h | 67 ++ drivers/gpu/drm/gma500/psb_device.c | 353 ++++++ drivers/gpu/drm/gma500/psb_drm.h | 207 ++++ drivers/gpu/drm/gma500/psb_drv.c | 1212 +++++++++++++++++++++ drivers/gpu/drm/gma500/psb_drv.h | 924 ++++++++++++++++ drivers/gpu/drm/gma500/psb_intel_display.c | 1431 ++++++++++++++++++++++++ drivers/gpu/drm/gma500/psb_intel_display.h | 28 + drivers/gpu/drm/gma500/psb_intel_drv.h | 228 ++++ drivers/gpu/drm/gma500/psb_intel_lvds.c | 849 +++++++++++++++ drivers/gpu/drm/gma500/psb_intel_modes.c | 77 ++ drivers/gpu/drm/gma500/psb_intel_reg.h | 1235 +++++++++++++++++++++ drivers/gpu/drm/gma500/psb_intel_sdvo.c | 1293 ++++++++++++++++++++++ drivers/gpu/drm/gma500/psb_intel_sdvo_regs.h | 338 ++++++ drivers/gpu/drm/gma500/psb_irq.c | 553 ++++++++++ drivers/gpu/drm/gma500/psb_irq.h | 45 + drivers/gpu/drm/gma500/psb_lid.c | 90 ++ drivers/gpu/drm/gma500/psb_reg.h | 582 ++++++++++ drivers/gpu/drm/i810/i810_drv.c | 23 +- drivers/gpu/drm/i915/i915_drv.c | 31 +- drivers/gpu/drm/i915/intel_display.c | 39 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_fb.c | 11 +- drivers/gpu/drm/mga/mga_drv.c | 29 +- drivers/gpu/drm/nouveau/nouveau_display.c | 6 +- drivers/gpu/drm/nouveau/nouveau_drv.c | 31 +- drivers/gpu/drm/nouveau/nouveau_fb.h | 2 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 13 +- drivers/gpu/drm/r128/r128_drv.c | 30 +- drivers/gpu/drm/radeon/radeon_display.c | 8 +- drivers/gpu/drm/radeon/radeon_drv.c | 60 +- drivers/gpu/drm/radeon/radeon_fb.c | 20 +- drivers/gpu/drm/radeon/radeon_mode.h | 2 +- drivers/gpu/drm/savage/savage_drv.c | 23 +- drivers/gpu/drm/sis/sis_drv.c | 23 +- drivers/gpu/drm/tdfx/tdfx_drv.c | 23 +- drivers/gpu/drm/via/via_drv.c | 23 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 30 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 22 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 1 + drivers/staging/gma500/framebuffer.c | 39 +- drivers/staging/gma500/psb_drv.c | 23 +- include/drm/drm.h | 4 + include/drm/drmP.h | 2 +- include/drm/drm_crtc.h | 87 ++- include/drm/drm_crtc_helper.h | 2 +- include/drm/drm_fourcc.h | 63 ++ include/drm/drm_mode.h | 74 ++- 85 files changed, 21367 insertions(+), 256 deletions(-) create mode 100644 drivers/gpu/drm/gma500/Kconfig create mode 100644 drivers/gpu/drm/gma500/Makefile create mode 100644 drivers/gpu/drm/gma500/accel_2d.c create mode 100644 drivers/gpu/drm/gma500/backlight.c create mode 100644 drivers/gpu/drm/gma500/cdv_device.c create mode 100644 drivers/gpu/drm/gma500/cdv_device.h create mode 100644 drivers/gpu/drm/gma500/cdv_intel_crt.c create mode 100644 drivers/gpu/drm/gma500/cdv_intel_display.c create mode 100644 drivers/gpu/drm/gma500/cdv_intel_hdmi.c create mode 100644 drivers/gpu/drm/gma500/cdv_intel_lvds.c create mode 100644 drivers/gpu/drm/gma500/framebuffer.c create mode 100644 drivers/gpu/drm/gma500/framebuffer.h create mode 100644 drivers/gpu/drm/gma500/gem.c create mode 100644 drivers/gpu/drm/gma500/gem_glue.c create mode 100644 drivers/gpu/drm/gma500/gem_glue.h create mode 100644 drivers/gpu/drm/gma500/gtt.c create mode 100644 drivers/gpu/drm/gma500/gtt.h create mode 100644 drivers/gpu/drm/gma500/intel_bios.c create mode 100644 drivers/gpu/drm/gma500/intel_bios.h create mode 100644 drivers/gpu/drm/gma500/intel_i2c.c create mode 100644 drivers/gpu/drm/gma500/intel_opregion.c create mode 100644 drivers/gpu/drm/gma500/mid_bios.c create mode 100644 drivers/gpu/drm/gma500/mid_bios.h create mode 100644 drivers/gpu/drm/gma500/mmu.c create mode 100644 drivers/gpu/drm/gma500/oaktrail.h create mode 100644 drivers/gpu/drm/gma500/oaktrail_crtc.c create mode 100644 drivers/gpu/drm/gma500/oaktrail_device.c create mode 100644 drivers/gpu/drm/gma500/oaktrail_hdmi.c create mode 100644 drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c create mode 100644 drivers/gpu/drm/gma500/oaktrail_lvds.c create mode 100644 drivers/gpu/drm/gma500/power.c create mode 100644 drivers/gpu/drm/gma500/power.h create mode 100644 drivers/gpu/drm/gma500/psb_device.c create mode 100644 drivers/gpu/drm/gma500/psb_drm.h create mode 100644 drivers/gpu/drm/gma500/psb_drv.c create mode 100644 drivers/gpu/drm/gma500/psb_drv.h create mode 100644 drivers/gpu/drm/gma500/psb_intel_display.c create mode 100644 drivers/gpu/drm/gma500/psb_intel_display.h create mode 100644 drivers/gpu/drm/gma500/psb_intel_drv.h create mode 100644 drivers/gpu/drm/gma500/psb_intel_lvds.c create mode 100644 drivers/gpu/drm/gma500/psb_intel_modes.c create mode 100644 drivers/gpu/drm/gma500/psb_intel_reg.h create mode 100644 drivers/gpu/drm/gma500/psb_intel_sdvo.c create mode 100644 drivers/gpu/drm/gma500/psb_intel_sdvo_regs.h create mode 100644 drivers/gpu/drm/gma500/psb_irq.c create mode 100644 drivers/gpu/drm/gma500/psb_irq.h create mode 100644 drivers/gpu/drm/gma500/psb_lid.c create mode 100644 drivers/gpu/drm/gma500/psb_reg.h create mode 100644 include/drm/drm_fourcc.h Merging fbdev/fbdev-next (64cebcb Merge branch 'fbdev-for-linus' into fbdev-next) $ git merge fbdev/fbdev-next Removing include/linux/display.h Removing drivers/video/display/display-sysfs.c Removing drivers/video/display/Makefile Removing drivers/video/display/Kconfig Auto-merging drivers/video/Kconfig Auto-merging arch/arm/mach-shmobile/board-ap4evb.c Auto-merging arch/arm/mach-shmobile/board-ag5evm.c Auto-merging arch/arm/mach-at91/board-sam9rlek.c Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c Auto-merging arch/arm/mach-at91/board-sam9263ek.c Auto-merging arch/arm/mach-at91/board-sam9261ek.c Auto-merging arch/arm/mach-at91/board-neocore926.c Auto-merging arch/arm/mach-at91/board-cap9adk.c Merge made by the 'recursive' strategy. arch/arm/mach-at91/board-cap9adk.c | 2 +- arch/arm/mach-at91/board-neocore926.c | 2 +- arch/arm/mach-at91/board-sam9261ek.c | 4 +- arch/arm/mach-at91/board-sam9263ek.c | 2 +- arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +- arch/arm/mach-at91/board-sam9rlek.c | 2 +- arch/arm/mach-shmobile/board-ag5evm.c | 41 ++++- arch/arm/mach-shmobile/board-ap4evb.c | 28 ++++ arch/arm/mach-shmobile/clock-sh7372.c | 4 +- arch/arm/mach-shmobile/clock-sh73a0.c | 4 +- drivers/video/Kconfig | 1 - drivers/video/Makefile | 2 +- drivers/video/atmel_lcdfb.c | 41 ++++-- drivers/video/cirrusfb.c | 268 +++++++++++++++++-------------- drivers/video/controlfb.c | 2 +- drivers/video/display/Kconfig | 24 --- drivers/video/display/Makefile | 6 - drivers/video/display/display-sysfs.c | 219 ------------------------- drivers/video/s3c-fb.c | 3 +- drivers/video/sbuslib.c | 2 +- drivers/video/sh_mipi_dsi.c | 218 +++++++++++++++---------- drivers/video/sh_mobile_lcdcfb.c | 2 +- include/linux/display.h | 61 ------- include/linux/zorro_ids.h | 4 +- include/video/sh_mipi_dsi.h | 21 +++- 25 files changed, 407 insertions(+), 558 deletions(-) delete mode 100644 drivers/video/display/Kconfig delete mode 100644 drivers/video/display/Makefile delete mode 100644 drivers/video/display/display-sysfs.c delete mode 100644 include/linux/display.h Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value) $ git merge viafb/viafb-next Already up-to-date. Merging omap_dss2/for-next (3e28189 OMAPDSS: picodlp: add missing #include ) $ git merge omap_dss2/for-next Already up-to-date. Merging regulator/for-next (eb29674 regulator: Allow regulators to register with no init_data) $ git merge regulator/for-next Auto-merging sound/soc/codecs/sgtl5000.c Merge made by the 'recursive' strategy. .../bindings/regulator/fixed-regulator.txt | 29 ++++ .../devicetree/bindings/regulator/regulator.txt | 54 +++++++ drivers/regulator/88pm8607.c | 2 +- drivers/regulator/Kconfig | 1 + drivers/regulator/Makefile | 1 + drivers/regulator/aat2870-regulator.c | 6 +- drivers/regulator/ab3100.c | 2 +- drivers/regulator/ab8500.c | 2 +- drivers/regulator/ad5398.c | 2 +- drivers/regulator/bq24022.c | 2 +- drivers/regulator/core.c | 128 ++++++++++++---- drivers/regulator/da903x.c | 2 +- drivers/regulator/db8500-prcmu.c | 2 +- drivers/regulator/dummy.c | 2 +- drivers/regulator/fixed.c | 83 ++++++++++- drivers/regulator/gpio-regulator.c | 2 +- drivers/regulator/isl6271a-regulator.c | 2 +- drivers/regulator/lp3971.c | 2 +- drivers/regulator/lp3972.c | 2 +- drivers/regulator/max1586.c | 2 +- drivers/regulator/max8649.c | 157 +++++++------------- drivers/regulator/max8660.c | 2 +- drivers/regulator/max8925-regulator.c | 2 +- drivers/regulator/max8952.c | 2 +- drivers/regulator/max8997.c | 2 +- drivers/regulator/max8998.c | 2 +- drivers/regulator/mc13783-regulator.c | 2 +- drivers/regulator/mc13892-regulator.c | 2 +- drivers/regulator/of_regulator.c | 83 ++++++++++ drivers/regulator/pcap-regulator.c | 2 +- drivers/regulator/pcf50633-regulator.c | 2 +- drivers/regulator/tps6105x-regulator.c | 3 +- drivers/regulator/tps65023-regulator.c | 89 ++++------- drivers/regulator/tps6507x-regulator.c | 2 +- drivers/regulator/tps6524x-regulator.c | 2 +- drivers/regulator/tps6586x-regulator.c | 2 +- drivers/regulator/tps65910-regulator.c | 39 ++---- drivers/regulator/tps65912-regulator.c | 2 +- drivers/regulator/twl-regulator.c | 48 ++++++- drivers/regulator/userspace-consumer.c | 13 +-- drivers/regulator/virtual.c | 12 +-- drivers/regulator/wm831x-dcdc.c | 8 +- drivers/regulator/wm831x-isink.c | 2 +- drivers/regulator/wm831x-ldo.c | 6 +- drivers/regulator/wm8350-regulator.c | 2 +- drivers/regulator/wm8400-regulator.c | 2 +- drivers/regulator/wm8994-regulator.c | 2 +- include/linux/mfd/tps65910.h | 30 ++++- include/linux/regulator/driver.h | 4 +- include/linux/regulator/of_regulator.h | 20 +++ sound/soc/codecs/sgtl5000.c | 2 +- 51 files changed, 586 insertions(+), 290 deletions(-) create mode 100644 Documentation/devicetree/bindings/regulator/fixed-regulator.txt create mode 100644 Documentation/devicetree/bindings/regulator/regulator.txt create mode 100644 drivers/regulator/of_regulator.c create mode 100644 include/linux/regulator/of_regulator.h Merging security/next (de35353 digsig: build dependency fix) $ git merge security/next Resolved 'lib/Makefile' using previous resolution. Auto-merging lib/Makefile CONFLICT (content): Merge conflict in lib/Makefile Auto-merging lib/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 1cea752] Merge remote-tracking branch 'security/next' $ git diff -M --stat --summary HEAD^.. Documentation/digsig.txt | 96 ++ Documentation/security/00-INDEX | 2 + Documentation/security/LSM.txt | 34 + Documentation/security/credentials.txt | 6 +- drivers/char/tpm/Kconfig | 2 + drivers/char/tpm/tpm.c | 137 +++- drivers/char/tpm/tpm.h | 9 +- drivers/char/tpm/tpm_tis.c | 84 +-- include/linux/digsig.h | 64 ++ include/linux/key-type.h | 1 + include/linux/mpi.h | 146 ++++ include/linux/security.h | 2 +- lib/Kconfig | 25 + lib/Makefile | 3 + lib/digsig.c | 284 ++++++ lib/mpi/Makefile | 32 + lib/mpi/generic_mpi-asm-defs.h | 4 + lib/mpi/generic_mpih-add1.c | 61 ++ lib/mpi/generic_mpih-lshift.c | 63 ++ lib/mpi/generic_mpih-mul1.c | 57 ++ lib/mpi/generic_mpih-mul2.c | 60 ++ lib/mpi/generic_mpih-mul3.c | 61 ++ lib/mpi/generic_mpih-rshift.c | 63 ++ lib/mpi/generic_mpih-sub1.c | 60 ++ lib/mpi/longlong.h | 1478 ++++++++++++++++++++++++++++++++ lib/mpi/mpi-add.c | 234 +++++ lib/mpi/mpi-bit.c | 236 +++++ lib/mpi/mpi-cmp.c | 68 ++ lib/mpi/mpi-div.c | 333 +++++++ lib/mpi/mpi-gcd.c | 59 ++ lib/mpi/mpi-inline.c | 31 + lib/mpi/mpi-inline.h | 122 +++ lib/mpi/mpi-internal.h | 261 ++++++ lib/mpi/mpi-inv.c | 187 ++++ lib/mpi/mpi-mpow.c | 133 +++ lib/mpi/mpi-mul.c | 194 +++++ lib/mpi/mpi-pow.c | 323 +++++++ lib/mpi/mpi-scan.c | 136 +++ lib/mpi/mpicoder.c | 365 ++++++++ lib/mpi/mpih-cmp.c | 56 ++ lib/mpi/mpih-div.c | 541 ++++++++++++ lib/mpi/mpih-mul.c | 527 ++++++++++++ lib/mpi/mpiutil.c | 208 +++++ security/integrity/Kconfig | 14 + security/integrity/Makefile | 1 + security/integrity/digsig.c | 48 + security/integrity/evm/evm.h | 12 + security/integrity/evm/evm_crypto.c | 66 ++- security/integrity/evm/evm_main.c | 94 ++- security/integrity/integrity.h | 21 + security/keys/key.c | 3 + security/selinux/selinuxfs.c | 14 +- 52 files changed, 6997 insertions(+), 124 deletions(-) create mode 100644 Documentation/digsig.txt create mode 100644 Documentation/security/LSM.txt create mode 100644 include/linux/digsig.h create mode 100644 include/linux/mpi.h create mode 100644 lib/digsig.c create mode 100644 lib/mpi/Makefile create mode 100644 lib/mpi/generic_mpi-asm-defs.h create mode 100644 lib/mpi/generic_mpih-add1.c create mode 100644 lib/mpi/generic_mpih-lshift.c create mode 100644 lib/mpi/generic_mpih-mul1.c create mode 100644 lib/mpi/generic_mpih-mul2.c create mode 100644 lib/mpi/generic_mpih-mul3.c create mode 100644 lib/mpi/generic_mpih-rshift.c create mode 100644 lib/mpi/generic_mpih-sub1.c create mode 100644 lib/mpi/longlong.h create mode 100644 lib/mpi/mpi-add.c create mode 100644 lib/mpi/mpi-bit.c create mode 100644 lib/mpi/mpi-cmp.c create mode 100644 lib/mpi/mpi-div.c create mode 100644 lib/mpi/mpi-gcd.c create mode 100644 lib/mpi/mpi-inline.c create mode 100644 lib/mpi/mpi-inline.h create mode 100644 lib/mpi/mpi-internal.h create mode 100644 lib/mpi/mpi-inv.c create mode 100644 lib/mpi/mpi-mpow.c create mode 100644 lib/mpi/mpi-mul.c create mode 100644 lib/mpi/mpi-pow.c create mode 100644 lib/mpi/mpi-scan.c create mode 100644 lib/mpi/mpicoder.c create mode 100644 lib/mpi/mpih-cmp.c create mode 100644 lib/mpi/mpih-div.c create mode 100644 lib/mpi/mpih-mul.c create mode 100644 lib/mpi/mpiutil.c create mode 100644 security/integrity/digsig.c Merging selinux/master (ded5098 SELinux: skip file_name_trans_write() when policy downgraded.) $ git merge selinux/master Already up-to-date. Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) $ git merge lblnet/master Already up-to-date. Merging watchdog/linux-next (3d17ee5 watchdog: add nowayout helpers to Watchdog Timer Driver Kernel API) $ git merge watchdog/linux-next Merge made by the 'recursive' strategy. Documentation/watchdog/watchdog-kernel-api.txt | 10 +++++++++- drivers/watchdog/ar7_wdt.c | 17 ++--------------- drivers/watchdog/bcm63xx_wdt.c | 13 +------------ drivers/watchdog/cpu5wdt.c | 3 +-- drivers/watchdog/cpwd.c | 13 +------------ drivers/watchdog/davinci_wdt.c | 13 +------------ drivers/watchdog/dw_wdt.c | 12 +----------- drivers/watchdog/eurotechwdt.c | 4 +--- drivers/watchdog/ibmasr.c | 4 +--- drivers/watchdog/indydog.c | 4 +--- drivers/watchdog/iop_wdt.c | 5 +---- drivers/watchdog/ixp2000_wdt.c | 3 +-- drivers/watchdog/ixp4xx_wdt.c | 1 - drivers/watchdog/jz4740_wdt.c | 13 +------------ drivers/watchdog/ks8695_wdt.c | 3 +-- drivers/watchdog/max63xx_wdt.c | 13 +------------ drivers/watchdog/mtx-1_wdt.c | 13 +------------ drivers/watchdog/nuc900_wdt.c | 13 +------------ drivers/watchdog/of_xilinx_wdt.c | 13 +------------ drivers/watchdog/omap_wdt.c | 16 ++-------------- drivers/watchdog/orion_wdt.c | 16 ++-------------- drivers/watchdog/pnx4008_wdt.c | 13 +------------ drivers/watchdog/rc32434_wdt.c | 13 +------------ drivers/watchdog/rdc321x_wdt.c | 13 +------------ drivers/watchdog/riowd.c | 13 +------------ drivers/watchdog/s3c2410_wdt.c | 2 ++ drivers/watchdog/stmp3xxx_wdt.c | 13 +------------ drivers/watchdog/ts72xx_wdt.c | 12 +----------- drivers/watchdog/twl4030_wdt.c | 12 +----------- drivers/watchdog/wm831x_wdt.c | 16 ++-------------- drivers/watchdog/wm8350_wdt.c | 12 +----------- include/linux/watchdog.h | 21 ++++++++++++++++----- 32 files changed, 59 insertions(+), 283 deletions(-) Merging bdev/master (feaf384 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block) $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master (c3b92c8 Linux 3.1) $ git merge dwmw2-iommu/master Already up-to-date. Merging iommu/next (a7e892e Merge branches 'iommu/fixes', 'iommu/page-sizes' and 'iommu/group-id' into next) $ git merge iommu/next Auto-merging Documentation/kernel-parameters.txt Merge made by the 'recursive' strategy. Documentation/kernel-parameters.txt | 4 +- arch/ia64/include/asm/iommu.h | 2 + arch/ia64/kernel/pci-dma.c | 1 + arch/x86/include/asm/iommu.h | 1 + arch/x86/kernel/pci-dma.c | 11 ++ drivers/iommu/amd_iommu.c | 53 +++++++++-- drivers/iommu/intel-iommu.c | 79 ++++++++++++++-- drivers/iommu/iommu.c | 177 ++++++++++++++++++++++++++++++++-- drivers/iommu/msm_iommu.c | 25 +++--- drivers/iommu/omap-iommu.c | 18 ++-- drivers/iommu/omap-iovmm.c | 17 +-- include/linux/iommu.h | 33 ++++++- virt/kvm/iommu.c | 8 +- 13 files changed, 359 insertions(+), 70 deletions(-) Merging cputime/cputime (c5927fe [S390] cputime: add sparse checking and cleanup) $ git merge cputime/cputime Auto-merging kernel/fork.c Auto-merging include/linux/sched.h Merge made by the 'recursive' strategy. arch/ia64/include/asm/cputime.h | 69 +++++++--------- arch/powerpc/include/asm/cputime.h | 70 ++++++---------- arch/s390/include/asm/cputime.h | 140 ++++++++++++++----------------- drivers/cpufreq/cpufreq_conservative.c | 29 +++---- drivers/cpufreq/cpufreq_ondemand.c | 33 ++++---- drivers/cpufreq/cpufreq_stats.c | 5 +- drivers/macintosh/rack-meter.c | 11 +-- fs/proc/array.c | 8 +- fs/proc/stat.c | 27 +++--- fs/proc/uptime.c | 4 +- include/asm-generic/cputime.h | 62 +++++++-------- include/linux/sched.h | 4 +- kernel/acct.c | 4 +- kernel/cpu.c | 3 +- kernel/exit.c | 22 ++---- kernel/fork.c | 14 +-- kernel/itimer.c | 15 ++-- kernel/posix-cpu-timers.c | 132 ++++++++++++------------------ kernel/sched.c | 80 ++++++++---------- kernel/sched_stats.h | 6 +- kernel/signal.c | 6 +- kernel/sys.c | 6 +- kernel/tsacct.c | 2 +- 23 files changed, 323 insertions(+), 429 deletions(-) Merging osd/linux-next (dde406e pnfs-obj: Support for RAID5 read-4-write interface.) $ git merge osd/linux-next Merge made by the 'recursive' strategy. Merging jc_docs/docs-next (5c050fb docs: update the development process document) $ git merge jc_docs/docs-next Already up-to-date. Merging nommu/master (0ce790e Linux 2.6.39-rc1) $ git merge nommu/master Already up-to-date. Merging trivial/for-next (a13b032 clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR) $ git merge trivial/for-next Recorded preimage for 'arch/powerpc/platforms/40x/Kconfig' Auto-merging lib/Kconfig Auto-merging kernel/irq/manage.c Auto-merging include/linux/security.h Auto-merging fs/namespace.c Auto-merging drivers/usb/gadget/Kconfig Auto-merging drivers/tty/serial/Kconfig Auto-merging drivers/spi/Kconfig Auto-merging drivers/mtd/nand/Kconfig Auto-merging drivers/gpio/Kconfig Auto-merging crypto/Kconfig Auto-merging arch/s390/Kconfig Auto-merging arch/powerpc/platforms/40x/Kconfig CONFLICT (content): Merge conflict in arch/powerpc/platforms/40x/Kconfig Auto-merging arch/mips/Kconfig Auto-merging arch/arm/Kconfig Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/powerpc/platforms/40x/Kconfig'. [master 52cb89e] Merge remote-tracking branch 'trivial/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/cpu-freq/governors.txt | 4 +-- Documentation/scsi/53c700.txt | 21 +-------------- MAINTAINERS | 3 +- arch/arm/Kconfig | 3 +- arch/arm/mach-pxa/colibri-pxa270-income.c | 2 +- arch/cris/Kconfig.debug | 1 - arch/frv/Kconfig | 10 ------- arch/mips/Kconfig | 5 --- arch/mips/sgi-ip27/Kconfig | 6 ---- arch/mips/sibyte/Kconfig | 1 - arch/powerpc/platforms/40x/Kconfig | 40 ----------------------------- arch/powerpc/platforms/44x/Kconfig | 18 +------------ arch/powerpc/platforms/512x/Kconfig | 1 - arch/s390/Kconfig | 1 - crypto/Kconfig | 2 - drivers/edac/i82975x_edac.c | 30 +++++++++++++-------- drivers/gpio/Kconfig | 2 +- drivers/leds/Kconfig | 3 +- drivers/mtd/nand/Kconfig | 1 - drivers/parisc/Kconfig | 7 ----- drivers/scsi/qla2xxx/qla_nx.c | 2 +- drivers/spi/Kconfig | 3 +- drivers/tty/serial/Kconfig | 2 +- drivers/usb/gadget/Kconfig | 1 - drivers/video/console/Kconfig | 2 - fs/namespace.c | 2 - fs/qnx4/inode.c | 7 +++-- include/linux/cordic.h | 4 +- include/linux/security.h | 26 +++++++++--------- kernel/irq/manage.c | 2 +- kernel/time/Kconfig | 2 +- lib/Kconfig | 7 ++--- lib/cordic.c | 2 +- mm/page_alloc.c | 4 +- net/ipv4/Kconfig | 2 - net/netfilter/ipvs/Kconfig | 1 - scripts/package/Makefile | 2 +- sound/aoa/codecs/Kconfig | 8 ------ sound/core/Kconfig | 1 - sound/oss/Kconfig | 2 +- 40 files changed, 60 insertions(+), 183 deletions(-) Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path) $ git merge audit/for-next Already up-to-date. Merging pm/linux-next (46fc057 Freezer / NFS: make TASK_KILLABLE sleeps attempt to freeze) $ git merge pm/linux-next Resolved 'kernel/cgroup_freezer.c' using previous resolution. Auto-merging kernel/fork.c Auto-merging kernel/exit.c Auto-merging kernel/cpu.c Auto-merging kernel/cgroup_freezer.c CONFLICT (content): Merge conflict in kernel/cgroup_freezer.c Auto-merging include/linux/sched.h Auto-merging fs/gfs2/quota.c Auto-merging fs/gfs2/log.c Auto-merging drivers/staging/rts_pstor/rtsx.c Auto-merging arch/m68k/include/asm/thread_info.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 002d8c5] Merge remote-tracking branch 'pm/linux-next' $ git diff -M --stat --summary HEAD^.. Documentation/power/devices.txt | 111 ++++--- Documentation/power/freezing-of-tasks.txt | 14 +- Documentation/power/runtime_pm.txt | 40 ++- arch/alpha/include/asm/thread_info.h | 2 - arch/arm/include/asm/thread_info.h | 2 - arch/arm/mach-shmobile/pm-sh7372.c | 44 +++- arch/avr32/include/asm/thread_info.h | 2 - arch/blackfin/include/asm/thread_info.h | 2 - arch/cris/include/asm/thread_info.h | 2 - arch/frv/include/asm/thread_info.h | 2 - arch/h8300/include/asm/thread_info.h | 2 - arch/ia64/include/asm/thread_info.h | 2 - arch/m32r/include/asm/thread_info.h | 2 - arch/m68k/include/asm/thread_info.h | 1 - arch/microblaze/include/asm/thread_info.h | 2 - arch/mips/include/asm/thread_info.h | 2 - arch/mn10300/include/asm/thread_info.h | 2 - arch/parisc/include/asm/thread_info.h | 2 - arch/powerpc/include/asm/thread_info.h | 2 - arch/s390/include/asm/thread_info.h | 2 - arch/sh/include/asm/thread_info.h | 2 - arch/sparc/include/asm/thread_info_32.h | 2 - arch/sparc/include/asm/thread_info_64.h | 2 - arch/um/include/asm/thread_info.h | 2 - arch/unicore32/include/asm/thread_info.h | 2 - arch/x86/include/asm/thread_info.h | 2 - arch/xtensa/include/asm/thread_info.h | 2 - drivers/base/power/Makefile | 2 +- drivers/base/power/domain.c | 529 +++++++++++++++++++++-------- drivers/base/power/domain_governor.c | 143 ++++++++ drivers/base/power/main.c | 19 +- drivers/base/power/qos.c | 24 +- drivers/base/power/runtime.c | 148 +++++++-- drivers/bluetooth/btmrvl_main.c | 2 - drivers/devfreq/devfreq.c | 15 +- drivers/dma/dmatest.c | 46 ++- drivers/mfd/twl6030-irq.c | 2 - drivers/net/irda/stir4200.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 15 +- drivers/staging/rts_pstor/rtsx.c | 2 - drivers/usb/storage/usb.c | 13 +- fs/btrfs/async-thread.c | 2 +- fs/btrfs/disk-io.c | 8 +- fs/ext4/super.c | 3 +- fs/fs-writeback.c | 4 +- fs/gfs2/log.c | 4 +- fs/gfs2/quota.c | 4 +- fs/jbd/journal.c | 2 +- fs/jbd2/journal.c | 2 +- fs/jfs/jfs_logmgr.c | 2 +- fs/jfs/jfs_txnmgr.c | 4 +- fs/nfs/inode.c | 3 +- fs/nfs/nfs3proc.c | 3 +- fs/nfs/nfs4proc.c | 5 +- fs/nfs/proc.c | 3 +- fs/nilfs2/segment.c | 2 +- fs/xfs/xfs_buf.c | 2 +- include/linux/freezer.h | 139 ++++---- include/linux/kthread.h | 1 + include/linux/pm.h | 231 ++++++++----- include/linux/pm_domain.h | 100 +++++- include/linux/pm_qos.h | 3 + include/linux/pm_runtime.h | 5 + include/linux/sched.h | 4 +- include/linux/suspend.h | 4 + kernel/cgroup_freezer.c | 63 ++-- kernel/cpu.c | 4 +- kernel/exit.c | 3 +- kernel/fork.c | 1 - kernel/freezer.c | 203 ++++++------ kernel/kmod.c | 6 +- kernel/kthread.c | 27 ++- kernel/power/hibernate.c | 49 +-- kernel/power/main.c | 6 +- kernel/power/process.c | 77 ++--- kernel/power/suspend.c | 8 +- kernel/power/user.c | 4 +- mm/backing-dev.c | 8 +- mm/oom_kill.c | 2 +- net/sunrpc/sched.c | 3 +- 80 files changed, 1429 insertions(+), 791 deletions(-) create mode 100644 drivers/base/power/domain_governor.c Merging apm/for-next (282e5aa x86: Kconfig: drop unknown symbol 'APM_MODULE') $ git merge apm/for-next Auto-merging arch/x86/Kconfig Merge made by the 'recursive' strategy. arch/x86/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared) $ git merge fsnotify/for-next Auto-merging include/linux/fsnotify_backend.h Auto-merging fs/notify/mark.c Auto-merging fs/notify/group.c Auto-merging fs/notify/fanotify/fanotify_user.c Auto-merging fs/nfsd/vfs.c Auto-merging fs/cachefiles/namei.c Merge made by the 'recursive' strategy. fs/cachefiles/namei.c | 1 - fs/cachefiles/xattr.c | 1 - fs/nfsd/vfs.c | 3 - fs/notify/dnotify/dnotify.c | 15 +++--- fs/notify/fanotify/fanotify.c | 24 +++++---- fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++----------- fs/notify/group.c | 1 + fs/notify/mark.c | 36 +++++-------- include/linux/fanotify.h | 5 ++- include/linux/fsnotify_backend.h | 14 ++++- 10 files changed, 121 insertions(+), 80 deletions(-) Merging irda/for-next (94d57c4 enic: Update MAINTAINERS) $ git merge irda/for-next Already up-to-date. Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver) $ git merge edac/linux_next Already up-to-date. Merging edac-amd/for-next (ed8ccfa Merge branch '3.3-edac-scrubrate' into edac-for-next) $ git merge edac-amd/for-next Merge made by the 'recursive' strategy. Documentation/edac.txt | 4 ++-- drivers/edac/amd64_edac.c | 32 ++++++++++++++++++++++++++++---- drivers/edac/edac_mc_sysfs.c | 4 ++-- 3 files changed, 32 insertions(+), 8 deletions(-) Merging devicetree/devicetree/next (ae97159 of_mdio: Don't phy_scan_fixups() twice) $ git merge devicetree/devicetree/next Already up-to-date. Merging spi/spi/next (940ab88 drivercore: Add helper macro for platform_driver boilerplate) $ git merge spi/spi/next Already up-to-date. Merging gpio/gpio/next (d92ef29 h8300: Move gpio.h to gpio-internal.h) $ git merge gpio/gpio/next Already up-to-date. Merging tip/auto-latest (e79d72b Merge branch 'sched/core' into auto-latest) $ git merge tip/auto-latest Resolved 'arch/mips/kernel/perf_event_mipsxx.c' using previous resolution. Auto-merging kernel/sched.c Auto-merging include/linux/init_task.h Removing arch/x86/oprofile/nmi_timer_int.c Auto-merging arch/mips/kernel/perf_event_mipsxx.c CONFLICT (content): Merge conflict in arch/mips/kernel/perf_event_mipsxx.c Auto-merging arch/arm/kernel/perf_event.c Auto-merging Documentation/kernel-parameters.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f7f3a51] Merge remote-tracking branch 'tip/auto-latest' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 3 + Documentation/trace/events.txt | 2 - arch/Kconfig | 4 + arch/arm/kernel/perf_event.c | 6 +- arch/mips/kernel/perf_event_mipsxx.c | 6 +- arch/x86/include/asm/init.h | 2 + arch/x86/include/asm/insn.h | 7 + arch/x86/kernel/cpu/perf_event.c | 16 +- arch/x86/kernel/cpu/perf_event_intel_ds.c | 6 +- arch/x86/kernel/cpu/perf_event_p4.c | 2 +- arch/x86/mm/init.c | 23 +++ arch/x86/mm/init_32.c | 16 -- arch/x86/mm/init_64.c | 11 +- arch/x86/oprofile/Makefile | 3 +- arch/x86/oprofile/init.c | 25 +-- arch/x86/oprofile/nmi_int.c | 27 +++- arch/x86/oprofile/nmi_timer_int.c | 50 ------ arch/x86/tools/Makefile | 10 +- arch/x86/tools/insn_sanity.c | 275 +++++++++++++++++++++++++++++ drivers/oprofile/nmi_timer_int.c | 173 ++++++++++++++++++ drivers/oprofile/oprof.c | 21 ++- drivers/oprofile/oprof.h | 9 + drivers/oprofile/timer_int.c | 29 ++-- include/linux/ftrace_event.h | 2 + include/linux/init_task.h | 4 +- include/linux/lockdep.h | 4 + kernel/events/Makefile | 2 +- kernel/events/callchain.c | 191 ++++++++++++++++++++ kernel/events/core.c | 221 +---------------------- kernel/events/internal.h | 39 ++++- kernel/jump_label.c | 3 +- kernel/lockdep.c | 33 ++-- kernel/printk.c | 9 +- kernel/sched.c | 63 ++++++- kernel/sched_fair.c | 174 ++++++++++++++---- kernel/sched_features.h | 1 + kernel/sched_rt.c | 7 +- kernel/trace/ftrace.c | 5 +- kernel/trace/trace.c | 15 ++ kernel/trace/trace.h | 1 + kernel/trace/trace_events.c | 1 - kernel/trace/trace_events_filter.c | 33 +++- kernel/trace/trace_irqsoff.c | 13 ++- kernel/trace/trace_sched_wakeup.c | 13 ++- tools/perf/util/trace-event-parse.c | 2 + 45 files changed, 1125 insertions(+), 437 deletions(-) delete mode 100644 arch/x86/oprofile/nmi_timer_int.c create mode 100644 arch/x86/tools/insn_sanity.c create mode 100644 drivers/oprofile/nmi_timer_int.c create mode 100644 kernel/events/callchain.c Merging rcu/rcu/next (afe24b1 rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp()) $ git merge rcu/rcu/next Already up-to-date. Merging uprobes/for-next (b23a347 x86: skip singlestep where possible) $ git merge uprobes/for-next Auto-merging kernel/trace/trace.h Auto-merging kernel/signal.c Auto-merging kernel/fork.c Auto-merging include/linux/sched.h Auto-merging arch/x86/include/asm/thread_info.h Auto-merging arch/x86/Kconfig Auto-merging arch/Kconfig Merge made by the 'recursive' strategy. Documentation/trace/uprobetracer.txt | 93 ++ arch/Kconfig | 3 + arch/x86/Kconfig | 5 +- arch/x86/include/asm/thread_info.h | 2 + arch/x86/include/asm/uprobes.h | 59 ++ arch/x86/kernel/Makefile | 1 + arch/x86/kernel/entry_32.S | 4 + arch/x86/kernel/signal.c | 6 + arch/x86/kernel/traps.c | 7 +- arch/x86/kernel/uprobes.c | 651 ++++++++++++++ include/linux/mm_types.h | 5 + include/linux/sched.h | 4 + include/linux/srcu.h | 50 + include/linux/uprobes.h | 180 ++++ kernel/Makefile | 1 + kernel/fork.c | 15 + kernel/signal.c | 3 + kernel/srcu.c | 3 +- kernel/trace/Kconfig | 20 + kernel/trace/Makefile | 2 + kernel/trace/trace.h | 5 + kernel/trace/trace_kprobe.c | 899 +------------------ kernel/trace/trace_probe.c | 785 ++++++++++++++++ kernel/trace/trace_probe.h | 161 ++++ kernel/trace/trace_uprobe.c | 768 ++++++++++++++++ kernel/uprobes.c | 1500 +++++++++++++++++++++++++++++++ mm/mmap.c | 33 +- tools/perf/Documentation/perf-probe.txt | 14 + tools/perf/builtin-probe.c | 49 +- tools/perf/util/probe-event.c | 411 +++++++-- tools/perf/util/probe-event.h | 12 +- tools/perf/util/symbol.c | 8 + tools/perf/util/symbol.h | 1 + 33 files changed, 4772 insertions(+), 988 deletions(-) create mode 100644 Documentation/trace/uprobetracer.txt create mode 100644 arch/x86/include/asm/uprobes.h create mode 100644 arch/x86/kernel/uprobes.c create mode 100644 include/linux/uprobes.h create mode 100644 kernel/trace/trace_probe.c create mode 100644 kernel/trace/trace_probe.h create mode 100644 kernel/trace/trace_uprobe.c create mode 100644 kernel/uprobes.c Merging cgroup/for-next (a34815b Merge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup) $ git merge cgroup/for-next Already up-to-date. Merging kmemleak/kmemleak (99781ba kmemleak: Add support for memory hotplug) $ git merge kmemleak/kmemleak Auto-merging mm/percpu.c Merge made by the 'recursive' strategy. Documentation/kmemleak.txt | 3 + include/linux/kmemleak.h | 8 ++ lib/Kconfig.debug | 2 +- mm/kmemleak.c | 158 ++++++++++++++++++++++++++++++++++++------- mm/percpu.c | 12 +++- 5 files changed, 155 insertions(+), 28 deletions(-) Merging kvm/kvm-updates/3.2 (a3e06bb KVM: emulate lapic tsc deadline timer for guest) $ git merge kvm/kvm-updates/3.2 Already up-to-date. Merging oprofile/for-next (de346b6 Merge branch 'perf/core' into oprofile/master) $ git merge oprofile/for-next Already up-to-date. Merging xen/upstream/xen (ec8161f Merge branch 'upstream/microcode' into upstream/xen) $ git merge xen/upstream/xen Resolved 'arch/x86/xen/Kconfig' using previous resolution. Auto-merging arch/x86/xen/Kconfig CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig Auto-merging arch/x86/kernel/microcode_core.c Auto-merging arch/x86/kernel/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 607df19] Merge remote-tracking branch 'xen/upstream/xen' $ git diff -M --stat --summary HEAD^.. arch/x86/include/asm/microcode.h | 9 ++ arch/x86/kernel/Makefile | 1 + arch/x86/kernel/microcode_core.c | 5 +- arch/x86/kernel/microcode_xen.c | 198 ++++++++++++++++++++++++++++++++++++++ arch/x86/xen/Kconfig | 4 + 5 files changed, 216 insertions(+), 1 deletions(-) create mode 100644 arch/x86/kernel/microcode_xen.c Merging xen-two/linux-next (54e6a3c Merge branch 'stable/for-linus-3.3' into linux-next) $ git merge xen-two/linux-next Resolved 'arch/x86/xen/Kconfig' using previous resolution. Auto-merging arch/x86/xen/Kconfig CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 7170876] Merge remote-tracking branch 'xen-two/linux-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/stable/sysfs-bus-xen-backend | 75 ++++ .../ABI/stable/sysfs-devices-system-xen_memory | 77 +++++ arch/ia64/include/asm/xen/interface.h | 2 +- arch/x86/xen/Kconfig | 3 +- arch/x86/xen/grant-table.c | 44 +++- drivers/xen/events.c | 74 ++++- drivers/xen/evtchn.c | 2 +- drivers/xen/gntalloc.c | 62 +++-- drivers/xen/gntdev.c | 31 ++- drivers/xen/grant-table.c | 354 +++++++++++++++++--- include/xen/events.h | 7 + include/xen/grant_table.h | 10 +- include/xen/interface/grant_table.h | 167 +++++++++- include/xen/interface/xen.h | 2 + 14 files changed, 828 insertions(+), 82 deletions(-) create mode 100644 Documentation/ABI/stable/sysfs-bus-xen-backend create mode 100644 Documentation/ABI/stable/sysfs-devices-system-xen_memory Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend) $ git merge xen-pvhvm/linux-next Already up-to-date. Merging percpu/for-next (a34815b Merge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup) $ git merge percpu/for-next Already up-to-date. Merging workqueues/for-next (9c5a2ba workqueue: separate out drain_workqueue() from destroy_workqueue()) $ git merge workqueues/for-next Already up-to-date. Merging sfi/sfi-test (5b026c4 SFI: use ioremap_cache() instead of ioremap()) $ git merge sfi/sfi-test Already up-to-date. Merging asm-generic/next (35dbc0e asm-generic/io.h: allow people to override individual funcs) $ git merge asm-generic/next Already up-to-date. Merging drivers-x86/linux-next (15b956a acer-wmi: support Lenovo ideapad S205 wifi switch) $ git merge drivers-x86/linux-next Already up-to-date. Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) $ git merge hwpoison/hwpoison Already up-to-date. Merging sysctl/master (c2f5631 sysctl: remove impossible condition check) $ git merge sysctl/master Auto-merging fs/proc/proc_sysctl.c Merge made by the 'recursive' strategy. fs/proc/proc_sysctl.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) Merging namespace/master (7e05c93 proc: Fix the proc access checks to namespace files.) $ git merge namespace/master Auto-merging fs/proc/inode.c Merge made by the 'recursive' strategy. fs/proc/inode.c | 6 +- fs/proc/namespaces.c | 160 +++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 142 insertions(+), 24 deletions(-) Merging regmap/for-next (bc7ee55 regmap: Add trace event for successful cache reads) $ git merge regmap/for-next Removing drivers/base/regmap/regcache-indexed.c Merge made by the 'recursive' strategy. drivers/base/regmap/Kconfig | 3 + drivers/base/regmap/Makefile | 4 +- drivers/base/regmap/internal.h | 5 +- drivers/base/regmap/regcache-indexed.c | 64 ------- drivers/base/regmap/regcache-lzo.c | 21 ++- drivers/base/regmap/regcache-rbtree.c | 61 +++++++- drivers/base/regmap/regcache.c | 68 ++++---- drivers/base/regmap/regmap-irq.c | 289 ++++++++++++++++++++++++++++++++ drivers/base/regmap/regmap.c | 142 +++++++++++----- include/linux/regmap.h | 55 ++++++- include/trace/events/regmap.h | 9 + 11 files changed, 566 insertions(+), 155 deletions(-) delete mode 100644 drivers/base/regmap/regcache-indexed.c create mode 100644 drivers/base/regmap/regmap-irq.c Merging hsi/for-next (a8b4dea HSI: hsi_char: Update ioctl-number.txt) $ git merge hsi/for-next Auto-merging include/linux/Kbuild Auto-merging drivers/Makefile Auto-merging drivers/Kconfig Merge made by the 'recursive' strategy. Documentation/DocBook/device-drivers.tmpl | 17 + Documentation/ioctl/ioctl-number.txt | 1 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/hsi/Kconfig | 19 + drivers/hsi/Makefile | 6 + drivers/hsi/clients/Kconfig | 13 + drivers/hsi/clients/Makefile | 5 + drivers/hsi/clients/hsi_char.c | 802 +++++++++++++++++++++++++++++ drivers/hsi/hsi.c | 494 ++++++++++++++++++ drivers/hsi/hsi_boardinfo.c | 62 +++ drivers/hsi/hsi_core.h | 35 ++ include/linux/Kbuild | 1 + include/linux/hsi/Kbuild | 1 + include/linux/hsi/hsi.h | 410 +++++++++++++++ include/linux/hsi/hsi_char.h | 63 +++ 16 files changed, 1932 insertions(+), 0 deletions(-) create mode 100644 drivers/hsi/Kconfig create mode 100644 drivers/hsi/Makefile create mode 100644 drivers/hsi/clients/Kconfig create mode 100644 drivers/hsi/clients/Makefile create mode 100644 drivers/hsi/clients/hsi_char.c create mode 100644 drivers/hsi/hsi.c create mode 100644 drivers/hsi/hsi_boardinfo.c create mode 100644 drivers/hsi/hsi_core.h create mode 100644 include/linux/hsi/Kbuild create mode 100644 include/linux/hsi/hsi.h create mode 100644 include/linux/hsi/hsi_char.h Merging driver-core/driver-core-next (11e3123 uio: convert drivers/uio/* to use module_platform_driver()) $ git merge driver-core/driver-core-next Auto-merging include/linux/i2c.h Auto-merging include/linux/device.h Auto-merging drivers/usb/storage/ene_ub6250.c Auto-merging drivers/usb/misc/usbled.c Auto-merging drivers/staging/media/lirc/lirc_imon.c Auto-merging drivers/staging/media/go7007/go7007-usb.c Auto-merging drivers/nfc/pn533.c Auto-merging drivers/net/wireless/rtlwifi/rtl8192cu/sw.c Auto-merging drivers/net/wireless/rt2x00/rt2800usb.c Auto-merging drivers/net/wireless/rndis_wlan.c Auto-merging drivers/net/usb/smsc95xx.c Auto-merging drivers/net/usb/smsc75xx.c Auto-merging drivers/net/usb/lg-vl600.c Auto-merging drivers/net/usb/cdc_ncm.c Auto-merging drivers/net/usb/cdc_ether.c Auto-merging drivers/net/usb/cdc-phonet.c Auto-merging drivers/net/usb/asix.c Auto-merging drivers/net/irda/stir4200.c Auto-merging drivers/media/video/gspca/pac207.c Auto-merging drivers/media/video/em28xx/em28xx-cards.c Auto-merging drivers/media/rc/redrat3.c Auto-merging drivers/media/dvb/dvb-usb/ttusb2.c Auto-merging drivers/media/dvb/dvb-usb/it913x.c Auto-merging drivers/media/dvb/dvb-usb/dw2102.c Auto-merging drivers/media/dvb/dvb-usb/anysee.c Auto-merging drivers/media/dvb/dvb-usb/af9015.c Auto-merging drivers/input/touchscreen/usbtouchscreen.c Auto-merging drivers/input/tablet/wacom_sys.c Auto-merging drivers/input/tablet/aiptek.c Auto-merging drivers/input/misc/ati_remote2.c Auto-merging drivers/hid/usbhid/usbkbd.c Auto-merging drivers/bluetooth/btusb.c Auto-merging drivers/bluetooth/bfusb.c Auto-merging drivers/bluetooth/ath3k.c Auto-merging drivers/Kconfig Merge made by the 'recursive' strategy. Documentation/driver-model/devres.txt | 1 + Documentation/filesystems/debugfs.txt | 32 +++++++- drivers/Kconfig | 4 +- drivers/base/Makefile | 4 +- drivers/base/devtmpfs.c | 3 +- drivers/bluetooth/ath3k.c | 14 +--- drivers/bluetooth/bcm203x.c | 21 +----- drivers/bluetooth/bfusb.c | 21 +----- drivers/bluetooth/bpa10x.c | 15 +--- drivers/bluetooth/btusb.c | 15 +--- drivers/hid/usbhid/usbkbd.c | 17 +---- drivers/hid/usbhid/usbmouse.c | 17 +---- drivers/hv/Kconfig | 4 +- drivers/hv/vmbus_drv.c | 2 +- drivers/i2c/busses/i2c-diolan-u2c.c | 15 +--- drivers/i2c/busses/i2c-tiny-usb.c | 15 +--- drivers/input/joystick/xpad.c | 13 +--- drivers/input/misc/ati_remote2.c | 21 +----- drivers/input/misc/keyspan_remote.c | 21 +----- drivers/input/misc/powermate.c | 13 +--- drivers/input/misc/yealink.c | 17 +---- drivers/input/mouse/appletouch.c | 13 +--- drivers/input/mouse/bcm5974.c | 14 +--- drivers/input/tablet/acecad.c | 17 +---- drivers/input/tablet/aiptek.c | 19 +---- drivers/input/tablet/gtco.c | 28 +------ drivers/input/tablet/hanwang.c | 13 +--- drivers/input/tablet/kbtab.c | 20 +----- drivers/input/tablet/wacom_sys.c | 19 +---- drivers/input/touchscreen/usbtouchscreen.c | 13 +--- drivers/isdn/hardware/mISDN/hfcsusb.c | 28 +------ drivers/media/dvb/b2c2/flexcop-usb.c | 20 +----- drivers/media/dvb/dvb-usb/a800.c | 21 +----- drivers/media/dvb/dvb-usb/af9015.c | 20 +----- drivers/media/dvb/dvb-usb/anysee.c | 21 +----- drivers/media/dvb/dvb-usb/au6610.c | 21 +----- drivers/media/dvb/dvb-usb/az6027.c | 23 +----- drivers/media/dvb/dvb-usb/ce6230.c | 22 +----- drivers/media/dvb/dvb-usb/cinergyT2-core.c | 20 +----- drivers/media/dvb/dvb-usb/cxusb.c | 21 +----- drivers/media/dvb/dvb-usb/dib0700_core.c | 22 +----- drivers/media/dvb/dvb-usb/dibusb-mb.c | 21 +----- drivers/media/dvb/dvb-usb/dibusb-mc.c | 21 +----- drivers/media/dvb/dvb-usb/digitv.c | 21 +----- drivers/media/dvb/dvb-usb/dtt200u.c | 21 +----- drivers/media/dvb/dvb-usb/dtv5100.c | 21 +----- drivers/media/dvb/dvb-usb/dw2102.c | 17 +---- drivers/media/dvb/dvb-usb/ec168.c | 22 +----- drivers/media/dvb/dvb-usb/friio.c | 23 +----- drivers/media/dvb/dvb-usb/gl861.c | 21 +----- drivers/media/dvb/dvb-usb/gp8psk.c | 21 +----- drivers/media/dvb/dvb-usb/it913x.c | 21 +----- drivers/media/dvb/dvb-usb/lmedm04.c | 21 +----- drivers/media/dvb/dvb-usb/m920x.c | 22 +----- drivers/media/dvb/dvb-usb/mxl111sf.c | 19 +---- drivers/media/dvb/dvb-usb/nova-t-usb2.c | 21 +----- drivers/media/dvb/dvb-usb/opera1.c | 17 +---- drivers/media/dvb/dvb-usb/pctv452e.c | 17 +---- drivers/media/dvb/dvb-usb/technisat-usb2.c | 20 +----- drivers/media/dvb/dvb-usb/ttusb2.c | 21 +----- drivers/media/dvb/dvb-usb/umt-010.c | 21 +----- drivers/media/dvb/dvb-usb/vp702x.c | 21 +----- drivers/media/dvb/dvb-usb/vp7045.c | 21 +----- drivers/media/dvb/siano/smsusb.c | 21 +----- drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 21 +----- drivers/media/dvb/ttusb-dec/ttusb_dec.c | 21 +----- drivers/media/radio/dsbr100.c | 16 +---- drivers/media/radio/radio-mr800.c | 23 +----- drivers/media/radio/si470x/radio-si470x-usb.c | 28 +------ drivers/media/rc/ati_remote.c | 33 +------- drivers/media/rc/imon.c | 21 +----- drivers/media/rc/mceusb.c | 20 +----- drivers/media/rc/redrat3.c | 20 +----- drivers/media/rc/streamzap.c | 28 +------ drivers/media/video/cx231xx/cx231xx-cards.c | 24 +----- drivers/media/video/em28xx/em28xx-cards.c | 24 +----- drivers/media/video/et61x251/et61x251_core.c | 25 +------ drivers/media/video/gspca/benq.c | 13 +--- drivers/media/video/gspca/conex.c | 13 +--- drivers/media/video/gspca/cpia1.c | 13 +--- drivers/media/video/gspca/etoms.c | 14 +--- drivers/media/video/gspca/finepix.c | 14 +--- drivers/media/video/gspca/gl860/gl860.c | 17 +---- drivers/media/video/gspca/jeilinj.c | 14 +--- drivers/media/video/gspca/kinect.c | 14 +--- drivers/media/video/gspca/konica.c | 13 +--- drivers/media/video/gspca/m5602/m5602_core.c | 14 +--- drivers/media/video/gspca/mars.c | 13 +--- drivers/media/video/gspca/mr97310a.c | 13 +--- drivers/media/video/gspca/nw80x.c | 13 +--- drivers/media/video/gspca/ov519.c | 13 +--- drivers/media/video/gspca/ov534.c | 14 +--- drivers/media/video/gspca/ov534_9.c | 14 +--- drivers/media/video/gspca/pac207.c | 13 +--- drivers/media/video/gspca/pac7302.c | 13 +--- drivers/media/video/gspca/pac7311.c | 13 +--- drivers/media/video/gspca/se401.c | 13 +--- drivers/media/video/gspca/sn9c2028.c | 14 +--- drivers/media/video/gspca/sn9c20x.c | 13 +--- drivers/media/video/gspca/sonixb.c | 13 +--- drivers/media/video/gspca/sonixj.c | 13 +--- drivers/media/video/gspca/spca1528.c | 13 +--- drivers/media/video/gspca/spca500.c | 13 +--- drivers/media/video/gspca/spca501.c | 13 +--- drivers/media/video/gspca/spca505.c | 13 +--- drivers/media/video/gspca/spca506.c | 19 +---- drivers/media/video/gspca/spca508.c | 13 +--- drivers/media/video/gspca/spca561.c | 13 +--- drivers/media/video/gspca/sq905.c | 14 +--- drivers/media/video/gspca/sq905c.c | 14 +--- drivers/media/video/gspca/sq930x.c | 13 +--- drivers/media/video/gspca/stk014.c | 13 +--- drivers/media/video/gspca/stv0680.c | 13 +--- drivers/media/video/gspca/stv06xx/stv06xx.c | 13 +--- drivers/media/video/gspca/sunplus.c | 13 +--- drivers/media/video/gspca/t613.c | 13 +--- drivers/media/video/gspca/topro.c | 13 +--- drivers/media/video/gspca/tv8532.c | 14 +--- drivers/media/video/gspca/vc032x.c | 13 +--- drivers/media/video/gspca/vicam.c | 14 +--- drivers/media/video/gspca/xirlink_cit.c | 13 +--- drivers/media/video/gspca/zc3xx.c | 13 +--- drivers/media/video/hdpvr/hdpvr-core.c | 21 +----- drivers/media/video/s2255drv.c | 20 +----- drivers/media/video/sn9c102/sn9c102_core.c | 25 +------ drivers/media/video/stk-webcam.c | 23 +----- drivers/media/video/tm6000/tm6000-cards.c | 26 +------ drivers/media/video/zr364xx.c | 23 +----- drivers/mmc/host/ushc.c | 12 +--- drivers/mtd/nand/alauda.c | 13 +--- drivers/net/can/usb/ems_usb.c | 26 +------ drivers/net/can/usb/esd_usb2.c | 23 +----- drivers/net/irda/irda-usb.c | 35 +-------- drivers/net/irda/kingsun-sir.c | 19 +---- drivers/net/irda/ks959-sir.c | 21 +----- drivers/net/irda/ksdazzle-sir.c | 21 +----- drivers/net/irda/mcs7780.c | 23 +----- drivers/net/irda/stir4200.c | 19 +---- drivers/net/usb/asix.c | 12 +--- drivers/net/usb/catc.c | 17 +---- drivers/net/usb/cdc-phonet.c | 13 +--- drivers/net/usb/cdc_eem.c | 13 +--- drivers/net/usb/cdc_ether.c | 19 +---- drivers/net/usb/cdc_ncm.c | 15 +--- drivers/net/usb/cdc_subset.c | 12 +--- drivers/net/usb/cx82310_eth.c | 12 +--- drivers/net/usb/dm9601.c | 13 +--- drivers/net/usb/gl620a.c | 12 +--- drivers/net/usb/int51x1.c | 12 +--- drivers/net/usb/ipheth.c | 20 +----- drivers/net/usb/kalmia.c | 12 +--- drivers/net/usb/kaweth.c | 30 +------- drivers/net/usb/lg-vl600.c | 12 +--- drivers/net/usb/mcs7830.c | 12 +--- drivers/net/usb/net1080.c | 12 +--- drivers/net/usb/plusb.c | 12 +--- drivers/net/usb/rndis_host.c | 12 +--- drivers/net/usb/rtl8150.c | 15 +--- drivers/net/usb/sierra_net.c | 19 +---- drivers/net/usb/smsc75xx.c | 12 +--- drivers/net/usb/smsc95xx.c | 12 +--- drivers/net/usb/zaurus.c | 12 +--- drivers/net/wireless/ath/carl9170/usb.c | 13 +--- drivers/net/wireless/libertas/if_usb.c | 24 +----- drivers/net/wireless/libertas_tf/if_usb.c | 22 +----- drivers/net/wireless/orinoco/orinoco_usb.c | 27 +------ drivers/net/wireless/p54/p54usb.c | 13 +--- drivers/net/wireless/rndis_wlan.c | 12 +--- drivers/net/wireless/rt2x00/rt2500usb.c | 13 +--- drivers/net/wireless/rt2x00/rt2800usb.c | 13 +--- drivers/net/wireless/rt2x00/rt73usb.c | 13 +--- drivers/net/wireless/rtl818x/rtl8187/dev.c | 13 +--- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 13 +--- drivers/net/wireless/zd1201.c | 13 +--- drivers/nfc/pn533.c | 19 +---- drivers/staging/frontier/alphatrack.c | 28 +------ drivers/staging/frontier/tranzport.c | 27 +------ drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 22 +----- drivers/staging/iio/accel/adis16201_core.c | 13 +--- drivers/staging/iio/accel/adis16203_core.c | 13 +--- drivers/staging/iio/accel/adis16204_core.c | 13 +--- drivers/staging/iio/accel/adis16209_core.c | 13 +--- drivers/staging/iio/accel/adis16220_core.c | 13 +--- drivers/staging/iio/accel/adis16240_core.c | 13 +--- drivers/staging/iio/accel/kxsd9.c | 13 +--- drivers/staging/iio/accel/lis3l02dq_core.c | 13 +--- drivers/staging/iio/accel/sca3000_core.c | 13 +--- drivers/staging/iio/adc/ad7192.c | 13 +--- drivers/staging/iio/adc/ad7280a.c | 13 +--- drivers/staging/iio/adc/ad7291.c | 14 +--- drivers/staging/iio/adc/ad7298_core.c | 13 +--- drivers/staging/iio/adc/ad7476_core.c | 13 +--- drivers/staging/iio/adc/ad7606_spi.c | 13 +--- drivers/staging/iio/adc/ad7780.c | 13 +--- drivers/staging/iio/adc/ad7793.c | 13 +--- drivers/staging/iio/adc/ad7816.c | 14 +--- drivers/staging/iio/adc/ad7887_core.c | 13 +--- drivers/staging/iio/adc/ad799x_core.c | 14 +--- drivers/staging/iio/adc/adt7310.c | 14 +--- drivers/staging/iio/adc/adt7410.c | 14 +--- drivers/staging/iio/adc/max1363_core.c | 14 +--- drivers/staging/iio/addac/adt7316-i2c.c | 14 +--- drivers/staging/iio/addac/adt7316-spi.c | 14 +--- drivers/staging/iio/cdc/ad7150.c | 14 +--- drivers/staging/iio/cdc/ad7152.c | 14 +--- drivers/staging/iio/cdc/ad7746.c | 14 +--- drivers/staging/iio/dac/ad5064.c | 13 +--- drivers/staging/iio/dac/ad5360.c | 13 +--- drivers/staging/iio/dac/ad5446.c | 13 +--- drivers/staging/iio/dac/ad5504.c | 13 +--- drivers/staging/iio/dac/ad5624r_spi.c | 13 +--- drivers/staging/iio/dac/ad5686.c | 13 +--- drivers/staging/iio/dac/ad5791.c | 13 +--- drivers/staging/iio/dac/max517.c | 14 +--- drivers/staging/iio/dds/ad5930.c | 13 +--- drivers/staging/iio/dds/ad9832.c | 13 +--- drivers/staging/iio/dds/ad9834.c | 13 +--- drivers/staging/iio/dds/ad9850.c | 13 +--- drivers/staging/iio/dds/ad9852.c | 13 +--- drivers/staging/iio/dds/ad9910.c | 13 +--- drivers/staging/iio/dds/ad9951.c | 13 +--- drivers/staging/iio/gyro/adis16080_core.c | 13 +--- drivers/staging/iio/gyro/adis16130_core.c | 13 +--- drivers/staging/iio/gyro/adis16260_core.c | 13 +--- drivers/staging/iio/gyro/adxrs450_core.c | 13 +--- drivers/staging/iio/impedance-analyzer/ad5933.c | 13 +--- drivers/staging/iio/imu/adis16400_core.c | 13 +--- drivers/staging/iio/light/isl29018.c | 14 +--- drivers/staging/iio/light/tsl2563.c | 14 +--- drivers/staging/iio/light/tsl2583.c | 14 +--- drivers/staging/iio/magnetometer/ak8975.c | 14 +--- drivers/staging/iio/magnetometer/hmc5843.c | 14 +--- drivers/staging/iio/meter/ade7753.c | 13 +--- drivers/staging/iio/meter/ade7754.c | 13 +--- drivers/staging/iio/meter/ade7758_core.c | 13 +--- drivers/staging/iio/meter/ade7759.c | 13 +--- drivers/staging/iio/meter/ade7854-i2c.c | 14 +--- drivers/staging/iio/meter/ade7854-spi.c | 13 +--- drivers/staging/iio/resolver/ad2s1200.c | 13 +--- drivers/staging/iio/resolver/ad2s1210.c | 13 +--- drivers/staging/iio/resolver/ad2s90.c | 13 +--- drivers/staging/keucr/usb.c | 24 +----- drivers/staging/media/go7007/go7007-usb.c | 15 +--- drivers/staging/media/lirc/lirc_igorplugusb.c | 21 +----- drivers/staging/media/lirc/lirc_imon.c | 24 +----- drivers/staging/media/lirc/lirc_sasem.c | 25 +------ drivers/staging/media/lirc/lirc_ttusbir.c | 22 +----- drivers/staging/rts5139/rts51x.c | 32 +------- drivers/staging/vt6656/main_usb.c | 14 +--- drivers/staging/winbond/wbusb.c | 13 +--- drivers/staging/wlan-ng/prism2usb.c | 14 +--- drivers/uio/uio_pdrv.c | 12 +--- drivers/uio/uio_pdrv_genirq.c | 13 +--- drivers/uio/uio_pruss.c | 14 +--- drivers/usb/atm/cxacru.c | 13 +--- drivers/usb/atm/speedtch.c | 17 +---- drivers/usb/atm/ueagle-atm.c | 31 +------- drivers/usb/class/cdc-wdm.c | 19 +---- drivers/usb/class/usblp.c | 13 +--- drivers/usb/class/usbtmc.c | 17 +---- drivers/usb/dwc3/debugfs.c | 16 +--- drivers/usb/host/hwa-hc.c | 13 +--- drivers/usb/image/microtek.c | 14 +--- drivers/usb/misc/adutux.c | 35 +-------- drivers/usb/misc/cypress_cy7c63.c | 22 +----- drivers/usb/misc/cytherm.c | 26 +------ drivers/usb/misc/emi26.c | 13 +--- drivers/usb/misc/emi62.c | 17 +---- drivers/usb/misc/idmouse.c | 24 +----- drivers/usb/misc/iowarrior.c | 13 +--- drivers/usb/misc/isight_firmware.c | 13 +--- drivers/usb/misc/ldusb.c | 27 +------ drivers/usb/misc/legousbtower.c | 46 +---------- drivers/usb/misc/rio500.c | 28 +------ drivers/usb/misc/trancevibrator.c | 21 +----- drivers/usb/misc/usblcd.c | 20 +----- drivers/usb/misc/usbled.c | 18 +---- drivers/usb/misc/usbsevseg.c | 18 +---- drivers/usb/misc/yurex.c | 22 +----- drivers/usb/storage/alauda.c | 13 +--- drivers/usb/storage/cypress_atacb.c | 13 +--- drivers/usb/storage/datafab.c | 13 +--- drivers/usb/storage/ene_ub6250.c | 13 +--- drivers/usb/storage/freecom.c | 13 +--- drivers/usb/storage/isd200.c | 13 +--- drivers/usb/storage/jumpshot.c | 13 +--- drivers/usb/storage/karma.c | 13 +--- drivers/usb/storage/onetouch.c | 13 +--- drivers/usb/storage/realtek_cr.c | 13 +--- drivers/usb/storage/sddr09.c | 13 +--- drivers/usb/storage/sddr55.c | 13 +--- drivers/usb/storage/shuttle_usbat.c | 13 +--- drivers/usb/storage/uas.c | 13 +--- drivers/usb/usb-skeleton.c | 21 +----- drivers/usb/wusbcore/cbaf.c | 12 +--- drivers/uwb/hwa-rc.c | 12 +--- drivers/uwb/i1480/dfu/usb.c | 20 +----- drivers/video/smscufx.c | 19 +---- drivers/video/udlfb.c | 19 +---- drivers/w1/masters/ds2490.c | 21 +----- drivers/w1/slaves/w1_therm.c | 36 +++++++- drivers/watchdog/pcwd_usb.c | 35 +-------- fs/debugfs/file.c | 91 +++++++++++++++++++++ include/linux/debugfs.h | 26 ++++++ include/linux/device.h | 24 ++++++ include/linux/i2c.h | 13 +++ include/linux/platform_device.h | 12 +--- include/linux/spi/spi.h | 11 +++ include/linux/usb.h | 12 +++ lib/devres.c | 55 ++++++++++++- sound/usb/6fire/chip.c | 15 +--- sound/usb/caiaq/device.c | 13 +--- sound/usb/misc/ua101.c | 14 +--- sound/usb/usx2y/us122l.c | 14 +--- sound/usb/usx2y/usbusx2y.c | 13 +--- 315 files changed, 612 insertions(+), 4714 deletions(-) Merging tty/tty-next (7962fce tty: n_hdlc not atomic use tty->flags.) $ git merge tty/tty-next Resolved 'drivers/tty/serial/Kconfig' using previous resolution. Resolved 'drivers/tty/serial/Makefile' using previous resolution. Auto-merging include/linux/serial_core.h Auto-merging drivers/tty/serial/pch_uart.c Auto-merging drivers/tty/serial/Makefile CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile Auto-merging drivers/tty/serial/Kconfig CONFLICT (content): Merge conflict in drivers/tty/serial/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 20aa4e5] Merge remote-tracking branch 'tty/tty-next' $ git diff -M --stat --summary HEAD^.. arch/x86/include/asm/mrst.h | 2 +- arch/x86/kernel/early_printk.c | 2 +- arch/x86/platform/mrst/early_printk_mrst.c | 16 +- drivers/parport/parport_ax88796.c | 13 +- drivers/parport/parport_sunbpp.c | 13 +- drivers/tty/n_hdlc.c | 6 +- drivers/tty/pty.c | 26 +- drivers/tty/serial/8250.c | 4 +- drivers/tty/serial/8250_dw.c | 12 +- drivers/tty/serial/8250_pci.c | 31 ++- drivers/tty/serial/Kconfig | 33 ++- drivers/tty/serial/Makefile | 1 + drivers/tty/serial/atmel_serial.c | 7 +- drivers/tty/serial/ifx6x60.c | 1 - drivers/tty/serial/imx.c | 2 +- drivers/tty/serial/max3100.c | 1 - drivers/tty/serial/max3107-aava.c | 1 - drivers/tty/serial/max3107.c | 1 - drivers/tty/serial/mfd.c | 18 +- drivers/tty/serial/mrst_max3110.c | 1 - drivers/tty/serial/mxs-auart.c | 5 +- drivers/tty/serial/omap-serial.c | 2 +- drivers/tty/serial/pch_uart.c | 160 ++++++- drivers/tty/serial/sc26xx.c | 14 +- drivers/tty/serial/serial_core.c | 323 +++++++----- drivers/tty/serial/sirfsoc_uart.c | 783 ++++++++++++++++++++++++++++ drivers/tty/serial/sirfsoc_uart.h | 185 +++++++ drivers/tty/serial/timbuart.c | 15 +- drivers/tty/serial/vr41xx_siu.c | 13 +- drivers/tty/tty_io.c | 309 +++++++----- drivers/tty/tty_ldisc.c | 22 +- include/linux/serial_core.h | 100 +--- 32 files changed, 1629 insertions(+), 493 deletions(-) create mode 100644 drivers/tty/serial/sirfsoc_uart.c create mode 100644 drivers/tty/serial/sirfsoc_uart.h Merging usb/usb-next (b870def USB: ohci-s3c2410: add PM support) $ git merge usb/usb-next Auto-merging include/linux/usb.h Auto-merging drivers/usb/storage/shuttle_usbat.c Auto-merging drivers/usb/storage/sddr55.c Auto-merging drivers/usb/storage/sddr09.c Auto-merging drivers/usb/storage/realtek_cr.c Auto-merging drivers/usb/storage/onetouch.c Auto-merging drivers/usb/storage/karma.c Auto-merging drivers/usb/storage/jumpshot.c Auto-merging drivers/usb/storage/isd200.c Auto-merging drivers/usb/storage/freecom.c Auto-merging drivers/usb/storage/ene_ub6250.c Auto-merging drivers/usb/storage/datafab.c Auto-merging drivers/usb/storage/cypress_atacb.c Auto-merging drivers/usb/storage/alauda.c Removing drivers/usb/serial/ChangeLog.history Auto-merging drivers/usb/musb/musb_core.c Auto-merging drivers/usb/host/ohci-au1xxx.c Auto-merging drivers/usb/host/hwa-hc.c Auto-merging drivers/usb/gadget/s3c-hsudc.c Auto-merging drivers/usb/gadget/s3c-hsotg.c Auto-merging drivers/usb/gadget/fsl_qe_udc.c Auto-merging drivers/usb/gadget/Kconfig Auto-merging Documentation/kernel-parameters.txt Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-bus-usb | 25 + Documentation/kernel-parameters.txt | 4 + drivers/hv/hv_kvp.c | 10 +- drivers/usb/Makefile | 3 +- drivers/usb/c67x00/c67x00-drv.c | 15 +- drivers/usb/c67x00/c67x00-hcd.c | 1 - drivers/usb/core/devio.c | 186 ++++++--- drivers/usb/core/driver.c | 8 +- drivers/usb/core/hcd-pci.c | 4 - drivers/usb/core/hcd.c | 24 +- drivers/usb/core/hub.c | 1 - drivers/usb/core/usb.h | 14 - drivers/usb/dwc3/dwc3-omap.c | 14 +- drivers/usb/gadget/Kconfig | 1 + drivers/usb/gadget/fsl_qe_udc.c | 15 +- drivers/usb/gadget/mv_udc_core.c | 19 +- drivers/usb/gadget/s3c-hsotg.c | 13 +- drivers/usb/gadget/s3c-hsudc.c | 15 +- drivers/usb/gadget/usbstring.c | 73 +--- drivers/usb/host/ehci-hcd.c | 2 +- drivers/usb/host/ehci-q.c | 11 + drivers/usb/host/ehci-s5p.c | 2 - drivers/usb/host/ehci-xls.c | 2 +- drivers/usb/host/fhci-hcd.c | 12 +- drivers/usb/host/fsl-mph-dr-of.c | 12 +- drivers/usb/host/hwa-hc.c | 1 - drivers/usb/host/imx21-hcd.c | 13 +- drivers/usb/host/isp1760-hcd.c | 74 ++-- drivers/usb/host/ohci-au1xxx.c | 5 +- drivers/usb/host/ohci-dbg.c | 18 +- drivers/usb/host/ohci-ep93xx.c | 2 - drivers/usb/host/ohci-hcd.c | 28 +- drivers/usb/host/ohci-hub.c | 7 +- drivers/usb/host/ohci-omap.c | 1 - drivers/usb/host/ohci-pci.c | 5 +- drivers/usb/host/ohci-pxa27x.c | 2 - drivers/usb/host/ohci-q.c | 8 +- drivers/usb/host/ohci-s3c2410.c | 55 +++- drivers/usb/host/ohci-sh.c | 1 - drivers/usb/host/ohci-sm501.c | 1 - drivers/usb/host/ohci-spear.c | 1 - drivers/usb/host/ohci-tmio.c | 3 - drivers/usb/host/ohci-xls.c | 2 +- drivers/usb/host/ohci.h | 14 +- drivers/usb/host/oxu210hp-hcd.c | 19 +- drivers/usb/host/xhci-hub.c | 18 +- drivers/usb/host/xhci-ring.c | 12 +- drivers/usb/misc/usbtest.c | 1 - drivers/usb/musb/musb_core.c | 1 - drivers/usb/otg/fsl_otg.c | 13 +- drivers/usb/renesas_usbhs/common.c | 13 +- drivers/usb/serial/ChangeLog.history | 730 ------------------------------- drivers/usb/serial/belkin_sa.c | 43 -- drivers/usb/serial/ch341.c | 3 +- drivers/usb/serial/cp210x.c | 58 ++- drivers/usb/serial/cyberjack.c | 33 +-- drivers/usb/serial/cypress_m8.c | 29 -- drivers/usb/serial/digi_acceleport.c | 227 +---------- drivers/usb/serial/ftdi_sio.c | 4 + drivers/usb/serial/garmin_gps.c | 9 - drivers/usb/serial/generic.c | 83 +++- drivers/usb/serial/io_edgeport.c | 3 - drivers/usb/serial/io_ti.c | 28 +- drivers/usb/serial/ipaq.c | 34 -- drivers/usb/serial/ir-usb.c | 32 -- drivers/usb/serial/iuu_phoenix.c | 3 +- drivers/usb/serial/keyspan.c | 90 ---- drivers/usb/serial/keyspan_pda.c | 66 +--- drivers/usb/serial/kobil_sct.c | 25 - drivers/usb/serial/mct_u232.c | 46 -- drivers/usb/serial/mos7720.c | 18 - drivers/usb/serial/mos7840.c | 4 - drivers/usb/serial/omninet.c | 51 +-- drivers/usb/serial/opticon.c | 1 - drivers/usb/serial/oti6858.c | 23 +- drivers/usb/serial/pl2303.c | 17 +- drivers/usb/serial/sierra.c | 1 - drivers/usb/serial/symbolserial.c | 1 - drivers/usb/serial/ti_usb_3410_5052.c | 13 +- drivers/usb/serial/usb-serial.c | 98 +++-- drivers/usb/serial/usb_debug.c | 13 +- drivers/usb/serial/whiteheat.c | 58 --- drivers/usb/storage/alauda.c | 2 +- drivers/usb/storage/cypress_atacb.c | 2 +- drivers/usb/storage/datafab.c | 2 +- drivers/usb/storage/ene_ub6250.c | 12 +- drivers/usb/storage/freecom.c | 2 +- drivers/usb/storage/isd200.c | 2 +- drivers/usb/storage/jumpshot.c | 2 +- drivers/usb/storage/karma.c | 2 +- drivers/usb/storage/onetouch.c | 2 +- drivers/usb/storage/realtek_cr.c | 14 +- drivers/usb/storage/sddr09.c | 2 +- drivers/usb/storage/sddr55.c | 2 +- drivers/usb/storage/shuttle_usbat.c | 2 +- fs/fat/namei_vfat.c | 3 +- fs/nls/nls_base.c | 73 ++- include/linux/nls.h | 5 +- include/linux/usb.h | 13 + include/linux/usb/ch11.h | 19 +- include/linux/usb/hcd.h | 2 - include/linux/usb/serial.h | 11 +- 102 files changed, 647 insertions(+), 2175 deletions(-) delete mode 100644 drivers/usb/serial/ChangeLog.history Merging staging/staging-next (976d534 rtl8192e: Rename clashing symbols) $ git merge staging/staging-next Removing drivers/staging/xgifb/vb_ext.h Removing drivers/staging/xgifb/vb_ext.c Auto-merging drivers/staging/vt6656/main_usb.c Removing drivers/staging/spectra/spectraswconfig.h Removing drivers/staging/spectra/nand_regs.h Removing drivers/staging/spectra/lld_nand.h Removing drivers/staging/spectra/lld_nand.c Removing drivers/staging/spectra/lld_mtd.h Removing drivers/staging/spectra/lld_mtd.c Removing drivers/staging/spectra/lld_emu.h Removing drivers/staging/spectra/lld_emu.c Removing drivers/staging/spectra/lld_cdma.h Removing drivers/staging/spectra/lld_cdma.c Removing drivers/staging/spectra/lld.h Removing drivers/staging/spectra/lld.c Removing drivers/staging/spectra/flash.h Removing drivers/staging/spectra/flash.c Removing drivers/staging/spectra/ffsport.h Removing drivers/staging/spectra/ffsport.c Removing drivers/staging/spectra/ffsdefs.h Removing drivers/staging/spectra/README Removing drivers/staging/spectra/Makefile Removing drivers/staging/spectra/Kconfig Removing drivers/staging/rtl8192u/ieee80211/api.c Removing drivers/staging/rtl8192e/rtl_debug.h Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_wx.c Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_ps.h Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_pm.h Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_pm.c Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_pci.h Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_debug.c Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_core.h Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_core.c Auto-merging drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c Auto-merging drivers/staging/iio/resolver/ad2s90.c Auto-merging drivers/staging/iio/resolver/ad2s1210.c Auto-merging drivers/staging/iio/resolver/ad2s1200.c Auto-merging drivers/staging/iio/meter/ade7854-spi.c Auto-merging drivers/staging/iio/meter/ade7759.c Auto-merging drivers/staging/iio/meter/ade7758_core.c Auto-merging drivers/staging/iio/meter/ade7754.c Auto-merging drivers/staging/iio/meter/ade7753.c Auto-merging drivers/staging/iio/magnetometer/hmc5843.c Auto-merging drivers/staging/iio/magnetometer/ak8975.c Auto-merging drivers/staging/iio/light/tsl2563.c Auto-merging drivers/staging/iio/light/isl29018.c Auto-merging drivers/staging/iio/industrialio-core.c CONFLICT (content): Merge conflict in drivers/staging/iio/industrialio-core.c Auto-merging drivers/staging/iio/imu/adis16400_core.c Auto-merging drivers/staging/iio/impedance-analyzer/ad5933.c Auto-merging drivers/staging/iio/gyro/adxrs450_core.c Auto-merging drivers/staging/iio/gyro/adis16260_core.c Auto-merging drivers/staging/iio/gyro/adis16130_core.c Auto-merging drivers/staging/iio/gyro/adis16080_core.c Auto-merging drivers/staging/iio/dds/ad9951.c Auto-merging drivers/staging/iio/dds/ad9910.c Auto-merging drivers/staging/iio/dds/ad9852.c Auto-merging drivers/staging/iio/dds/ad9850.c Auto-merging drivers/staging/iio/dds/ad9834.c Auto-merging drivers/staging/iio/dds/ad9832.c Auto-merging drivers/staging/iio/dds/ad5930.c Auto-merging drivers/staging/iio/dac/ad5791.c Auto-merging drivers/staging/iio/dac/ad5686.c Auto-merging drivers/staging/iio/dac/ad5624r_spi.c Auto-merging drivers/staging/iio/dac/ad5504.c Auto-merging drivers/staging/iio/dac/ad5446.c Auto-merging drivers/staging/iio/dac/ad5360.c Auto-merging drivers/staging/iio/dac/ad5064.c Removing drivers/staging/iio/chrdev.h Auto-merging drivers/staging/iio/cdc/ad7746.c Auto-merging drivers/staging/iio/cdc/ad7152.c Auto-merging drivers/staging/iio/cdc/ad7150.c Auto-merging drivers/staging/iio/buffer.h Auto-merging drivers/staging/iio/adc/max1363_core.c Auto-merging drivers/staging/iio/adc/adt7410.c Auto-merging drivers/staging/iio/adc/adt7310.c Auto-merging drivers/staging/iio/adc/ad799x_core.c CONFLICT (content): Merge conflict in drivers/staging/iio/adc/ad799x_core.c Auto-merging drivers/staging/iio/adc/ad7887_core.c Auto-merging drivers/staging/iio/adc/ad7816.c Auto-merging drivers/staging/iio/adc/ad7793.c Auto-merging drivers/staging/iio/adc/ad7780.c Auto-merging drivers/staging/iio/adc/ad7606_spi.c Auto-merging drivers/staging/iio/adcRecorded preimage for 'drivers/hid/hid-hyperv.c' Recorded preimage for 'drivers/staging/hv/Kconfig' Recorded preimage for 'drivers/staging/hv/Makefile' Resolved 'drivers/staging/iio/adc/ad799x_core.c' using previous resolution. Resolved 'drivers/staging/iio/industrialio-core.c' using previous resolution. /ad7476_core.c Auto-merging drivers/staging/iio/adc/ad7298_core.c Auto-merging drivers/staging/iio/adc/ad7291.c Auto-merging drivers/staging/iio/adc/ad7280a.c Auto-merging drivers/staging/iio/adc/ad7192.c Auto-merging drivers/staging/iio/accel/sca3000_core.c Auto-merging drivers/staging/iio/accel/lis3l02dq_core.c Auto-merging drivers/staging/iio/accel/kxsd9.c Auto-merging drivers/staging/iio/accel/adis16240_core.c Auto-merging drivers/staging/iio/accel/adis16220_core.c Auto-merging drivers/staging/iio/accel/adis16209_core.c Auto-merging drivers/staging/iio/accel/adis16204_core.c Auto-merging drivers/staging/iio/accel/adis16203_core.c Auto-merging drivers/staging/iio/accel/adis16201_core.c Auto-merging drivers/staging/hv/Makefile CONFLICT (content): Merge conflict in drivers/staging/hv/Makefile Auto-merging drivers/staging/hv/Kconfig CONFLICT (content): Merge conflict in drivers/staging/hv/Kconfig Auto-merging drivers/staging/frontier/tranzport.c Auto-merging drivers/net/hyperv/netvsc.c Auto-merging drivers/net/Makefile Auto-merging drivers/net/Kconfig Auto-merging drivers/hid/hid-hyperv.c CONFLICT (content): Merge conflict in drivers/hid/hid-hyperv.c Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/hid/hid-hyperv.c'. Recorded resolution for 'drivers/staging/hv/Kconfig'. Recorded resolution for 'drivers/staging/hv/Makefile'. [master dab08dd] Merge remote-tracking branch 'staging/staging-next' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/nvec/nvec_nvidia.txt | 9 + MAINTAINERS | 7 + drivers/net/Kconfig | 2 + drivers/net/Makefile | 2 + drivers/net/hyperv/Kconfig | 5 + drivers/net/hyperv/Makefile | 3 + drivers/{staging/hv => net/hyperv}/hyperv_net.h | 0 drivers/{staging/hv => net/hyperv}/netvsc.c | 11 +- drivers/{staging/hv => net/hyperv}/netvsc_drv.c | 0 drivers/{staging/hv => net/hyperv}/rndis_filter.c | 0 drivers/staging/Kconfig | 8 +- drivers/staging/Makefile | 4 +- drivers/staging/android/Kconfig | 95 + drivers/staging/android/Makefile | 6 + drivers/staging/android/TODO | 10 + drivers/staging/android/binder.c | 3600 ++++++++++++++++ drivers/staging/android/binder.h | 330 ++ drivers/staging/android/logger.c | 616 +++ drivers/staging/android/logger.h | 49 + drivers/staging/android/lowmemorykiller.c | 219 + drivers/staging/android/ram_console.c | 443 ++ drivers/staging/android/ram_console.h | 22 + drivers/staging/android/timed_gpio.c | 176 + drivers/staging/android/timed_gpio.h | 33 + drivers/staging/android/timed_output.c | 123 + drivers/staging/android/timed_output.h | 37 + drivers/staging/asus_oled/asus_oled.c | 4 +- drivers/staging/bcm/Bcmchar.c | 279 +- drivers/staging/bcm/InterfaceDld.c | 12 +- drivers/staging/bcm/InterfaceIdleMode.c | 33 +- drivers/staging/bcm/InterfaceInit.c | 12 +- drivers/staging/bcm/InterfaceMisc.c | 24 +- drivers/staging/bcm/Misc.c | 32 +- drivers/staging/bcm/hostmibs.c | 178 +- drivers/staging/bcm/nvm.c | 95 +- .../staging/comedi/drivers/addi-data/addi_common.c | 137 +- drivers/staging/comedi/drivers/adl_pci7230.c | 10 +- drivers/staging/comedi/drivers/adl_pci7296.c | 6 +- drivers/staging/comedi/drivers/adl_pci7432.c | 6 +- drivers/staging/comedi/drivers/adl_pci8164.c | 6 +- drivers/staging/comedi/drivers/adl_pci9111.c | 6 +- drivers/staging/comedi/drivers/adv_pci1710.c | 32 +- drivers/staging/comedi/drivers/adv_pci_dio.c | 23 +- drivers/staging/comedi/drivers/amplc_dio200.c | 9 +- drivers/staging/comedi/drivers/amplc_pc236.c | 6 +- drivers/staging/comedi/drivers/amplc_pc263.c | 6 +- drivers/staging/comedi/drivers/amplc_pci224.c | 9 +- drivers/staging/comedi/drivers/amplc_pci230.c | 9 +- drivers/staging/comedi/drivers/cb_das16_cs.c | 18 +- drivers/staging/comedi/drivers/cb_pcidas.c | 17 +- drivers/staging/comedi/drivers/cb_pcidda.c | 18 +- drivers/staging/comedi/drivers/cb_pcidio.c | 23 +- drivers/staging/comedi/drivers/cb_pcimdas.c | 50 +- drivers/staging/comedi/drivers/cb_pcimdda.c | 6 +- drivers/staging/comedi/drivers/contec_pci_dio.c | 7 +- drivers/staging/comedi/drivers/daqboard2000.c | 25 +- drivers/staging/comedi/drivers/das08.c | 6 +- drivers/staging/comedi/drivers/das08_cs.c | 8 +- drivers/staging/comedi/drivers/das16m1.c | 37 +- drivers/staging/comedi/drivers/das6402.c | 23 +- drivers/staging/comedi/drivers/das800.c | 43 +- drivers/staging/comedi/drivers/jr3_pci.c | 18 +- drivers/staging/comedi/drivers/ke_counter.c | 6 +- drivers/staging/comedi/drivers/me_daq.c | 9 +- drivers/staging/comedi/drivers/ni_daq_dio24.c | 19 +- drivers/staging/comedi/drivers/ni_labpc_cs.c | 2 +- drivers/staging/comedi/drivers/ni_pcimio.c | 29 +- drivers/staging/comedi/drivers/pcl816.c | 4 +- drivers/staging/comedi/drivers/pcl818.c | 108 +- drivers/staging/comedi/drivers/pcmmio.c | 26 +- drivers/staging/comedi/drivers/pcmuio.c | 10 +- drivers/staging/comedi/drivers/serial2002.c | 7 +- drivers/staging/cxt1e1/comet.h | 22 - drivers/staging/cxt1e1/comet_tables.c | 24 - drivers/staging/cxt1e1/comet_tables.h | 24 - drivers/staging/cxt1e1/libsbew.h | 32 - drivers/staging/cxt1e1/musycc.c | 49 - drivers/staging/cxt1e1/musycc.h | 31 - drivers/staging/cxt1e1/ossiRelease.c | 10 - drivers/staging/cxt1e1/pmc93x6_eeprom.h | 21 - drivers/staging/cxt1e1/pmcc4.h | 42 - drivers/staging/cxt1e1/pmcc4_cpld.h | 33 - drivers/staging/cxt1e1/pmcc4_defs.h | 14 - drivers/staging/cxt1e1/pmcc4_drv.c | 70 - drivers/staging/cxt1e1/pmcc4_ioctls.h | 16 - drivers/staging/cxt1e1/sbe_bid.h | 14 - drivers/staging/cxt1e1/sbe_promformat.h | 27 - drivers/staging/cxt1e1/sbecom_inline_linux.h | 20 - drivers/staging/cxt1e1/sbeproc.h | 20 - drivers/staging/cxt1e1/sbew_ioc.h | 55 - drivers/staging/et131x/et131x.c | 384 +- drivers/staging/frontier/tranzport.c | 2 +- drivers/staging/gma500/Kconfig | 2 +- drivers/staging/hv/Kconfig | 6 - drivers/staging/hv/Makefile | 2 - drivers/staging/hv/TODO | 1 - drivers/staging/hv/storvsc_drv.c | 207 +- drivers/staging/iio/Documentation/iio_utils.h | 1 + drivers/staging/iio/Documentation/sysfs-bus-iio | 10 + drivers/staging/iio/Kconfig | 1 - drivers/staging/iio/accel/adis16201_core.c | 36 +- drivers/staging/iio/accel/adis16203_core.c | 24 +- drivers/staging/iio/accel/adis16204_core.c | 35 +- drivers/staging/iio/accel/adis16209_core.c | 32 +- drivers/staging/iio/accel/adis16220_core.c | 27 +- drivers/staging/iio/accel/adis16240_core.c | 32 +- drivers/staging/iio/accel/kxsd9.c | 10 +- drivers/staging/iio/accel/lis3l02dq_core.c | 26 +- drivers/staging/iio/accel/lis3l02dq_ring.c | 3 +- drivers/staging/iio/accel/sca3000_core.c | 12 +- drivers/staging/iio/accel/sca3000_ring.c | 2 +- drivers/staging/iio/adc/ad7192.c | 39 +- drivers/staging/iio/adc/ad7280a.c | 27 +- drivers/staging/iio/adc/ad7291.c | 39 +- drivers/staging/iio/adc/ad7298_core.c | 58 +- drivers/staging/iio/adc/ad7298_ring.c | 2 +- drivers/staging/iio/adc/ad7476_core.c | 22 +- drivers/staging/iio/adc/ad7476_ring.c | 2 +- drivers/staging/iio/adc/ad7606_core.c | 4 +- drivers/staging/iio/adc/ad7606_par.c | 1 - drivers/staging/iio/adc/ad7606_ring.c | 2 +- drivers/staging/iio/adc/ad7606_spi.c | 2 +- drivers/staging/iio/adc/ad7780.c | 7 +- drivers/staging/iio/adc/ad7793.c | 53 +- drivers/staging/iio/adc/ad7816.c | 1 + drivers/staging/iio/adc/ad7887_core.c | 10 +- drivers/staging/iio/adc/ad7887_ring.c | 2 +- drivers/staging/iio/adc/ad799x_core.c | 6 +- drivers/staging/iio/adc/ad799x_ring.c | 2 +- drivers/staging/iio/adc/adt7310.c | 2 +- drivers/staging/iio/adc/adt7410.c | 1 + drivers/staging/iio/adc/max1363_core.c | 7 +- drivers/staging/iio/adc/max1363_ring.c | 2 +- drivers/staging/iio/addac/adt7316.c | 1 + drivers/staging/iio/{buffer_generic.h => buffer.h} | 1 - drivers/staging/iio/cdc/ad7150.c | 8 +- drivers/staging/iio/cdc/ad7152.c | 38 +- drivers/staging/iio/cdc/ad7746.c | 50 +- drivers/staging/iio/chrdev.h | 25 - drivers/staging/iio/dac/Kconfig | 12 +- drivers/staging/iio/dac/Makefile | 1 + drivers/staging/iio/dac/ad5064.c | 6 +- drivers/staging/iio/dac/ad5360.c | 24 +- drivers/staging/iio/dac/ad5421.c | 555 +++ drivers/staging/iio/dac/ad5421.h | 32 + drivers/staging/iio/dac/ad5446.c | 183 +- drivers/staging/iio/dac/ad5446.h | 10 +- drivers/staging/iio/dac/ad5504.c | 132 +- drivers/staging/iio/dac/ad5504.h | 5 +- drivers/staging/iio/dac/ad5624r.h | 4 +- drivers/staging/iio/dac/ad5624r_spi.c | 127 +- drivers/staging/iio/dac/ad5686.c | 5 +- drivers/staging/iio/dac/ad5791.c | 9 +- drivers/staging/iio/dds/ad5930.c | 1 + drivers/staging/iio/dds/ad9832.c | 4 +- drivers/staging/iio/dds/ad9834.c | 6 +- drivers/staging/iio/dds/ad9850.c | 1 + drivers/staging/iio/dds/ad9852.c | 1 + drivers/staging/iio/dds/ad9910.c | 1 + drivers/staging/iio/dds/ad9951.c | 1 + drivers/staging/iio/events.h | 103 + drivers/staging/iio/gyro/adis16060_core.c | 8 +- drivers/staging/iio/gyro/adis16080_core.c | 1 + drivers/staging/iio/gyro/adis16130_core.c | 1 + drivers/staging/iio/gyro/adis16260_core.c | 30 +- drivers/staging/iio/gyro/adxrs450_core.c | 9 +- drivers/staging/iio/iio.h | 109 +- drivers/staging/iio/iio_core.h | 2 +- drivers/staging/iio/iio_core_trigger.h | 3 +- drivers/staging/iio/iio_dummy_evgen.c | 4 + drivers/staging/iio/iio_simple_dummy.c | 49 +- drivers/staging/iio/iio_simple_dummy_events.c | 1 + drivers/staging/iio/impedance-analyzer/ad5933.c | 10 +- drivers/staging/iio/imu/adis16400.h | 2 + drivers/staging/iio/imu/adis16400_core.c | 269 +- drivers/staging/iio/industrialio-buffer.c | 22 +- drivers/staging/iio/industrialio-core.c | 48 +- drivers/staging/iio/industrialio-trigger.c | 34 +- drivers/staging/iio/kfifo_buf.c | 9 +- drivers/staging/iio/kfifo_buf.h | 2 +- drivers/staging/iio/light/isl29018.c | 7 +- drivers/staging/iio/light/tsl2563.c | 11 +- drivers/staging/iio/magnetometer/ak8975.c | 4 +- drivers/staging/iio/magnetometer/hmc5843.c | 5 +- drivers/staging/iio/meter/ade7753.c | 1 + drivers/staging/iio/meter/ade7754.c | 1 + drivers/staging/iio/meter/ade7758_core.c | 37 +- drivers/staging/iio/meter/ade7759.c | 1 + drivers/staging/iio/meter/ade7854-spi.c | 1 + drivers/staging/iio/resolver/ad2s1200.c | 1 + drivers/staging/iio/resolver/ad2s1210.c | 1 + drivers/staging/iio/resolver/ad2s90.c | 1 + drivers/staging/iio/ring_sw.h | 2 +- drivers/staging/iio/sysfs.h | 43 - drivers/staging/iio/types.h | 49 + drivers/staging/line6/Makefile | 3 +- drivers/staging/line6/capture.c | 15 + drivers/staging/line6/driver.c | 24 +- drivers/staging/line6/midi.c | 13 +- drivers/staging/line6/pcm.c | 36 +- drivers/staging/line6/playback.c | 15 + drivers/staging/line6/podhd.c | 158 + drivers/staging/line6/podhd.h | 30 + drivers/staging/line6/usbdefs.h | 2 + drivers/staging/lttng/Kconfig | 35 + drivers/staging/lttng/LICENSE | 27 + drivers/staging/lttng/Makefile | 33 + drivers/staging/lttng/README | 48 + drivers/staging/lttng/TODO | 137 + .../staging/lttng/instrumentation/events/README | 7 + .../instrumentation/events/lttng-module/block.h | 626 +++ .../instrumentation/events/lttng-module/irq.h | 155 + .../instrumentation/events/lttng-module/kvm.h | 312 ++ .../instrumentation/events/lttng-module/lttng.h | 34 + .../instrumentation/events/lttng-module/sched.h | 400 ++ .../instrumentation/events/lttng-module/syscalls.h | 76 + .../lttng/instrumentation/events/mainline/block.h | 569 +++ .../lttng/instrumentation/events/mainline/irq.h | 150 + .../lttng/instrumentation/events/mainline/kvm.h | 312 ++ .../lttng/instrumentation/events/mainline/sched.h | 397 ++ .../instrumentation/events/mainline/syscalls.h | 75 + .../syscalls/3.0.4/x86-64-syscalls-3.0.4 | 263 ++ .../syscalls/3.1.0-rc6/x86-32-syscalls-3.1.0-rc6 | 291 ++ .../staging/lttng/instrumentation/syscalls/README | 18 + .../syscalls/headers/compat_syscalls_integers.h | 3 + .../syscalls/headers/compat_syscalls_pointers.h | 3 + .../syscalls/headers/syscalls_integers.h | 7 + .../syscalls/headers/syscalls_integers_override.h | 14 + .../syscalls/headers/syscalls_pointers.h | 7 + .../syscalls/headers/syscalls_pointers_override.h | 4 + .../syscalls/headers/syscalls_unknown.h | 55 + .../headers/x86-32-syscalls-3.1.0-rc6_integers.h | 1163 ++++++ .../x86-32-syscalls-3.1.0-rc6_integers_override.h | 38 + .../headers/x86-32-syscalls-3.1.0-rc6_pointers.h | 2232 ++++++++++ .../x86-32-syscalls-3.1.0-rc6_pointers_override.h | 17 + .../headers/x86-64-syscalls-3.0.4_integers.h | 1013 +++++ .../x86-64-syscalls-3.0.4_integers_override.h | 3 + .../headers/x86-64-syscalls-3.0.4_pointers.h | 2076 ++++++++++ .../x86-64-syscalls-3.0.4_pointers_override.h | 5 + .../syscalls/lttng-syscalls-extractor/Makefile | 1 + .../lttng-syscalls-extractor.c | 85 + .../syscalls/lttng-syscalls-generate-headers.sh | 275 ++ drivers/staging/lttng/lib/Makefile | 11 + drivers/staging/lttng/lib/align.h | 61 + drivers/staging/lttng/lib/bitfield.h | 400 ++ drivers/staging/lttng/lib/bug.h | 29 + .../staging/lttng/lib/prio_heap/lttng_prio_heap.c | 207 + .../staging/lttng/lib/prio_heap/lttng_prio_heap.h | 117 + drivers/staging/lttng/lib/ringbuffer/api.h | 25 + drivers/staging/lttng/lib/ringbuffer/backend.h | 250 ++ .../lttng/lib/ringbuffer/backend_internal.h | 449 ++ .../staging/lttng/lib/ringbuffer/backend_types.h | 80 + drivers/staging/lttng/lib/ringbuffer/config.h | 298 ++ drivers/staging/lttng/lib/ringbuffer/frontend.h | 228 ++ .../staging/lttng/lib/ringbuffer/frontend_api.h | 358 ++ .../lttng/lib/ringbuffer/frontend_internal.h | 424 ++ .../staging/lttng/lib/ringbuffer/frontend_types.h | 176 + drivers/staging/lttng/lib/ringbuffer/iterator.h | 70 + drivers/staging/lttng/lib/ringbuffer/nohz.h | 30 + .../lttng/lib/ringbuffer/ring_buffer_backend.c | 854 ++++ .../lttng/lib/ringbuffer/ring_buffer_frontend.c | 1721 ++++++++ .../lttng/lib/ringbuffer/ring_buffer_iterator.c | 798 ++++ .../lttng/lib/ringbuffer/ring_buffer_mmap.c | 115 + .../lttng/lib/ringbuffer/ring_buffer_splice.c | 202 + .../staging/lttng/lib/ringbuffer/ring_buffer_vfs.c | 387 ++ drivers/staging/lttng/lib/ringbuffer/vatomic.h | 85 + drivers/staging/lttng/lib/ringbuffer/vfs.h | 89 + drivers/staging/lttng/ltt-context.c | 93 + drivers/staging/lttng/ltt-debugfs-abi.c | 777 ++++ drivers/staging/lttng/ltt-debugfs-abi.h | 153 + drivers/staging/lttng/ltt-endian.h | 31 + drivers/staging/lttng/ltt-events.c | 1009 +++++ drivers/staging/lttng/ltt-events.h | 452 ++ drivers/staging/lttng/ltt-probes.c | 164 + .../staging/lttng/ltt-ring-buffer-client-discard.c | 21 + .../lttng/ltt-ring-buffer-client-mmap-discard.c | 21 + .../lttng/ltt-ring-buffer-client-mmap-overwrite.c | 21 + .../lttng/ltt-ring-buffer-client-overwrite.c | 21 + drivers/staging/lttng/ltt-ring-buffer-client.h | 569 +++ .../lttng/ltt-ring-buffer-metadata-client.c | 21 + .../lttng/ltt-ring-buffer-metadata-client.h | 330 ++ .../lttng/ltt-ring-buffer-metadata-mmap-client.c | 21 + drivers/staging/lttng/ltt-tracer-core.h | 28 + drivers/staging/lttng/ltt-tracer.h | 67 + drivers/staging/lttng/lttng-calibrate.c | 30 + drivers/staging/lttng/lttng-context-nice.c | 68 + .../staging/lttng/lttng-context-perf-counters.c | 271 ++ drivers/staging/lttng/lttng-context-pid.c | 68 + drivers/staging/lttng/lttng-context-ppid.c | 71 + drivers/staging/lttng/lttng-context-prio.c | 89 + drivers/staging/lttng/lttng-context-procname.c | 72 + drivers/staging/lttng/lttng-context-tid.c | 68 + drivers/staging/lttng/lttng-context-vpid.c | 74 + drivers/staging/lttng/lttng-context-vppid.c | 79 + drivers/staging/lttng/lttng-context-vtid.c | 74 + drivers/staging/lttng/lttng-syscalls.c | 438 ++ drivers/staging/lttng/probes/Makefile | 37 + drivers/staging/lttng/probes/define_trace.h | 132 + drivers/staging/lttng/probes/lttng-events-reset.h | 84 + drivers/staging/lttng/probes/lttng-events.h | 703 ++++ drivers/staging/lttng/probes/lttng-ftrace.c | 188 + drivers/staging/lttng/probes/lttng-kprobes.c | 164 + drivers/staging/lttng/probes/lttng-kretprobes.c | 277 ++ drivers/staging/lttng/probes/lttng-probe-block.c | 31 + drivers/staging/lttng/probes/lttng-probe-irq.c | 31 + drivers/staging/lttng/probes/lttng-probe-kvm.c | 31 + drivers/staging/lttng/probes/lttng-probe-lttng.c | 24 + drivers/staging/lttng/probes/lttng-probe-sched.c | 30 + drivers/staging/lttng/probes/lttng-type-list.h | 21 + drivers/staging/lttng/probes/lttng-types.c | 49 + drivers/staging/lttng/probes/lttng-types.h | 72 + drivers/staging/lttng/probes/lttng.h | 15 + drivers/staging/lttng/wrapper/ftrace.h | 70 + drivers/staging/lttng/wrapper/inline_memcpy.h | 11 + drivers/staging/lttng/wrapper/kallsyms.h | 28 + drivers/staging/lttng/wrapper/perf.h | 32 + drivers/staging/lttng/wrapper/poll.h | 14 + drivers/staging/lttng/wrapper/ringbuffer/api.h | 1 + drivers/staging/lttng/wrapper/ringbuffer/backend.h | 1 + .../lttng/wrapper/ringbuffer/backend_internal.h | 2 + .../lttng/wrapper/ringbuffer/backend_types.h | 1 + drivers/staging/lttng/wrapper/ringbuffer/config.h | 1 + .../staging/lttng/wrapper/ringbuffer/frontend.h | 1 + .../lttng/wrapper/ringbuffer/frontend_api.h | 1 + .../lttng/wrapper/ringbuffer/frontend_internal.h | 1 + .../lttng/wrapper/ringbuffer/frontend_types.h | 1 + .../staging/lttng/wrapper/ringbuffer/iterator.h | 1 + drivers/staging/lttng/wrapper/ringbuffer/nohz.h | 1 + drivers/staging/lttng/wrapper/ringbuffer/vatomic.h | 1 + drivers/staging/lttng/wrapper/ringbuffer/vfs.h | 1 + drivers/staging/lttng/wrapper/spinlock.h | 26 + drivers/staging/lttng/wrapper/splice.c | 46 + drivers/staging/lttng/wrapper/splice.h | 23 + drivers/staging/lttng/wrapper/trace-clock.h | 75 + drivers/staging/lttng/wrapper/uuid.h | 29 + drivers/staging/lttng/wrapper/vmalloc.h | 49 + drivers/staging/mei/init.c | 35 +- drivers/staging/mei/interrupt.c | 296 +- drivers/staging/mei/iorw.c | 58 +- drivers/staging/mei/main.c | 561 +-- drivers/staging/mei/mei_dev.h | 8 - drivers/staging/mei/wd.c | 4 +- drivers/staging/nvec/nvec.c | 30 +- drivers/staging/omapdrm/Kconfig | 25 + drivers/staging/omapdrm/Makefile | 12 + drivers/staging/omapdrm/TODO | 32 + drivers/staging/omapdrm/omap_connector.c | 371 ++ drivers/staging/omapdrm/omap_crtc.c | 327 ++ drivers/staging/omapdrm/omap_drm.h | 123 + drivers/staging/omapdrm/omap_drv.c | 810 ++++ drivers/staging/omapdrm/omap_drv.h | 124 + drivers/staging/omapdrm/omap_encoder.c | 172 + drivers/staging/omapdrm/omap_fb.c | 261 ++ drivers/staging/omapdrm/omap_fbdev.c | 304 ++ drivers/staging/omapdrm/omap_gem.c | 774 ++++ drivers/staging/omapdrm/omap_gem_helpers.c | 114 + drivers/staging/omapdrm/omap_priv.h | 42 + drivers/staging/phison/phison.c | 2 +- drivers/staging/rtl8192e/Kconfig | 58 +- drivers/staging/rtl8192e/Makefile | 47 +- drivers/staging/rtl8192e/dot11d.c | 4 +- drivers/staging/rtl8192e/dot11d.h | 2 +- drivers/staging/rtl8192e/rtl8192e/Kconfig | 9 + drivers/staging/rtl8192e/rtl8192e/Makefile | 21 + .../staging/rtl8192e/{ => }/rtl8192e/r8190P_def.h | 0 .../rtl8192e/{ => }/rtl8192e/r8190P_rtl8256.c | 0 .../rtl8192e/{ => }/rtl8192e/r8190P_rtl8256.h | 0 .../rtl8192e/{ => }/rtl8192e/r8192E_cmdpkt.c | 0 .../rtl8192e/{ => }/rtl8192e/r8192E_cmdpkt.h | 0 .../staging/rtl8192e/{ => }/rtl8192e/r8192E_dev.c | 0 .../staging/rtl8192e/{ => }/rtl8192e/r8192E_dev.h | 0 .../rtl8192e/{ => }/rtl8192e/r8192E_firmware.c | 0 .../rtl8192e/{ => }/rtl8192e/r8192E_firmware.h | 0 .../staging/rtl8192e/{ => }/rtl8192e/r8192E_hw.h | 0 .../rtl8192e/{ => }/rtl8192e/r8192E_hwimg.c | 0 .../rtl8192e/{ => }/rtl8192e/r8192E_hwimg.h | 0 .../staging/rtl8192e/{ => }/rtl8192e/r8192E_phy.c | 3 +- .../staging/rtl8192e/{ => }/rtl8192e/r8192E_phy.h | 0 .../rtl8192e/{ => }/rtl8192e/r8192E_phyreg.h | 0 .../rtl8192e/{ => }/rtl8192e/r819xE_phyreg.h | 0 drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_cam.c | 0 drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_cam.h | 0 .../staging/rtl8192e/{ => }/rtl8192e/rtl_core.c | 68 +- .../staging/rtl8192e/{ => }/rtl8192e/rtl_core.h | 52 +- .../staging/rtl8192e/{ => }/rtl8192e/rtl_crypto.h | 0 .../staging/rtl8192e/{ => }/rtl8192e/rtl_debug.c | 79 - drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_dm.c | 0 drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_dm.h | 0 .../staging/rtl8192e/{ => }/rtl8192e/rtl_eeprom.c | 0 .../staging/rtl8192e/{ => }/rtl8192e/rtl_eeprom.h | 0 .../staging/rtl8192e/{ => }/rtl8192e/rtl_ethtool.c | 0 drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pci.c | 0 drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pci.h | 1 - drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pm.c | 2 - drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pm.h | 4 - drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ps.c | 0 drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ps.h | 2 +- drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_wx.c | 1 - drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_wx.h | 0 drivers/staging/rtl8192e/rtl819x_BAProc.c | 1 - drivers/staging/rtl8192e/rtl819x_HTProc.c | 5 +- drivers/staging/rtl8192e/rtl819x_TSProc.c | 1 + drivers/staging/rtl8192e/rtl_debug.h | 299 -- drivers/staging/rtl8192e/rtllib.h | 9 +- drivers/staging/rtl8192e/rtllib_crypt.c | 17 +- drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 13 +- drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 12 +- drivers/staging/rtl8192e/rtllib_crypt_wep.c | 12 +- drivers/staging/rtl8192e/rtllib_debug.h | 86 + drivers/staging/rtl8192e/rtllib_module.c | 15 +- drivers/staging/rtl8192e/rtllib_rx.c | 6 +- drivers/staging/rtl8192e/rtllib_softmac.c | 29 +- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 19 +- drivers/staging/rtl8192e/rtllib_tx.c | 1 + drivers/staging/rtl8192e/rtllib_wx.c | 16 +- drivers/staging/rtl8192u/ieee80211/api.c | 244 -- drivers/staging/rtl8712/rtl871x_mlme.c | 2 +- drivers/staging/sep/sep_driver.c | 2 + drivers/staging/serial/68360serial.c | 4 +- drivers/staging/sm7xx/smtcfb.c | 6 +- drivers/staging/speakup/kobjects.c | 3 +- drivers/staging/speakup/main.c | 5 +- drivers/staging/spectra/Kconfig | 41 - drivers/staging/spectra/Makefile | 11 - drivers/staging/spectra/README | 29 - drivers/staging/spectra/ffsdefs.h | 58 - drivers/staging/spectra/ffsport.c | 834 ---- drivers/staging/spectra/ffsport.h | 85 - drivers/staging/spectra/flash.c | 4305 -------------------- drivers/staging/spectra/flash.h | 198 - drivers/staging/spectra/lld.c | 339 -- drivers/staging/spectra/lld.h | 111 - drivers/staging/spectra/lld_cdma.c | 910 ----- drivers/staging/spectra/lld_cdma.h | 123 - drivers/staging/spectra/lld_emu.c | 776 ---- drivers/staging/spectra/lld_emu.h | 51 - drivers/staging/spectra/lld_mtd.c | 683 ---- drivers/staging/spectra/lld_mtd.h | 51 - drivers/staging/spectra/lld_nand.c | 2619 ------------ drivers/staging/spectra/lld_nand.h | 131 - drivers/staging/spectra/nand_regs.h | 619 --- drivers/staging/spectra/spectraswconfig.h | 82 - drivers/staging/tidspbridge/core/dsp-clock.c | 15 +- drivers/staging/tidspbridge/rmgr/drv_interface.c | 4 - drivers/staging/vme/TODO | 67 +- drivers/staging/vme/bridges/vme_ca91cx42.c | 13 +- drivers/staging/vme/devices/Kconfig | 12 + drivers/staging/vme/devices/Makefile | 3 + drivers/staging/vme/devices/vme_pio2.h | 249 ++ drivers/staging/vme/devices/vme_pio2_cntr.c | 71 + drivers/staging/vme/devices/vme_pio2_core.c | 524 +++ drivers/staging/vme/devices/vme_pio2_gpio.c | 232 ++ drivers/staging/vme/vme.c | 31 +- drivers/staging/vme/vme.h | 2 +- drivers/staging/vt6655/device_main.c | 6 +- drivers/staging/vt6655/ioctl.c | 8 + drivers/staging/vt6655/iwctl.c | 12 - drivers/staging/vt6655/iwctl.h | 5 - drivers/staging/vt6656/80211mgr.c | 35 +- drivers/staging/vt6656/baseband.c | 61 +- drivers/staging/vt6656/bssdb.c | 100 +- drivers/staging/vt6656/card.c | 4 +- drivers/staging/vt6656/card.h | 2 +- drivers/staging/vt6656/ioctl.c | 8 + drivers/staging/vt6656/iwctl.c | 12 - drivers/staging/vt6656/iwctl.h | 5 - drivers/staging/vt6656/main_usb.c | 12 +- drivers/staging/wlags49_h2/wl_pci.c | 13 +- drivers/staging/xgifb/Makefile | 2 +- drivers/staging/xgifb/XGI_main.h | 12 +- drivers/staging/xgifb/vb_ext.c | 444 -- drivers/staging/xgifb/vb_ext.h | 9 - drivers/staging/xgifb/vb_init.c | 45 +- drivers/staging/xgifb/vb_setmode.c | 897 ++--- drivers/staging/xgifb/vb_setmode.h | 46 - drivers/staging/xgifb/vb_struct.h | 2 +- drivers/staging/zcache/zcache-main.c | 6 +- drivers/video/omap2/omapfb/Kconfig | 2 +- 478 files changed, 40472 insertions(+), 17490 deletions(-) create mode 100644 Documentation/devicetree/bindings/nvec/nvec_nvidia.txt create mode 100644 drivers/net/hyperv/Kconfig create mode 100644 drivers/net/hyperv/Makefile rename drivers/{staging/hv => net/hyperv}/hyperv_net.h (100%) rename drivers/{staging/hv => net/hyperv}/netvsc.c (98%) rename drivers/{staging/hv => net/hyperv}/netvsc_drv.c (100%) rename drivers/{staging/hv => net/hyperv}/rndis_filter.c (100%) create mode 100644 drivers/staging/android/Kconfig create mode 100644 drivers/staging/android/Makefile create mode 100644 drivers/staging/android/TODO create mode 100644 drivers/staging/android/binder.c create mode 100644 drivers/staging/android/binder.h create mode 100644 drivers/staging/android/logger.c create mode 100644 drivers/staging/android/logger.h create mode 100644 drivers/staging/android/lowmemorykiller.c create mode 100644 drivers/staging/android/ram_console.c create mode 100644 drivers/staging/android/ram_console.h create mode 100644 drivers/staging/android/timed_gpio.c create mode 100644 drivers/staging/android/timed_gpio.h create mode 100644 drivers/staging/android/timed_output.c create mode 100644 drivers/staging/android/timed_output.h rename drivers/staging/iio/{buffer_generic.h => buffer.h} (99%) delete mode 100644 drivers/staging/iio/chrdev.h create mode 100644 drivers/staging/iio/dac/ad5421.c create mode 100644 drivers/staging/iio/dac/ad5421.h create mode 100644 drivers/staging/iio/events.h create mode 100644 drivers/staging/iio/types.h create mode 100644 drivers/staging/line6/podhd.c create mode 100644 drivers/staging/line6/podhd.h create mode 100644 drivers/staging/lttng/Kconfig create mode 100644 drivers/staging/lttng/LICENSE create mode 100644 drivers/staging/lttng/Makefile create mode 100644 drivers/staging/lttng/README create mode 100644 drivers/staging/lttng/TODO create mode 100644 drivers/staging/lttng/instrumentation/events/README create mode 100644 drivers/staging/lttng/instrumentation/events/lttng-module/block.h create mode 100644 drivers/staging/lttng/instrumentation/events/lttng-module/irq.h create mode 100644 drivers/staging/lttng/instrumentation/events/lttng-module/kvm.h create mode 100644 drivers/staging/lttng/instrumentation/events/lttng-module/lttng.h create mode 100644 drivers/staging/lttng/instrumentation/events/lttng-module/sched.h create mode 100644 drivers/staging/lttng/instrumentation/events/lttng-module/syscalls.h create mode 100644 drivers/staging/lttng/instrumentation/events/mainline/block.h create mode 100644 drivers/staging/lttng/instrumentation/events/mainline/irq.h create mode 100644 drivers/staging/lttng/instrumentation/events/mainline/kvm.h create mode 100644 drivers/staging/lttng/instrumentation/events/mainline/sched.h create mode 100644 drivers/staging/lttng/instrumentation/events/mainline/syscalls.h create mode 100644 drivers/staging/lttng/instrumentation/syscalls/3.0.4/x86-64-syscalls-3.0.4 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/3.1.0-rc6/x86-32-syscalls-3.1.0-rc6 create mode 100644 drivers/staging/lttng/instrumentation/syscalls/README create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/compat_syscalls_integers.h create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/compat_syscalls_pointers.h create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/syscalls_integers.h create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/syscalls_integers_override.h create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/syscalls_pointers.h create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/syscalls_pointers_override.h create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/syscalls_unknown.h create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_integers.h create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_integers_override.h create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_pointers.h create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_pointers_override.h create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/x86-64-syscalls-3.0.4_integers.h create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/x86-64-syscalls-3.0.4_integers_override.h create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/x86-64-syscalls-3.0.4_pointers.h create mode 100644 drivers/staging/lttng/instrumentation/syscalls/headers/x86-64-syscalls-3.0.4_pointers_override.h create mode 100644 drivers/staging/lttng/instrumentation/syscalls/lttng-syscalls-extractor/Makefile create mode 100644 drivers/staging/lttng/instrumentation/syscalls/lttng-syscalls-extractor/lttng-syscalls-extractor.c create mode 100644 drivers/staging/lttng/instrumentation/syscalls/lttng-syscalls-generate-headers.sh create mode 100644 drivers/staging/lttng/lib/Makefile create mode 100644 drivers/staging/lttng/lib/align.h create mode 100644 drivers/staging/lttng/lib/bitfield.h create mode 100644 drivers/staging/lttng/lib/bug.h create mode 100644 drivers/staging/lttng/lib/prio_heap/lttng_prio_heap.c create mode 100644 drivers/staging/lttng/lib/prio_heap/lttng_prio_heap.h create mode 100644 drivers/staging/lttng/lib/ringbuffer/api.h create mode 100644 drivers/staging/lttng/lib/ringbuffer/backend.h create mode 100644 drivers/staging/lttng/lib/ringbuffer/backend_internal.h create mode 100644 drivers/staging/lttng/lib/ringbuffer/backend_types.h create mode 100644 drivers/staging/lttng/lib/ringbuffer/config.h create mode 100644 drivers/staging/lttng/lib/ringbuffer/frontend.h create mode 100644 drivers/staging/lttng/lib/ringbuffer/frontend_api.h create mode 100644 drivers/staging/lttng/lib/ringbuffer/frontend_internal.h create mode 100644 drivers/staging/lttng/lib/ringbuffer/frontend_types.h create mode 100644 drivers/staging/lttng/lib/ringbuffer/iterator.h create mode 100644 drivers/staging/lttng/lib/ringbuffer/nohz.h create mode 100644 drivers/staging/lttng/lib/ringbuffer/ring_buffer_backend.c create mode 100644 drivers/staging/lttng/lib/ringbuffer/ring_buffer_frontend.c create mode 100644 drivers/staging/lttng/lib/ringbuffer/ring_buffer_iterator.c create mode 100644 drivers/staging/lttng/lib/ringbuffer/ring_buffer_mmap.c create mode 100644 drivers/staging/lttng/lib/ringbuffer/ring_buffer_splice.c create mode 100644 drivers/staging/lttng/lib/ringbuffer/ring_buffer_vfs.c create mode 100644 drivers/staging/lttng/lib/ringbuffer/vatomic.h create mode 100644 drivers/staging/lttng/lib/ringbuffer/vfs.h create mode 100644 drivers/staging/lttng/ltt-context.c create mode 100644 drivers/staging/lttng/ltt-debugfs-abi.c create mode 100644 drivers/staging/lttng/ltt-debugfs-abi.h create mode 100644 drivers/staging/lttng/ltt-endian.h create mode 100644 drivers/staging/lttng/ltt-events.c create mode 100644 drivers/staging/lttng/ltt-events.h create mode 100644 drivers/staging/lttng/ltt-probes.c create mode 100644 drivers/staging/lttng/ltt-ring-buffer-client-discard.c create mode 100644 drivers/staging/lttng/ltt-ring-buffer-client-mmap-discard.c create mode 100644 drivers/staging/lttng/ltt-ring-buffer-client-mmap-overwrite.c create mode 100644 drivers/staging/lttng/ltt-ring-buffer-client-overwrite.c create mode 100644 drivers/staging/lttng/ltt-ring-buffer-client.h create mode 100644 drivers/staging/lttng/ltt-ring-buffer-metadata-client.c create mode 100644 drivers/staging/lttng/ltt-ring-buffer-metadata-client.h create mode 100644 drivers/staging/lttng/ltt-ring-buffer-metadata-mmap-client.c create mode 100644 drivers/staging/lttng/ltt-tracer-core.h create mode 100644 drivers/staging/lttng/ltt-tracer.h create mode 100644 drivers/staging/lttng/lttng-calibrate.c create mode 100644 drivers/staging/lttng/lttng-context-nice.c create mode 100644 drivers/staging/lttng/lttng-context-perf-counters.c create mode 100644 drivers/staging/lttng/lttng-context-pid.c create mode 100644 drivers/staging/lttng/lttng-context-ppid.c create mode 100644 drivers/staging/lttng/lttng-context-prio.c create mode 100644 drivers/staging/lttng/lttng-context-procname.c create mode 100644 drivers/staging/lttng/lttng-context-tid.c create mode 100644 drivers/staging/lttng/lttng-context-vpid.c create mode 100644 drivers/staging/lttng/lttng-context-vppid.c create mode 100644 drivers/staging/lttng/lttng-context-vtid.c create mode 100644 drivers/staging/lttng/lttng-syscalls.c create mode 100644 drivers/staging/lttng/probes/Makefile create mode 100644 drivers/staging/lttng/probes/define_trace.h create mode 100644 drivers/staging/lttng/probes/lttng-events-reset.h create mode 100644 drivers/staging/lttng/probes/lttng-events.h create mode 100644 drivers/staging/lttng/probes/lttng-ftrace.c create mode 100644 drivers/staging/lttng/probes/lttng-kprobes.c create mode 100644 drivers/staging/lttng/probes/lttng-kretprobes.c create mode 100644 drivers/staging/lttng/probes/lttng-probe-block.c create mode 100644 drivers/staging/lttng/probes/lttng-probe-irq.c create mode 100644 drivers/staging/lttng/probes/lttng-probe-kvm.c create mode 100644 drivers/staging/lttng/probes/lttng-probe-lttng.c create mode 100644 drivers/staging/lttng/probes/lttng-probe-sched.c create mode 100644 drivers/staging/lttng/probes/lttng-type-list.h create mode 100644 drivers/staging/lttng/probes/lttng-types.c create mode 100644 drivers/staging/lttng/probes/lttng-types.h create mode 100644 drivers/staging/lttng/probes/lttng.h create mode 100644 drivers/staging/lttng/wrapper/ftrace.h create mode 100644 drivers/staging/lttng/wrapper/inline_memcpy.h create mode 100644 drivers/staging/lttng/wrapper/kallsyms.h create mode 100644 drivers/staging/lttng/wrapper/perf.h create mode 100644 drivers/staging/lttng/wrapper/poll.h create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/api.h create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/backend.h create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/backend_internal.h create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/backend_types.h create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/config.h create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/frontend.h create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/frontend_api.h create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/frontend_internal.h create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/frontend_types.h create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/iterator.h create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/nohz.h create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/vatomic.h create mode 100644 drivers/staging/lttng/wrapper/ringbuffer/vfs.h create mode 100644 drivers/staging/lttng/wrapper/spinlock.h create mode 100644 drivers/staging/lttng/wrapper/splice.c create mode 100644 drivers/staging/lttng/wrapper/splice.h create mode 100644 drivers/staging/lttng/wrapper/trace-clock.h create mode 100644 drivers/staging/lttng/wrapper/uuid.h create mode 100644 drivers/staging/lttng/wrapper/vmalloc.h create mode 100644 drivers/staging/omapdrm/Kconfig create mode 100644 drivers/staging/omapdrm/Makefile create mode 100644 drivers/staging/omapdrm/TODO create mode 100644 drivers/staging/omapdrm/omap_connector.c create mode 100644 drivers/staging/omapdrm/omap_crtc.c create mode 100644 drivers/staging/omapdrm/omap_drm.h create mode 100644 drivers/staging/omapdrm/omap_drv.c create mode 100644 drivers/staging/omapdrm/omap_drv.h create mode 100644 drivers/staging/omapdrm/omap_encoder.c create mode 100644 drivers/staging/omapdrm/omap_fb.c create mode 100644 drivers/staging/omapdrm/omap_fbdev.c create mode 100644 drivers/staging/omapdrm/omap_gem.c create mode 100644 drivers/staging/omapdrm/omap_gem_helpers.c create mode 100644 drivers/staging/omapdrm/omap_priv.h create mode 100644 drivers/staging/rtl8192e/rtl8192e/Kconfig create mode 100644 drivers/staging/rtl8192e/rtl8192e/Makefile rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8190P_def.h (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8190P_rtl8256.c (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8190P_rtl8256.h (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_cmdpkt.c (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_cmdpkt.h (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_dev.c (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_dev.h (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_firmware.c (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_firmware.h (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_hw.h (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_hwimg.c (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_hwimg.h (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_phy.c (99%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_phy.h (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_phyreg.h (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/r819xE_phyreg.h (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_cam.c (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_cam.h (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_core.c (98%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_core.h (97%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_crypto.h (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_debug.c (94%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_dm.c (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_dm.h (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_eeprom.c (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_eeprom.h (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ethtool.c (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pci.c (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pci.h (99%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pm.c (99%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pm.h (97%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ps.c (100%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ps.h (98%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_wx.c (99%) rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_wx.h (100%) delete mode 100644 drivers/staging/rtl8192e/rtl_debug.h create mode 100644 drivers/staging/rtl8192e/rtllib_debug.h delete mode 100644 drivers/staging/rtl8192u/ieee80211/api.c delete mode 100644 drivers/staging/spectra/Kconfig delete mode 100644 drivers/staging/spectra/Makefile delete mode 100644 drivers/staging/spectra/README delete mode 100644 drivers/staging/spectra/ffsdefs.h delete mode 100644 drivers/staging/spectra/ffsport.c delete mode 100644 drivers/staging/spectra/ffsport.h delete mode 100644 drivers/staging/spectra/flash.c delete mode 100644 drivers/staging/spectra/flash.h delete mode 100644 drivers/staging/spectra/lld.c delete mode 100644 drivers/staging/spectra/lld.h delete mode 100644 drivers/staging/spectra/lld_cdma.c delete mode 100644 drivers/staging/spectra/lld_cdma.h delete mode 100644 drivers/staging/spectra/lld_emu.c delete mode 100644 drivers/staging/spectra/lld_emu.h delete mode 100644 drivers/staging/spectra/lld_mtd.c delete mode 100644 drivers/staging/spectra/lld_mtd.h delete mode 100644 drivers/staging/spectra/lld_nand.c delete mode 100644 drivers/staging/spectra/lld_nand.h delete mode 100644 drivers/staging/spectra/nand_regs.h delete mode 100644 drivers/staging/spectra/spectraswconfig.h create mode 100644 drivers/staging/vme/devices/vme_pio2.h create mode 100644 drivers/staging/vme/devices/vme_pio2_cntr.c create mode 100644 drivers/staging/vme/devices/vme_pio2_core.c create mode 100644 drivers/staging/vme/devices/vme_pio2_gpio.c delete mode 100644 drivers/staging/xgifb/vb_ext.c delete mode 100644 drivers/staging/xgifb/vb_ext.h Merging char-misc/char-misc-next (7f3379d misc: ad525x_dpot: Add support for SPI module device table matching) $ git merge char-misc/char-misc-next Auto-merging drivers/misc/ad525x_dpot.h Merge made by the 'recursive' strategy. drivers/misc/ad525x_dpot-i2c.c | 10 +--- drivers/misc/ad525x_dpot-spi.c | 97 ++++++++++++++++------------------------ drivers/misc/ad525x_dpot.c | 24 +++++----- drivers/misc/ad525x_dpot.h | 8 +--- 4 files changed, 53 insertions(+), 86 deletions(-) Merging bkl-config/config (4ba8216 BKL: That's all, folks) $ git merge bkl-config/config Already up-to-date. Merging tmem/tmem (665c1e6 mm: cleancache: Use __read_mostly as appropiate.) $ git merge tmem/tmem Resolved 'mm/swapfile.c' using previous resolution. Auto-merging mm/truncate.c Auto-merging mm/swapfile.c CONFLICT (content): Merge conflict in mm/swapfile.c Auto-merging mm/filemap.c Auto-merging mm/Makefile Auto-merging mm/Kconfig Auto-merging include/linux/swap.h Auto-merging fs/super.c Auto-merging fs/buffer.c Auto-merging drivers/staging/zcache/zcache-main.c Removing Documentation/ABI/testing/sysfs-kernel-mm-cleancache Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e7b2e13] Merge remote-tracking branch 'tmem/tmem' $ git diff -M --stat --summary HEAD^.. .../ABI/testing/sysfs-kernel-mm-cleancache | 11 - Documentation/vm/cleancache.txt | 41 ++-- Documentation/vm/frontswap.txt | 210 +++++++++++++++ drivers/staging/zcache/zcache-main.c | 10 +- drivers/xen/tmem.c | 10 +- fs/buffer.c | 2 +- fs/super.c | 2 +- include/linux/cleancache.h | 24 +- include/linux/frontswap.h | 126 +++++++++ include/linux/swap.h | 4 + include/linux/swapfile.h | 13 + mm/Kconfig | 17 ++ mm/Makefile | 1 + mm/cleancache.c | 98 +++----- mm/filemap.c | 2 +- mm/frontswap.c | 273 ++++++++++++++++++++ mm/page_io.c | 12 + mm/swapfile.c | 64 ++++- mm/truncate.c | 10 +- 19 files changed, 796 insertions(+), 134 deletions(-) delete mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache create mode 100644 Documentation/vm/frontswap.txt create mode 100644 include/linux/frontswap.h create mode 100644 include/linux/swapfile.h create mode 100644 mm/frontswap.c Merging writeback/writeback-for-next (16ed8d9 btrfs: fix dirtied pages accounting on sub-page writes) $ git merge writeback/writeback-for-next Auto-merging kernel/fork.c Auto-merging kernel/exit.c Auto-merging include/linux/sched.h Auto-merging fs/fs-writeback.c Merge made by the 'recursive' strategy. fs/btrfs/file.c | 3 +- fs/fs-writeback.c | 5 ++ include/linux/sched.h | 1 + include/linux/writeback.h | 4 + include/trace/events/writeback.h | 14 ++++- kernel/exit.c | 2 + kernel/fork.c | 1 + mm/page-writeback.c | 119 +++++++++++++++++++++++++++++++++----- 8 files changed, 130 insertions(+), 19 deletions(-) Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface) $ git merge arm-dt/devicetree/arm-next Already up-to-date. Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) $ git merge hwspinlock/linux-next Already up-to-date. Merging pinctrl/for-next (5becdc7 pinctrl/coh901: driver to request its pins) $ git merge pinctrl/for-next Auto-merging drivers/pinctrl/pinctrl-coh901.c Auto-merging drivers/gpio/Makefile Auto-merging drivers/gpio/Kconfig Auto-merging arch/arm/mach-u300/core.c Merge made by the 'recursive' strategy. Documentation/pinctrl.txt | 124 +++++++------ arch/arm/mach-u300/Kconfig | 2 +- arch/arm/mach-u300/core.c | 2 +- arch/arm/mach-u300/include/mach/gpio-u300.h | 115 ----------- arch/arm/mach-u300/include/mach/irqs.h | 2 +- arch/arm/mach-u300/mmc.c | 2 +- arch/arm/mach-u300/u300-gpio.h | 114 +++++++++++ drivers/gpio/Kconfig | 9 - drivers/gpio/Makefile | 1 - drivers/pinctrl/Kconfig | 9 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/core.c | 40 ++++- drivers/pinctrl/core.h | 4 +- .../{gpio/gpio-u300.c => pinctrl/pinctrl-coh901.c} | 21 ++ drivers/pinctrl/pinmux-sirf.c | 6 +- drivers/pinctrl/pinmux-u300.c | 46 ++++-- drivers/pinctrl/pinmux.c | 202 +++++++++++++------- include/linux/pinctrl/machine.h | 2 +- include/linux/pinctrl/pinctrl.h | 2 + include/linux/pinctrl/pinmux.h | 29 +++- 20 files changed, 459 insertions(+), 274 deletions(-) create mode 100644 arch/arm/mach-u300/u300-gpio.h rename drivers/{gpio/gpio-u300.c => pinctrl/pinctrl-coh901.c} (98%) Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h) $ git merge moduleh/for-sfr Already up-to-date. Merging vhost/linux-next (cf64b8c frv: switch to GENERIC_PCI_IOMAP) $ git merge vhost/linux-next Resolved 'arch/hexagon/Kconfig' using previous resolution. Resolved 'arch/m68k/Kconfig' using previous resolution. Auto-merging lib/Makefile Auto-merging lib/Kconfig Auto-merging include/asm-generic/io.h Auto-merging arch/x86/Kconfig Auto-merging arch/powerpc/Kconfig Auto-merging arch/mips/Kconfig Auto-merging arch/m68k/Kconfig CONFLICT (content): Merge conflict in arch/m68k/Kconfig Auto-merging arch/hexagon/Kconfig CONFLICT (content): Merge conflict in arch/hexagon/Kconfig Removing arch/frv/mb93090-mb00/pci-iomap.c Auto-merging arch/frv/Kconfig Auto-merging arch/arm/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 88a6cf6] Merge remote-tracking branch 'vhost/linux-next' $ git diff -M --stat --summary HEAD^.. arch/alpha/Kconfig | 5 +--- arch/alpha/kernel/pci.c | 26 +------------------- arch/arm/Kconfig | 1 + arch/arm/include/asm/io.h | 2 +- arch/arm/mm/iomap.c | 21 ---------------- arch/cris/Kconfig | 5 +--- arch/frv/Kconfig | 1 + arch/frv/include/asm/io.h | 2 +- arch/frv/mb93090-mb00/Makefile | 2 +- arch/frv/mb93090-mb00/pci-iomap.c | 29 ---------------------- arch/hexagon/Kconfig | 4 +-- arch/ia64/Kconfig | 5 +--- arch/m68k/Kconfig | 4 +-- arch/microblaze/Kconfig | 1 + arch/microblaze/pci/iomap.c | 19 -------------- arch/mips/Kconfig | 1 + arch/mips/lib/iomap-pci.c | 26 -------------------- arch/openrisc/Kconfig | 3 -- arch/parisc/Kconfig | 1 + arch/parisc/lib/iomap.c | 23 ----------------- arch/powerpc/Kconfig | 1 + arch/powerpc/kernel/iomap.c | 19 -------------- arch/powerpc/platforms/Kconfig | 3 -- arch/score/Kconfig | 4 +-- arch/sh/Kconfig | 4 +-- arch/sh/drivers/pci/pci.c | 23 ----------------- arch/sparc/Kconfig | 1 + arch/sparc/include/asm/io_32.h | 5 +++- arch/sparc/include/asm/io_64.h | 5 +++- arch/sparc/lib/iomap.c | 23 ----------------- arch/tile/Kconfig | 1 + arch/tile/include/asm/io.h | 3 +- arch/tile/include/asm/pci.h | 2 +- arch/tile/kernel/pci.c | 21 ---------------- arch/unicore32/Kconfig | 4 +-- arch/x86/Kconfig | 4 +-- include/asm-generic/io.h | 4 +- include/asm-generic/iomap.h | 9 ++---- include/asm-generic/pci_iomap.h | 25 +++++++++++++++++++ lib/Kconfig | 7 +++++ lib/Makefile | 1 + lib/iomap.c | 38 +--------------------------- lib/pci_iomap.c | 48 +++++++++++++++++++++++++++++++++++++ 43 files changed, 120 insertions(+), 316 deletions(-) delete mode 100644 arch/frv/mb93090-mb00/pci-iomap.c create mode 100644 include/asm-generic/pci_iomap.h create mode 100644 lib/pci_iomap.c Merging kvmtool/master (1fbd119 kvm tools: Drop write operation in ro_ops_nowrite) $ git merge kvmtool/master Resolved 'include/net/9p/9p.h' using previous resolution. Resolved 'scripts/kconfig/Makefile' using previous resolution. Auto-merging scripts/kconfig/Makefile CONFLICT (content): Merge conflict in scripts/kconfig/Makefile Auto-merging include/net/9p/9p.h CONFLICT (content): Merge conflict in include/net/9p/9p.h Auto-merging arch/x86/Kconfig Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 0538222] Merge remote-tracking branch 'kvmtool/master' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 8 + arch/x86/Kconfig | 30 + scripts/kconfig/Makefile | 6 +- tools/kvm/.gitignore | 10 + tools/kvm/CREDITS-Git | 30 + tools/kvm/Documentation/kernel-debugging.txt | 15 + tools/kvm/Documentation/kvm-balloon.txt | 24 + tools/kvm/Documentation/kvm-debug.txt | 16 + tools/kvm/Documentation/kvm-list.txt | 16 + tools/kvm/Documentation/kvm-pause.txt | 16 + tools/kvm/Documentation/kvm-resume.txt | 16 + tools/kvm/Documentation/kvm-run.txt | 62 ++ tools/kvm/Documentation/kvm-setup.txt | 15 + tools/kvm/Documentation/kvm-stat.txt | 19 + tools/kvm/Documentation/kvm-stop.txt | 16 + tools/kvm/Documentation/kvm-version.txt | 21 + tools/kvm/Makefile | 306 ++++++ tools/kvm/README | 109 ++ tools/kvm/bios.c | 174 +++ tools/kvm/bios/.gitignore | 3 + tools/kvm/bios/bios-rom.S | 12 + tools/kvm/bios/e820.c | 72 ++ tools/kvm/bios/entry.S | 92 ++ tools/kvm/bios/gen-offsets.sh | 14 + tools/kvm/bios/int10.c | 110 ++ tools/kvm/bios/int15.c | 18 + tools/kvm/bios/local.S | 7 + tools/kvm/bios/macro.S | 25 + tools/kvm/bios/memcpy.c | 23 + tools/kvm/bios/rom.ld.S | 17 + tools/kvm/builtin-balloon.c | 90 ++ tools/kvm/builtin-debug.c | 89 ++ tools/kvm/builtin-help.c | 62 ++ tools/kvm/builtin-list.c | 156 +++ tools/kvm/builtin-pause.c | 78 ++ tools/kvm/builtin-resume.c | 78 ++ tools/kvm/builtin-run.c | 1002 ++++++++++++++++++ tools/kvm/builtin-setup.c | 241 +++++ tools/kvm/builtin-stat.c | 131 +++ tools/kvm/builtin-stop.c | 78 ++ tools/kvm/builtin-version.c | 15 + tools/kvm/code16gcc.h | 15 + tools/kvm/command-list.txt | 14 + tools/kvm/config/feature-tests.mak | 168 +++ tools/kvm/config/utilities.mak | 188 ++++ tools/kvm/cpuid.c | 55 + tools/kvm/disk/blk.c | 39 + tools/kvm/disk/core.c | 242 +++++ tools/kvm/disk/qcow.c | 1454 ++++++++++++++++++++++++++ tools/kvm/disk/raw.c | 140 +++ tools/kvm/framebuffer.c | 68 ++ tools/kvm/guest/init.c | 46 + tools/kvm/guest/passwd | 1 + tools/kvm/guest_compat.c | 104 ++ tools/kvm/hw/i8042.c | 348 ++++++ tools/kvm/hw/pci-shmem.c | 261 +++++ tools/kvm/hw/rtc.c | 118 +++ tools/kvm/hw/serial.c | 364 +++++++ tools/kvm/hw/vesa.c | 77 ++ tools/kvm/include/asm/hweight.h | 8 + tools/kvm/include/bios/memcpy.h | 9 + tools/kvm/include/kvm/8250-serial.h | 10 + tools/kvm/include/kvm/apic.h | 17 + tools/kvm/include/kvm/assembly.h | 24 + tools/kvm/include/kvm/barrier.h | 15 + tools/kvm/include/kvm/bios-export.h | 13 + tools/kvm/include/kvm/bios.h | 88 ++ tools/kvm/include/kvm/boot-protocol.h | 16 + tools/kvm/include/kvm/brlock.h | 41 + tools/kvm/include/kvm/builtin-balloon.h | 7 + tools/kvm/include/kvm/builtin-debug.h | 7 + tools/kvm/include/kvm/builtin-help.h | 6 + tools/kvm/include/kvm/builtin-list.h | 7 + tools/kvm/include/kvm/builtin-pause.h | 7 + tools/kvm/include/kvm/builtin-resume.h | 7 + tools/kvm/include/kvm/builtin-run.h | 7 + tools/kvm/include/kvm/builtin-setup.h | 9 + tools/kvm/include/kvm/builtin-stat.h | 7 + tools/kvm/include/kvm/builtin-stop.h | 7 + tools/kvm/include/kvm/builtin-version.h | 6 + tools/kvm/include/kvm/compiler.h | 6 + tools/kvm/include/kvm/cpufeature.h | 41 + tools/kvm/include/kvm/disk-image.h | 81 ++ tools/kvm/include/kvm/e820.h | 12 + tools/kvm/include/kvm/framebuffer.h | 34 + tools/kvm/include/kvm/guest_compat.h | 9 + tools/kvm/include/kvm/i8042.h | 12 + tools/kvm/include/kvm/interrupt.h | 26 + tools/kvm/include/kvm/ioeventfd.h | 27 + tools/kvm/include/kvm/ioport.h | 65 ++ tools/kvm/include/kvm/irq.h | 31 + tools/kvm/include/kvm/kvm-cmd.h | 17 + tools/kvm/include/kvm/kvm-cpu.h | 46 + tools/kvm/include/kvm/kvm-ipc.h | 27 + tools/kvm/include/kvm/kvm.h | 108 ++ tools/kvm/include/kvm/mptable.h | 8 + tools/kvm/include/kvm/mutex.h | 33 + tools/kvm/include/kvm/parse-options.h | 213 ++++ tools/kvm/include/kvm/pci-shmem.h | 28 + tools/kvm/include/kvm/pci.h | 74 ++ tools/kvm/include/kvm/qcow.h | 133 +++ tools/kvm/include/kvm/rbtree-interval.h | 27 + tools/kvm/include/kvm/read-write.h | 43 + tools/kvm/include/kvm/rtc.h | 6 + tools/kvm/include/kvm/rwsem.h | 39 + tools/kvm/include/kvm/sdl.h | 17 + tools/kvm/include/kvm/segment.h | 21 + tools/kvm/include/kvm/strbuf.h | 6 + tools/kvm/include/kvm/symbol.h | 22 + tools/kvm/include/kvm/term.h | 18 + tools/kvm/include/kvm/threadpool.h | 37 + tools/kvm/include/kvm/types.h | 7 + tools/kvm/include/kvm/uip.h | 358 +++++++ tools/kvm/include/kvm/util.h | 78 ++ tools/kvm/include/kvm/vesa.h | 18 + tools/kvm/include/kvm/virtio-9p.h | 74 ++ tools/kvm/include/kvm/virtio-balloon.h | 8 + tools/kvm/include/kvm/virtio-blk.h | 13 + tools/kvm/include/kvm/virtio-console.h | 9 + tools/kvm/include/kvm/virtio-net.h | 22 + tools/kvm/include/kvm/virtio-pci-dev.h | 37 + tools/kvm/include/kvm/virtio-pci.h | 49 + tools/kvm/include/kvm/virtio-rng.h | 9 + tools/kvm/include/kvm/virtio-trans.h | 43 + tools/kvm/include/kvm/virtio.h | 68 ++ tools/kvm/include/kvm/vnc.h | 14 + tools/kvm/include/linux/bitops.h | 33 + tools/kvm/include/linux/byteorder.h | 7 + tools/kvm/include/linux/kernel.h | 39 + tools/kvm/include/linux/module.h | 6 + tools/kvm/include/linux/prefetch.h | 6 + tools/kvm/include/linux/types.h | 50 + tools/kvm/interrupt.c | 27 + tools/kvm/ioeventfd.c | 128 +++ tools/kvm/ioport.c | 192 ++++ tools/kvm/irq.c | 193 ++++ tools/kvm/kvm-cmd.c | 91 ++ tools/kvm/kvm-cpu.c | 523 +++++++++ tools/kvm/kvm-ipc.c | 171 +++ tools/kvm/kvm.c | 821 +++++++++++++++ tools/kvm/main.c | 19 + tools/kvm/mmio.c | 132 +++ tools/kvm/mptable.c | 284 +++++ tools/kvm/net/uip/arp.c | 30 + tools/kvm/net/uip/buf.c | 114 ++ tools/kvm/net/uip/core.c | 190 ++++ tools/kvm/net/uip/csum.c | 92 ++ tools/kvm/net/uip/dhcp.c | 203 ++++ tools/kvm/net/uip/icmp.c | 29 + tools/kvm/net/uip/ipv4.c | 29 + tools/kvm/net/uip/tcp.c | 317 ++++++ tools/kvm/net/uip/udp.c | 236 +++++ tools/kvm/pci.c | 169 +++ tools/kvm/read-write.c | 344 ++++++ tools/kvm/symbol.c | 98 ++ tools/kvm/term.c | 170 +++ tools/kvm/tests/Makefile | 19 + tools/kvm/tests/boot/Makefile | 13 + tools/kvm/tests/boot/init.c | 11 + tools/kvm/tests/kernel/.gitignore | 2 + tools/kvm/tests/kernel/Makefile | 20 + tools/kvm/tests/kernel/README | 16 + tools/kvm/tests/kernel/kernel.S | 8 + tools/kvm/tests/pit/.gitignore | 2 + tools/kvm/tests/pit/Makefile | 20 + tools/kvm/tests/pit/README | 16 + tools/kvm/tests/pit/tick.S | 109 ++ tools/kvm/threadpool.c | 146 +++ tools/kvm/ui/sdl.c | 280 +++++ tools/kvm/ui/vnc.c | 218 ++++ tools/kvm/util.c | 101 ++ tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 + tools/kvm/util/generate-cmdlist.sh | 23 + tools/kvm/util/kvm-ifup-vbr0 | 6 + tools/kvm/util/parse-options.c | 577 ++++++++++ tools/kvm/util/rbtree-interval.c | 90 ++ tools/kvm/util/set_private_br.sh | 51 + tools/kvm/util/strbuf.c | 13 + tools/kvm/virtio/9p-pdu.c | 287 +++++ tools/kvm/virtio/9p.c | 1320 +++++++++++++++++++++++ tools/kvm/virtio/balloon.c | 268 +++++ tools/kvm/virtio/blk.c | 273 +++++ tools/kvm/virtio/console.c | 204 ++++ tools/kvm/virtio/core.c | 166 +++ tools/kvm/virtio/net.c | 550 ++++++++++ tools/kvm/virtio/pci.c | 347 ++++++ tools/kvm/virtio/rng.c | 189 ++++ tools/kvm/virtio/trans.c | 22 + 188 files changed, 19565 insertions(+), 1 deletions(-) create mode 100644 tools/kvm/.gitignore create mode 100644 tools/kvm/CREDITS-Git create mode 100644 tools/kvm/Documentation/kernel-debugging.txt create mode 100644 tools/kvm/Documentation/kvm-balloon.txt create mode 100644 tools/kvm/Documentation/kvm-debug.txt create mode 100644 tools/kvm/Documentation/kvm-list.txt create mode 100644 tools/kvm/Documentation/kvm-pause.txt create mode 100644 tools/kvm/Documentation/kvm-resume.txt create mode 100644 tools/kvm/Documentation/kvm-run.txt create mode 100644 tools/kvm/Documentation/kvm-setup.txt create mode 100644 tools/kvm/Documentation/kvm-stat.txt create mode 100644 tools/kvm/Documentation/kvm-stop.txt create mode 100644 tools/kvm/Documentation/kvm-version.txt create mode 100644 tools/kvm/Makefile create mode 100644 tools/kvm/README create mode 100644 tools/kvm/bios.c create mode 100644 tools/kvm/bios/.gitignore create mode 100644 tools/kvm/bios/bios-rom.S create mode 100644 tools/kvm/bios/e820.c create mode 100644 tools/kvm/bios/entry.S create mode 100644 tools/kvm/bios/gen-offsets.sh create mode 100644 tools/kvm/bios/int10.c create mode 100644 tools/kvm/bios/int15.c create mode 100644 tools/kvm/bios/local.S create mode 100644 tools/kvm/bios/macro.S create mode 100644 tools/kvm/bios/memcpy.c create mode 100644 tools/kvm/bios/rom.ld.S create mode 100644 tools/kvm/builtin-balloon.c create mode 100644 tools/kvm/builtin-debug.c create mode 100644 tools/kvm/builtin-help.c create mode 100644 tools/kvm/builtin-list.c create mode 100644 tools/kvm/builtin-pause.c create mode 100644 tools/kvm/builtin-resume.c create mode 100644 tools/kvm/builtin-run.c create mode 100644 tools/kvm/builtin-setup.c create mode 100644 tools/kvm/builtin-stat.c create mode 100644 tools/kvm/builtin-stop.c create mode 100644 tools/kvm/builtin-version.c create mode 100644 tools/kvm/code16gcc.h create mode 100644 tools/kvm/command-list.txt create mode 100644 tools/kvm/config/feature-tests.mak create mode 100644 tools/kvm/config/utilities.mak create mode 100644 tools/kvm/cpuid.c create mode 100644 tools/kvm/disk/blk.c create mode 100644 tools/kvm/disk/core.c create mode 100644 tools/kvm/disk/qcow.c create mode 100644 tools/kvm/disk/raw.c create mode 100644 tools/kvm/framebuffer.c create mode 100644 tools/kvm/guest/init.c create mode 100644 tools/kvm/guest/passwd create mode 100644 tools/kvm/guest_compat.c create mode 100644 tools/kvm/hw/i8042.c create mode 100644 tools/kvm/hw/pci-shmem.c create mode 100644 tools/kvm/hw/rtc.c create mode 100644 tools/kvm/hw/serial.c create mode 100644 tools/kvm/hw/vesa.c create mode 100644 tools/kvm/include/asm/hweight.h create mode 100644 tools/kvm/include/bios/memcpy.h create mode 100644 tools/kvm/include/kvm/8250-serial.h create mode 100644 tools/kvm/include/kvm/apic.h create mode 100644 tools/kvm/include/kvm/assembly.h create mode 100644 tools/kvm/include/kvm/barrier.h create mode 100644 tools/kvm/include/kvm/bios-export.h create mode 100644 tools/kvm/include/kvm/bios.h create mode 100644 tools/kvm/include/kvm/boot-protocol.h create mode 100644 tools/kvm/include/kvm/brlock.h create mode 100644 tools/kvm/include/kvm/builtin-balloon.h create mode 100644 tools/kvm/include/kvm/builtin-debug.h create mode 100644 tools/kvm/include/kvm/builtin-help.h create mode 100644 tools/kvm/include/kvm/builtin-list.h create mode 100644 tools/kvm/include/kvm/builtin-pause.h create mode 100644 tools/kvm/include/kvm/builtin-resume.h create mode 100644 tools/kvm/include/kvm/builtin-run.h create mode 100644 tools/kvm/include/kvm/builtin-setup.h create mode 100644 tools/kvm/include/kvm/builtin-stat.h create mode 100644 tools/kvm/include/kvm/builtin-stop.h create mode 100644 tools/kvm/include/kvm/builtin-version.h create mode 100644 tools/kvm/include/kvm/compiler.h create mode 100644 tools/kvm/include/kvm/cpufeature.h create mode 100644 tools/kvm/include/kvm/disk-image.h create mode 100644 tools/kvm/include/kvm/e820.h create mode 100644 tools/kvm/include/kvm/framebuffer.h create mode 100644 tools/kvm/include/kvm/guest_compat.h create mode 100644 tools/kvm/include/kvm/i8042.h create mode 100644 tools/kvm/include/kvm/interrupt.h create mode 100644 tools/kvm/include/kvm/ioeventfd.h create mode 100644 tools/kvm/include/kvm/ioport.h create mode 100644 tools/kvm/include/kvm/irq.h create mode 100644 tools/kvm/include/kvm/kvm-cmd.h create mode 100644 tools/kvm/include/kvm/kvm-cpu.h create mode 100644 tools/kvm/include/kvm/kvm-ipc.h create mode 100644 tools/kvm/include/kvm/kvm.h create mode 100644 tools/kvm/include/kvm/mptable.h create mode 100644 tools/kvm/include/kvm/mutex.h create mode 100644 tools/kvm/include/kvm/parse-options.h create mode 100644 tools/kvm/include/kvm/pci-shmem.h create mode 100644 tools/kvm/include/kvm/pci.h create mode 100644 tools/kvm/include/kvm/qcow.h create mode 100644 tools/kvm/include/kvm/rbtree-interval.h create mode 100644 tools/kvm/include/kvm/read-write.h create mode 100644 tools/kvm/include/kvm/rtc.h create mode 100644 tools/kvm/include/kvm/rwsem.h create mode 100644 tools/kvm/include/kvm/sdl.h create mode 100644 tools/kvm/include/kvm/segment.h create mode 100644 tools/kvm/include/kvm/strbuf.h create mode 100644 tools/kvm/include/kvm/symbol.h create mode 100644 tools/kvm/include/kvm/term.h create mode 100644 tools/kvm/include/kvm/threadpool.h create mode 100644 tools/kvm/include/kvm/types.h create mode 100644 tools/kvm/include/kvm/uip.h create mode 100644 tools/kvm/include/kvm/util.h create mode 100644 tools/kvm/include/kvm/vesa.h create mode 100644 tools/kvm/include/kvm/virtio-9p.h create mode 100644 tools/kvm/include/kvm/virtio-balloon.h create mode 100644 tools/kvm/include/kvm/virtio-blk.h create mode 100644 tools/kvm/include/kvm/virtio-console.h create mode 100644 tools/kvm/include/kvm/virtio-net.h create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h create mode 100644 tools/kvm/include/kvm/virtio-pci.h create mode 100644 tools/kvm/include/kvm/virtio-rng.h create mode 100644 tools/kvm/include/kvm/virtio-trans.h create mode 100644 tools/kvm/include/kvm/virtio.h create mode 100644 tools/kvm/include/kvm/vnc.h create mode 100644 tools/kvm/include/linux/bitops.h create mode 100644 tools/kvm/include/linux/byteorder.h create mode 100644 tools/kvm/include/linux/kernel.h create mode 100644 tools/kvm/include/linux/module.h create mode 100644 tools/kvm/include/linux/prefetch.h create mode 100644 tools/kvm/include/linux/types.h create mode 100644 tools/kvm/interrupt.c create mode 100644 tools/kvm/ioeventfd.c create mode 100644 tools/kvm/ioport.c create mode 100644 tools/kvm/irq.c create mode 100644 tools/kvm/kvm-cmd.c create mode 100644 tools/kvm/kvm-cpu.c create mode 100644 tools/kvm/kvm-ipc.c create mode 100644 tools/kvm/kvm.c create mode 100644 tools/kvm/main.c create mode 100644 tools/kvm/mmio.c create mode 100644 tools/kvm/mptable.c create mode 100644 tools/kvm/net/uip/arp.c create mode 100644 tools/kvm/net/uip/buf.c create mode 100644 tools/kvm/net/uip/core.c create mode 100644 tools/kvm/net/uip/csum.c create mode 100644 tools/kvm/net/uip/dhcp.c create mode 100644 tools/kvm/net/uip/icmp.c create mode 100644 tools/kvm/net/uip/ipv4.c create mode 100644 tools/kvm/net/uip/tcp.c create mode 100644 tools/kvm/net/uip/udp.c create mode 100644 tools/kvm/pci.c create mode 100644 tools/kvm/read-write.c create mode 100644 tools/kvm/symbol.c create mode 100644 tools/kvm/term.c create mode 100644 tools/kvm/tests/Makefile create mode 100644 tools/kvm/tests/boot/Makefile create mode 100644 tools/kvm/tests/boot/init.c create mode 100644 tools/kvm/tests/kernel/.gitignore create mode 100644 tools/kvm/tests/kernel/Makefile create mode 100644 tools/kvm/tests/kernel/README create mode 100644 tools/kvm/tests/kernel/kernel.S create mode 100644 tools/kvm/tests/pit/.gitignore create mode 100644 tools/kvm/tests/pit/Makefile create mode 100644 tools/kvm/tests/pit/README create mode 100644 tools/kvm/tests/pit/tick.S create mode 100644 tools/kvm/threadpool.c create mode 100644 tools/kvm/ui/sdl.c create mode 100644 tools/kvm/ui/vnc.c create mode 100644 tools/kvm/util.c create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN create mode 100755 tools/kvm/util/generate-cmdlist.sh create mode 100755 tools/kvm/util/kvm-ifup-vbr0 create mode 100644 tools/kvm/util/parse-options.c create mode 100644 tools/kvm/util/rbtree-interval.c create mode 100755 tools/kvm/util/set_private_br.sh create mode 100644 tools/kvm/util/strbuf.c create mode 100644 tools/kvm/virtio/9p-pdu.c create mode 100644 tools/kvm/virtio/9p.c create mode 100644 tools/kvm/virtio/balloon.c create mode 100644 tools/kvm/virtio/blk.c create mode 100644 tools/kvm/virtio/console.c create mode 100644 tools/kvm/virtio/core.c create mode 100644 tools/kvm/virtio/net.c create mode 100644 tools/kvm/virtio/pci.c create mode 100644 tools/kvm/virtio/rng.c create mode 100644 tools/kvm/virtio/trans.c Merging scsi-post-merge/merge-base:master () $ git clone -s -l -n -q . ../rebase-tmp $ cd ../rebase-tmp $ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm From ../next * [new branch] quilt/akpm -> akpm $ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base From ../next * [new branch] quilt/akpm-base -> akpm-base $ git checkout akpm Switched to branch 'akpm' $ git rebase --onto master akpm-base First, rewinding head to replay your work on top of it... Applying: vmscan: fix initial shrinker size handling Applying: vmscan: use atomic-long for shrinker batching Applying: fs/proc/meminfo.c: fix compilation error Applying: thp: reduce khugepaged freezing latency Applying: CREDITS: update Kees's expired fingerprint and fix details Applying: cpusets: stall when updating mems_allowed for mempolicy or disjoint nodemask Applying: drivers/rtc/rtc-s3c.c: fix driver clock enable/disable balance issues Applying: memcg: update maintainers Applying: printk: avoid double lock acquire Applying: thp: add compound tail page _mapcount when mapped Applying: thp: set compound tail page _count to zero Applying: mm/migrate.c: pair unlock_page() and lock_page() when migrating huge pages Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314 Applying: acerhdf: add support for new hardware Applying: acerhdf: lowered default temp fanon/fanoff values Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver Applying: x86: fix mmap random address range Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer Applying: arch/x86/kernel/ptrace.c: quiet sparse noise Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static Applying: x86: tlb flush avoid superflous leave_mm() Applying: x86: reduce clock calibration time during slave cpu startup Applying: x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode Applying: mm/vmalloc.c: eliminate extra loop in pcpu_get_vm_areas error path Applying: mm-vmallocc-eliminate-extra-loop-in-pcpu_get_vm_areas-error-path-fix Applying: x86: mpparse: account for bus types other than ISA and PCI Applying: drivers/platform/x86/sony-laptop.c: fix scancodes Applying: drivers-platform-x86-sony-laptopc-fix-scancodes-checkpatch-fixes Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file Applying: arm, exec: remove redundant set_fs(USER_DS) Applying: intel-iommu: Fix __init section missmatch of dmar_parse_rmrr_atsr_dev Applying: hrtimers: Special-case zero length sleeps Applying: ia64, exec: remove redundant set_fs(USER_DS) Applying: kconfig: add merge_config.sh script Applying: merge_config.sh: use signal names compatible with dash and bash Applying: merge_config.sh: whitespace cleanup Applying: ipc/mqueue: cleanup definition names and locations Applying: ipc/mqueue: switch back to using non-max values on create Applying: ipc/mqueue: enforce hard limits Applying: ipc/mqueue: update maximums for the mqueue subsystem Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-fix Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes Applying: include/net/netprio_cgroup.h: various fixes Applying: debugobjects: be smarter about static objects Applying: debugobjects: extend to assert that an object is initialized Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers Applying: ext4: use proper little-endian bitops Applying: ocfs2: avoid unaligned access to dqc_bitmap Applying: parisc, exec: remove redundant set_fs(USER_DS) Applying: scsi: fix a header to include linux/types.h Applying: drivers/scsi/megaraid.c: fix sparse warnings Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb() Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user() Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements Applying: fs: remove unneeded plug in mpage_readpages() Applying: MAINTAINERS: Staging: cx25821: Add L: linux-media Applying: mm/page-writeback.c: make determine_dirtyable_memory static again Applying: vmscan: promote shared file mapped pages Applying: vmscan: activate executable pages after first usage Applying: mm: add free_hot_cold_page_list() helper Applying: mm-add-free_hot_cold_page_list-helper-v2 Applying: mm-add-free_hot_cold_page_list-helper-v3 Applying: mm: remove unused pagevec_free Applying: mm-tracepoint: rename page-free events Applying: mm-tracepoint: fix documentation and examples Applying: mm: fix page-faults detection in swap-token logic Applying: mm: add extra free kbytes tunable Applying: mm-add-extra-free-kbytes-tunable-update Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes Applying: mm: migrate: one less atomic operation Applying: mm: do not stall in synchronous compaction for THP allocations Applying: mm-do-not-stall-in-synchronous-compaction-for-thp-allocations-v3 Applying: mm: reduce the amount of work done when updating min_free_kbytes Applying: mm-reduce-the-amount-of-work-done-when-updating-min_free_kbytes-checkpatch-fixes Applying: mm: avoid livelock on !__GFP_FS allocations Applying: mm: account reaped page cache on inode cache pruning Applying: hugetlb: detect race upon page allocation failure during COW Applying: hugetlb: clarify hugetlb_instantiation_mutex usage Applying: mm/hugetlb.c: fix virtual address handling in hugetlb fault Applying: mm-hugetlbc-fix-virtual-address-handling-in-hugetlb-fault-fix Applying: kernel.h: add BUILD_BUG() macro Applying: kernel.h: Add BUILD_BUG() macro. Applying: hugetlb: replace BUG() with BUILD_BUG() for dummy definitions Applying: mm: more intensive memory corruption debugging Applying: mm-more-intensive-memory-corruption-debug-fix Applying: PM/Hibernate: do not count debug pages as savable Applying: slub: min order when debug_guardpage_minorder > 0 Applying: fadvise: only initiate writeback for specified range with FADV_DONTNEED Applying: mm, debug: test for online nid when allocating on single node Applying: vmscan: add task name to warn_scan_unevictable() messages Applying: mm: exclude reserved pages from dirtyable memory Applying: mm-exclude-reserved-pages-from-dirtyable-memory-fix Applying: mm: writeback: cleanups in preparation for per-zone dirty limits Applying: mm: try to distribute dirty pages fairly across zones Applying: mm: filemap: pass __GFP_WRITE from grab_cache_page_write_begin() Applying: Btrfs: pass __GFP_WRITE for buffered write page allocations Applying: mm: compaction: push isolate search base of compact control one pfn ahead Applying: hpet: factor timer allocate from open Applying: intel_idle: fix API misuse Applying: intel_idle: disable auto_demotion for hotplugged CPUs Applying: kernel.h: neaten panic prototype Applying: include/linux/linkage.h: remove unused NORET_AND macro Applying: treewide: remove useless NORET_TYPE macro and uses Applying: treewide: convert uses of ATTRIB_NORETURN to __noreturn Applying: treewide-convert-uses-of-attrib_noreturn-to-__noreturn-checkpatch-fixes Applying: include/linux/linkage.h: remove unused ATTRIB_NORET macro Applying: mm,slub,x86: decouple size of struct page from CONFIG_CMPXCHG_LOCAL Applying: mm,x86,um: move CMPXCHG_LOCAL config option Applying: mm,x86,um: move CMPXCHG_DOUBLE config option Applying: audit: always follow va_copy() with va_end() Applying: brlocks/lglocks: clean up code Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes Applying: include/log2.h: fix rounddown_pow_of_two(1) Applying: get_maintainers.pl: follow renames when looking up commit signers Applying: backlight: remove ADX backlight device support Applying: leds: convert led platform drivers to module_platform_driver Applying: leds: convert led i2c drivers to module_i2c_driver Applying: leds: convert leds-dac124s085 to module_spi_driver Applying: lib: add GENERIC_PCI_IOMAP Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: checkpatch: update signature "might be better as" warning Applying: checkpatch: prefer __printf over __attribute__((format(printf,...))) Applying: crc32: optimize inner loop Applying: epoll: limit paths Applying: fs: binfmt_elf: create Kconfig variable for PIE randomization Applying: MIPS: randomize PIE load address Applying: drivers/rtc/rtc-cmos.c: fix broken NVRAM bank 2 writing Applying: drivers/rtc/rtc-mxc.c: fix setting time for MX1 SoC Applying: drivers-rtc-rtc-mxcc-fix-setting-time-for-mx1-soc-fix Applying: drivers/rtc/rtc-mxc.c: make alarm work Applying: drivers-rtc-rtc-mxcc-make-alarm-work-fix Applying: rtc/ab8500: don't disable IRQ:s when suspending Applying: rtc/ab8500: set can_wake flag Applying: rtc/ab8500: change to mdelay Applying: rtc/ab8500: Add calibration attribute to AB8500 RTC Applying: rtc-ab8500-add-calibration-attribute-to-ab8500-rtc-checkpatch-fixes Applying: reiserfs: delete comments refering to the BKL Applying: reiserfs: delay reiserfs lock until journal initialization Applying: reiserfs: don't lock journal_init() Applying: reiserfs: don't lock root inode searching Applying: cgroups: add res_counter_write_u64() API Applying: cgroups: new resource counter inheritance API Applying: cgroups: add previous cgroup in can_attach_task/attach_task callbacks Applying: cgroups: new cancel_attach_task() subsystem callback Applying: cgroups: ability to stop res charge propagation on bounded ancestor Applying: cgroups: add res counter common ancestor searching Applying: res_counter: allow charge failure pointer to be null Applying: cgroups: pull up res counter charge failure interpretation to caller Applying: cgroups: allow subsystems to cancel a fork Applying: cgroups: add a task counter subsystem Applying: cgroups: ERR_PTR needs err.h Applying: cgroup: Fix task counter common ancestor logic Applying: cgroup-fix-task-counter-common-ancestor-logic-checkpatch-fixes Applying: mm: memcg: consolidate hierarchy iteration primitives Applying: mm: vmscan: distinguish global reclaim from global LRU scanning Applying: mm: vmscan: distinguish between memcg triggering reclaim and memcg being scanned Applying: mm-vmscan-distinguish-between-memcg-triggering-reclaim-and-memcg-being-scanned-checkpatch-fixes Applying: mm: memcg: per-priority per-zone hierarchy scan generations Applying: mm: move memcg hierarchy reclaim to generic reclaim code Applying: mm: memcg: remove optimization of keeping the root_mem_cgroup LRU lists empty Applying: mm: vmscan: convert global reclaim to per-memcg LRU lists Applying: mm: collect LRU list heads into struct lruvec Applying: mm: make per-memcg LRU lists exclusive Applying: mm: memcg: remove unused node/section info from pc->flags Applying: mm: memcg: remove unused node/section info from pc->flags fix Applying: memcg: make mem_cgroup_split_huge_fixup() more efficient Applying: memcg-make-mem_cgroup_split_huge_fixup-more-efficient-fix Applying: mm: memcg: shorten preempt-disabled section around event checks Applying: Documentation/cgroups/memory.txt: fix typo Applying: memcg: fix pgpgin/pgpgout documentation Applying: thp: improve the error code path Applying: thp: remove unnecessary tlb flush for mprotect Applying: thp: add tlb_remove_pmd_tlb_entry Applying: thp: improve order in lru list for split huge page Applying: procfs: make proc_get_link to use dentry instead of inode Applying: procfs: introduce the /proc//map_files/ directory Applying: procfs-introduce-the-proc-pid-map_files-directory-checkpatch-fixes Applying: procfs: parse mount options Applying: procfs: add hidepid= and gid= mount options Applying: workqueue: make alloc_workqueue() take printf fmt and args for name Applying: workqueue-make-alloc_workqueue-take-printf-fmt-and-args-for-name-fix Applying: cpumask: update setup_node_to_cpumask_map() comments Applying: kexec: remove KMSG_DUMP_KEXEC Applying: kdump: add missing RAM resource in crash_shrink_memory() Applying: kdump: add udev events for memory online/offline Applying: kdump: crashk_res init check for /sys/kernel/kexec_crash_size Applying: ipc/mqueue: simplify reading msgqueue limit Applying: ipc/sem.c: alternatives to preempt_disable() Applying: user namespace: make signal.c respect user namespaces Applying: __send_signal: pass q->info, not info, to userns_fixup_signal_uid (v2) Applying: drivers/memstick: use kmemdup rather than duplicating its implementation Applying: fs/direct-io.c: calculate fs_count correctly in get_more_blocks() Applying: vfs: cache request_queue in struct block_device Applying: dio: optimize cache misses in the submission path Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes Applying: dio: using prefetch requires including prefetch.h Applying: ramoops: fix use of rounddown_pow_of_two() Applying: ramoops: update parameters only after successful init Applying: unlzo: Fix input buffer free Applying: cpusets-stall-when-updating-mems_allowed-for-mempolicy-or-disjoint-nodemask-fix $ cd ../next $ git fetch -f ../rebase-tmp akpm:akpm From ../rebase-tmp + 8fd3cfd...0993075 akpm -> akpm (forced update) $ rm -rf ../rebase-tmp Merging akpm (0993075 cpusets-stall-when-updating-mems_allowed-for-mempolicy-or-disjoint-nodemask-fix) $ git merge --no-ff akpm Removing drivers/video/backlight/adx_bl.c Merge made by the 'recursive' strategy. CREDITS | 9 +- .../sysfs-class-rtc-rtc0-device-rtc_calibration | 12 + Documentation/DocBook/debugobjects.tmpl | 50 ++ Documentation/cgroups/cgroups.txt | 14 +- Documentation/cgroups/memory.txt | 9 +- Documentation/cgroups/resource_counter.txt | 20 +- Documentation/cgroups/task_counter.txt | 153 ++++ Documentation/filesystems/proc.txt | 39 + Documentation/kernel-parameters.txt | 19 + Documentation/laptops/sony-laptop.txt | 5 + Documentation/sysctl/vm.txt | 16 + Documentation/trace/events-kmem.txt | 12 +- .../postprocess/trace-pagealloc-postprocess.pl | 20 +- Documentation/trace/tracepoint-analysis.txt | 40 +- MAINTAINERS | 8 +- arch/Kconfig | 14 + arch/arm/Kconfig | 1 + arch/arm/include/asm/processor.h | 1 - arch/arm/mach-ux500/mbox-db5500.c | 2 +- arch/avr32/include/asm/system.h | 2 +- arch/avr32/kernel/traps.c | 2 +- arch/ia64/include/asm/processor.h | 1 - arch/ia64/kernel/machine_kexec.c | 4 +- arch/m68k/amiga/config.c | 3 +- arch/mips/Kconfig | 1 + arch/mips/include/asm/ptrace.h | 2 +- arch/mips/kernel/traps.c | 2 +- arch/mn10300/include/asm/exceptions.h | 2 +- arch/parisc/include/asm/processor.h | 2 - arch/parisc/kernel/process.c | 1 - arch/powerpc/kernel/machine_kexec_32.c | 4 +- arch/powerpc/kernel/machine_kexec_64.c | 6 +- arch/powerpc/mm/numa.c | 2 +- arch/powerpc/platforms/pseries/nvram.c | 1 - arch/s390/include/asm/processor.h | 2 +- arch/s390/kernel/nmi.c | 2 +- arch/sh/kernel/process_32.c | 2 +- arch/sh/kernel/process_64.c | 2 +- arch/tile/kernel/machine_kexec.c | 6 +- arch/x86/Kconfig | 4 + arch/x86/Kconfig.cpu | 6 - arch/x86/include/asm/mrst.h | 9 + arch/x86/kernel/e820.c | 59 +- arch/x86/kernel/mpparse.c | 2 +- arch/x86/kernel/ptrace.c | 3 +- arch/x86/kernel/rtc.c | 5 + arch/x86/kernel/smpboot.c | 16 +- arch/x86/kernel/tsc.c | 20 + arch/x86/mm/gup.c | 2 + arch/x86/mm/highmem_32.c | 2 + arch/x86/mm/mmap.c | 4 +- arch/x86/mm/numa.c | 2 +- arch/x86/mm/pageattr.c | 2 +- arch/x86/mm/tlb.c | 16 +- arch/x86/platform/iris/iris.c | 67 ++- arch/x86/um/Kconfig | 8 - block/blk-cgroup.c | 12 +- drivers/base/memory.c | 17 +- drivers/char/hpet.c | 56 ++- drivers/char/ramoops.c | 24 +- drivers/idle/intel_idle.c | 59 +- drivers/iommu/intel-iommu.c | 2 +- drivers/leds/leds-88pm860x.c | 12 +- drivers/leds/leds-adp5520.c | 12 +- drivers/leds/leds-ams-delta.c | 13 +- drivers/leds/leds-asic3.c | 16 +- drivers/leds/leds-atmel-pwm.c | 17 +- drivers/leds/leds-bd2802.c | 12 +- drivers/leds/leds-cobalt-qube.c | 17 +- drivers/leds/leds-da903x.c | 12 +- drivers/leds/leds-dac124s085.c | 13 +- drivers/leds/leds-fsg.c | 15 +- drivers/leds/leds-gpio.c | 16 +- drivers/leds/leds-hp6xx.c | 17 +- drivers/leds/leds-lm3530.c | 13 +- drivers/leds/leds-lp3944.c | 13 +- drivers/leds/leds-lp5521.c | 20 +- drivers/leds/leds-lp5523.c | 20 +- drivers/leds/leds-lt3593.c | 16 +- drivers/leds/leds-mc13783.c | 12 +- drivers/leds/leds-netxbig.c | 15 +- drivers/leds/leds-ns2.c | 15 +- drivers/leds/leds-pca9532.c | 14 +- drivers/leds/leds-pca955x.c | 13 +- drivers/leds/leds-pwm.c | 13 +- drivers/leds/leds-rb532.c | 16 +- drivers/leds/leds-regulator.c | 12 +- drivers/leds/leds-renesas-tpu.c | 13 +- drivers/leds/leds-s3c24xx.c | 13 +- drivers/leds/leds-wm831x-status.c | 12 +- drivers/leds/leds-wm8350.c | 12 +- drivers/memstick/core/mspro_block.c | 3 +- drivers/message/fusion/mptbase.c | 7 +- drivers/message/fusion/mptbase.h | 1 + drivers/mtd/mtdoops.c | 3 +- drivers/platform/x86/acerhdf.c | 67 ++- drivers/platform/x86/sony-laptop.c | 10 +- drivers/rtc/rtc-ab8500.c | 121 +++- drivers/rtc/rtc-cmos.c | 2 +- drivers/rtc/rtc-mxc.c | 123 ++-- drivers/rtc/rtc-s3c.c | 2 +- drivers/scsi/aacraid/commctrl.c | 1 + drivers/scsi/megaraid.c | 8 +- drivers/scsi/mpt2sas/mpt2sas_base.c | 3 +- drivers/scsi/sg.c | 25 +- drivers/video/backlight/Kconfig | 8 - drivers/video/backlight/Makefile | 1 - drivers/video/backlight/adx_bl.c | 182 ----- fs/Kconfig.binfmt | 3 + fs/binfmt_elf.c | 2 +- fs/block_dev.c | 3 + fs/btrfs/file.c | 2 +- fs/dcache.c | 10 +- fs/direct-io.c | 57 +- fs/eventpoll.c | 226 +++++- fs/ext4/ext4.h | 7 +- fs/ext4/ialloc.c | 4 +- fs/file_table.c | 23 +- fs/inode.c | 2 + fs/internal.h | 3 +- fs/mpage.c | 4 - fs/namei.c | 26 +- fs/namespace.c | 124 ++-- fs/ocfs2/ocfs2.h | 47 ++ fs/ocfs2/quota_local.c | 10 +- fs/pnode.c | 4 +- fs/proc/base.c | 433 +++++++++++- fs/proc/inode.c | 18 + fs/proc/internal.h | 1 + fs/proc/meminfo.c | 7 +- fs/proc/root.c | 72 ++- fs/reiserfs/bitmap.c | 3 - fs/reiserfs/journal.c | 64 +- fs/reiserfs/super.c | 54 +- include/asm-generic/tlb.h | 14 + include/linux/cgroup.h | 28 +- include/linux/cgroup_subsys.h | 6 + include/linux/compiler-gcc4.h | 1 + include/linux/compiler.h | 4 +- include/linux/debugobjects.h | 6 + include/linux/eventpoll.h | 1 + include/linux/fs.h | 5 +- include/linux/gfp.h | 34 +- include/linux/hpet.h | 1 + include/linux/huge_mm.h | 10 +- include/linux/hugetlb.h | 14 +- include/linux/ipc_namespace.h | 40 +- include/linux/kernel.h | 29 +- include/linux/kmsg_dump.h | 1 - include/linux/lglock.h | 152 +--- include/linux/linkage.h | 4 - include/linux/log2.h | 2 +- include/linux/memcontrol.h | 78 ++- include/linux/mm.h | 30 + include/linux/mm_inline.h | 21 +- include/linux/mm_types.h | 10 +- include/linux/mmzone.h | 18 +- include/linux/page-debug-flags.h | 4 +- include/linux/page_cgroup.h | 34 - include/linux/pagevec.h | 7 - include/linux/pid_namespace.h | 2 + include/linux/proc_fs.h | 2 +- include/linux/res_counter.h | 27 +- include/linux/sched.h | 2 +- include/linux/shrinker.h | 2 +- include/linux/swap.h | 37 + include/linux/workqueue.h | 47 +- include/linux/writeback.h | 3 +- include/net/netprio_cgroup.h | 38 +- include/scsi/scsi_netlink.h | 2 +- include/trace/events/kmem.h | 4 +- init/Kconfig | 9 + init/calibrate.c | 15 + ipc/mq_sysctl.c | 31 +- ipc/mqueue.c | 34 +- ipc/sem.c | 250 +++++-- kernel/Makefile | 3 +- kernel/audit.c | 5 +- kernel/cgroup.c | 89 ++- kernel/cgroup_freezer.c | 9 +- kernel/cgroup_task_counter.c | 243 ++++++ kernel/cpuset.c | 25 +- kernel/events/core.c | 5 +- kernel/exit.c | 8 +- kernel/fork.c | 8 +- kernel/hrtimer.c | 8 + kernel/kexec.c | 25 +- kernel/lglock.c | 101 +++ kernel/panic.c | 2 +- kernel/power/snapshot.c | 6 + kernel/printk.c | 3 +- kernel/res_counter.c | 97 ++- kernel/sched.c | 6 +- kernel/signal.c | 43 +- kernel/sysctl.c | 11 +- kernel/timer.c | 62 ++- kernel/workqueue.c | 32 +- lib/crc32.c | 21 +- lib/debugobjects.c | 53 ++- lib/decompress_unlzo.c | 2 +- mm/Kconfig.debug | 5 + mm/compaction.c | 4 +- mm/fadvise.c | 3 +- mm/filemap.c | 5 +- mm/huge_memory.c | 99 ++- mm/hugetlb.c | 15 +- mm/memcontrol.c | 800 +++++++++---------- mm/memory.c | 17 +- mm/migrate.c | 12 +- mm/page-writeback.c | 290 +++++--- mm/page_alloc.c | 268 ++++++-- mm/page_cgroup.c | 60 +-- mm/rmap.c | 3 +- mm/slub.c | 12 +- mm/swap.c | 38 +- mm/swapfile.c | 6 +- mm/vmalloc.c | 9 +- mm/vmscan.c | 448 +++++++----- mm/vmstat.c | 2 +- net/core/dev.c | 4 +- net/core/sock.c | 2 + net/netfilter/nf_conntrack_netlink.c | 5 + scripts/checkpatch.pl | 13 +- scripts/get_maintainer.pl | 2 +- scripts/kconfig/merge_config.sh | 117 +++ tools/perf/Documentation/examples.txt | 34 +- 226 files changed, 4707 insertions(+), 2572 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration create mode 100644 Documentation/cgroups/task_counter.txt delete mode 100644 drivers/video/backlight/adx_bl.c create mode 100644 kernel/cgroup_task_counter.c create mode 100644 kernel/lglock.c create mode 100644 scripts/kconfig/merge_config.sh $ git revert 56850055c5fd [master a3a0e7c] Revert "include/net/netprio_cgroup.h: various fixes" 3 files changed, 19 insertions(+), 25 deletions(-)