diff options
Diffstat (limited to 'Next/merge.log')
-rw-r--r-- | Next/merge.log | 3402 |
1 files changed, 3402 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..494b46c9b897 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3402 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at a952baa Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input +Merging origin/master +$ git merge origin/master +Updating a952baa..eddecbb +Fast-forward + Documentation/ABI/testing/pstore | 12 +- + Documentation/ABI/testing/sysfs-fs-pstore | 7 - + .../devicetree/bindings/hwmon/ads1015.txt | 73 ++ + Documentation/devicetree/bindings/open-pic.txt | 98 ++ + Documentation/feature-removal-schedule.txt | 19 +- + .../filesystems/xfs-delayed-logging-design.txt | 7 - + Documentation/hwmon/ads1015 | 72 ++ + Documentation/hwmon/lm75 | 5 + + Documentation/hwmon/sch5627 | 22 + + Documentation/hwmon/w83795 | 127 +++ + Documentation/i2c/busses/i2c-i801 | 3 +- + Documentation/i2c/instantiating-devices | 2 +- + Documentation/i2c/upgrading-clients | 18 +- + Documentation/kbuild/kbuild.txt | 5 + + Documentation/{hwmon => laptops}/hpfall.c | 0 + Documentation/{hwmon => misc-devices}/lis3lv02d | 4 +- + Documentation/video4linux/Zoran | 2 +- + MAINTAINERS | 21 +- + Makefile | 14 +- + arch/arm/boot/compressed/Makefile | 4 +- + arch/arm/vfp/Makefile | 4 +- + arch/h8300/boot/compressed/Makefile | 2 +- + arch/ia64/kvm/Makefile | 4 +- + arch/ia64/sn/kernel/Makefile | 2 +- + arch/ia64/sn/kernel/sn2/Makefile | 2 +- + arch/ia64/sn/pci/Makefile | 2 +- + arch/ia64/sn/pci/pcibr/Makefile | 2 +- + arch/ia64/uv/kernel/Makefile | 2 +- + arch/microblaze/kernel/cpu/Makefile | 2 +- + arch/mips/Makefile | 4 +- + arch/mips/bcm63xx/boards/Makefile | 2 +- + arch/mips/fw/arc/Makefile | 2 +- + arch/mips/jz4740/Makefile | 2 +- + arch/mips/oprofile/Makefile | 2 +- + arch/mips/pmc-sierra/yosemite/Makefile | 2 +- + arch/mips/powertv/Makefile | 2 +- + arch/mips/powertv/asic/Makefile | 2 +- + arch/mips/powertv/pci/Makefile | 2 +- + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/cacheflush.h | 31 +- + arch/parisc/include/asm/irq.h | 13 +- + arch/parisc/include/asm/pgtable.h | 14 +- + arch/parisc/kernel/cache.c | 109 +-- + arch/parisc/kernel/entry.S | 217 +++-- + arch/parisc/kernel/irq.c | 64 +- + arch/parisc/kernel/pacache.S | 245 ++--- + arch/powerpc/include/asm/mpic.h | 4 + + arch/powerpc/include/asm/ptrace.h | 2 + + arch/powerpc/kernel/pci_dn.c | 7 +- + arch/powerpc/kernel/ptrace.c | 15 +- + arch/powerpc/sysdev/mpic.c | 85 ++- + arch/s390/boot/Makefile | 2 +- + arch/s390/kvm/Makefile | 2 +- + arch/s390/math-emu/Makefile | 2 +- + arch/sparc/include/asm/irq_32.h | 3 + + arch/sparc/include/asm/irq_64.h | 2 + + arch/sparc/include/asm/unistd.h | 5 +- + arch/sparc/kernel/of_device_common.c | 27 + + arch/sparc/kernel/systbls_32.S | 2 +- + arch/sparc/kernel/systbls_64.S | 4 +- + arch/tile/lib/atomic_32.c | 12 +- + arch/um/sys-ppc/Makefile | 10 +- + arch/x86/ia32/ia32entry.S | 1 + + arch/x86/include/asm/unistd_32.h | 3 +- + arch/x86/include/asm/unistd_64.h | 2 + + arch/x86/kernel/syscall_table_32.S | 1 + + arch/xtensa/boot/Makefile | 2 +- + arch/xtensa/boot/lib/Makefile | 2 +- + drivers/char/mwave/Makefile | 4 +- + drivers/char/mwave/README | 2 +- + drivers/dma/Makefile | 8 +- + drivers/firewire/Kconfig | 3 +- + drivers/firewire/core-card.c | 21 +- + drivers/firewire/core-cdev.c | 54 +- + drivers/firewire/core-device.c | 22 +- + drivers/firewire/core-iso.c | 22 +- + drivers/firewire/core-topology.c | 2 +- + drivers/firewire/ohci.c | 85 ++- + drivers/firewire/sbp2.c | 11 +- + drivers/hwmon/Kconfig | 85 +-- + drivers/hwmon/Makefile | 9 +- + drivers/hwmon/abituguru.c | 4 +- + drivers/hwmon/abituguru3.c | 4 +- + drivers/hwmon/ads1015.c | 337 ++++++ + drivers/hwmon/lm75.c | 66 +- + drivers/hwmon/sch5627.c | 858 ++++++++++++++++ + drivers/hwmon/sht15.c | 6 +- + drivers/i2c/Makefile | 1 + + drivers/i2c/busses/Kconfig | 3 +- + drivers/i2c/busses/i2c-i801.c | 4 +- + drivers/i2c/i2c-boardinfo.c | 2 +- + drivers/i2c/i2c-core.c | 28 +- + drivers/i2c/i2c-dev.c | 60 +- + drivers/ide/Makefile | 2 +- + drivers/ieee802154/Makefile | 2 +- + drivers/isdn/hisax/Makefile | 2 +- + drivers/memstick/Makefile | 4 +- + drivers/memstick/core/Makefile | 4 - + drivers/memstick/host/Makefile | 4 - + drivers/message/fusion/Makefile | 2 +- + drivers/misc/Kconfig | 9 + + drivers/misc/Makefile | 1 + + drivers/misc/cb710/Makefile | 4 +- + drivers/misc/lis3lv02d/Kconfig | 37 + + drivers/misc/lis3lv02d/Makefile | 7 + + drivers/{hwmon => misc/lis3lv02d}/lis3lv02d.c | 3 +- + drivers/{hwmon => misc/lis3lv02d}/lis3lv02d.h | 0 + drivers/{hwmon => misc/lis3lv02d}/lis3lv02d_i2c.c | 2 +- + drivers/{hwmon => misc/lis3lv02d}/lis3lv02d_spi.c | 0 + drivers/misc/sgi-gru/Makefile | 4 +- + drivers/net/caif/Makefile | 4 +- + drivers/net/r8169.c | 4 +- + drivers/net/skfp/Makefile | 2 +- + drivers/net/wan/lmc/Makefile | 2 +- + drivers/net/wireless/hostap/hostap_config.h | 4 +- + drivers/net/wireless/zd1211rw/Makefile | 4 +- + drivers/parisc/dino.c | 22 +- + drivers/parisc/eisa.c | 12 +- + drivers/parisc/gsc.c | 22 +- + drivers/parisc/iosapic.c | 40 +- + drivers/parisc/superio.c | 12 +- + drivers/platform/x86/Kconfig | 18 + + drivers/platform/x86/Makefile | 1 + + drivers/{hwmon => platform/x86}/hp_accel.c | 7 +- + drivers/pps/clients/Makefile | 4 +- + drivers/rapidio/Makefile | 4 +- + drivers/rapidio/switches/Makefile | 4 - + drivers/rtc/Makefile | 4 +- + drivers/scsi/aacraid/Makefile | 2 +- + drivers/scsi/aic94xx/Makefile | 4 +- + drivers/scsi/libsas/Makefile | 2 +- + drivers/scsi/lpfc/Makefile | 6 +- + drivers/scsi/mvsas/Makefile | 4 +- + drivers/scsi/pcmcia/Makefile | 2 +- + drivers/scsi/scsi_error.c | 94 +- + drivers/video/intelfb/Makefile | 5 +- + drivers/video/matrox/matroxfb_base.c | 9 - + fs/affs/Makefile | 2 +- + fs/bfs/dir.c | 2 +- + fs/coda/Makefile | 2 +- + fs/compat.c | 3 - + fs/devpts/inode.c | 19 +- + fs/exec.c | 2 +- + fs/fifo.c | 3 +- + fs/gfs2/Makefile | 2 +- + fs/inode.c | 2 +- + fs/internal.h | 1 + + fs/ioctl.c | 21 +- + fs/jfs/Makefile | 2 +- + fs/ncpfs/Makefile | 2 +- + fs/nfs/namespace.c | 4 +- + fs/ntfs/Makefile | 19 +- + fs/ocfs2/Makefile | 4 +- + fs/ocfs2/dlm/Makefile | 2 +- + fs/ocfs2/dlmfs/Makefile | 2 +- + fs/open.c | 13 +- + fs/pstore/inode.c | 76 +- + fs/pstore/internal.h | 3 +- + fs/pstore/platform.c | 16 +- + fs/reiserfs/Makefile | 4 +- + fs/select.c | 3 - + fs/sync.c | 24 + + fs/xfs/Makefile | 12 +- + fs/xfs/linux-2.6/kmem.c | 9 +- + fs/xfs/linux-2.6/xfs_aops.c | 6 +- + fs/xfs/linux-2.6/xfs_buf.c | 17 +- + fs/xfs/linux-2.6/xfs_linux.h | 23 +- + fs/xfs/linux-2.6/xfs_message.c | 133 +++ + fs/xfs/linux-2.6/xfs_message.h | 38 + + fs/xfs/linux-2.6/xfs_super.c | 128 ++-- + fs/xfs/linux-2.6/xfs_sync.c | 5 +- + fs/xfs/linux-2.6/xfs_sysctl.c | 2 +- + fs/xfs/quota/xfs_dquot.c | 48 +- + fs/xfs/quota/xfs_dquot_item.c | 5 +- + fs/xfs/quota/xfs_qm.c | 49 +- + fs/xfs/quota/xfs_qm_bhv.c | 3 +- + fs/xfs/quota/xfs_qm_syscalls.c | 85 +- + fs/xfs/quota/xfs_trans_dquot.c | 5 +- + fs/xfs/support/debug.c | 107 -- + fs/xfs/support/debug.h | 61 -- + fs/xfs/xfs_alloc.c | 160 ++-- + fs/xfs/xfs_bmap.c | 24 +- + fs/xfs/xfs_buf_item.c | 15 +- + fs/xfs/xfs_da_btree.c | 9 +- + fs/xfs/xfs_dfrag.c | 4 +- + fs/xfs/xfs_dir2.c | 2 +- + fs/xfs/xfs_dir2_node.c | 25 +- + fs/xfs/xfs_error.c | 22 +- + fs/xfs/xfs_error.h | 19 +- + fs/xfs/xfs_fsops.c | 6 +- + fs/xfs/xfs_ialloc.c | 82 +- + fs/xfs/xfs_inode.c | 129 ++-- + fs/xfs/xfs_inode.h | 23 +- + fs/xfs/xfs_iomap.c | 12 +- + fs/xfs/xfs_log.c | 124 ++-- + fs/xfs/xfs_log_priv.h | 4 - + fs/xfs/xfs_log_recover.c | 223 ++--- + fs/xfs/xfs_mount.c | 148 ++-- + fs/xfs/xfs_quota.h | 3 +- + fs/xfs/xfs_rtalloc.c | 92 +- + fs/xfs/xfs_rtalloc.h | 2 +- + fs/xfs/xfs_rw.c | 58 +- + fs/xfs/xfs_trans.h | 2 - + fs/xfs/xfs_trans_ail.c | 2 +- + fs/xfs/xfs_trans_buf.c | 6 +- + fs/xfs/xfs_trans_inode.c | 22 - + fs/xfs/xfs_vnodeops.c | 74 +- + include/asm-generic/unistd.h | 6 +- + include/linux/dcache.h | 1 - + include/linux/firewire.h | 2 +- + include/linux/i2c-id.h | 37 - + include/linux/i2c.h | 18 +- + include/linux/i2c/ads1015.h | 36 + + include/linux/syscalls.h | 1 + + kernel/gcov/Makefile | 2 +- + kernel/power/Makefile | 3 +- + kernel/signal.c | 16 +- + lib/Kconfig.debug | 5 - + scripts/Makefile | 5 + + scripts/Makefile.build | 35 +- + scripts/extract-ikconfig | 9 +- + scripts/genksyms/Makefile | 4 +- + scripts/genksyms/genksyms.c | 192 +++- + scripts/genksyms/genksyms.h | 7 +- + scripts/genksyms/lex.c_shipped | 427 +++----- + scripts/genksyms/lex.l | 44 +- + scripts/genksyms/parse.c_shipped | 1071 +++++++++++--------- + scripts/genksyms/parse.h_shipped | 72 +- + scripts/genksyms/parse.y | 34 +- + scripts/mod/modpost.c | 23 +- + scripts/package/Makefile | 5 +- + scripts/package/buildtar | 4 + + scripts/setlocalversion | 14 +- + scripts/tags.sh | 9 + + scripts/unifdef.c | 247 ++++-- + tools/testing/ktest/ktest.pl | 139 +++- + tools/testing/ktest/sample.conf | 42 + + 237 files changed, 5200 insertions(+), 3103 deletions(-) + delete mode 100644 Documentation/ABI/testing/sysfs-fs-pstore + create mode 100644 Documentation/devicetree/bindings/hwmon/ads1015.txt + create mode 100644 Documentation/devicetree/bindings/open-pic.txt + create mode 100644 Documentation/hwmon/ads1015 + create mode 100644 Documentation/hwmon/sch5627 + create mode 100644 Documentation/hwmon/w83795 + rename Documentation/{hwmon => laptops}/hpfall.c (100%) + rename Documentation/{hwmon => misc-devices}/lis3lv02d (96%) + create mode 100644 drivers/hwmon/ads1015.c + create mode 100644 drivers/hwmon/sch5627.c + create mode 100644 drivers/misc/lis3lv02d/Kconfig + create mode 100644 drivers/misc/lis3lv02d/Makefile + rename drivers/{hwmon => misc/lis3lv02d}/lis3lv02d.c (99%) + rename drivers/{hwmon => misc/lis3lv02d}/lis3lv02d.h (100%) + rename drivers/{hwmon => misc/lis3lv02d}/lis3lv02d_i2c.c (99%) + rename drivers/{hwmon => misc/lis3lv02d}/lis3lv02d_spi.c (100%) + rename drivers/{hwmon => platform/x86}/hp_accel.c (99%) + create mode 100644 fs/xfs/linux-2.6/xfs_message.c + create mode 100644 fs/xfs/linux-2.6/xfs_message.h + delete mode 100644 fs/xfs/support/debug.c + delete mode 100644 fs/xfs/support/debug.h + delete mode 100644 include/linux/i2c-id.h + create mode 100644 include/linux/i2c/ads1015.h +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging kbuild-current/rc-fixes +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging 52xx-and-virtex-current/powerpc/merge +$ git merge 52xx-and-virtex-current/powerpc/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/net/bonding/bond_main.c | 2 +- + drivers/net/ftmac100.c | 2 +- + drivers/net/gianfar.c | 16 ++- + drivers/net/gianfar.h | 1 + + drivers/net/niu.c | 2 +- + drivers/vhost/net.c | 159 ++++-------------------- + drivers/vhost/vhost.c | 55 ++++++--- + include/linux/ethtool.h | 34 +++++ + include/linux/if_ppp.h | 16 ++-- + include/linux/netfilter/ipset/ip_set_getport.h | 10 ++ + include/linux/netfilter/nfnetlink_log.h | 4 +- + include/linux/netfilter/nfnetlink_queue.h | 4 +- + include/linux/netfilter/xt_connbytes.h | 4 +- + include/linux/netfilter/xt_quota.h | 2 +- + net/8021q/vlan_dev.c | 1 + + net/bridge/br_netfilter.c | 3 + + net/core/ethtool.c | 3 + + net/econet/af_econet.c | 2 +- + net/ipv4/netfilter/ip_tables.c | 4 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 5 +- + net/ipv6/netfilter/ip6_tables.c | 4 +- + net/netfilter/ipset/ip_set_core.c | 22 +++- + net/netfilter/ipset/ip_set_hash_ipport.c | 34 ++---- + net/netfilter/ipset/ip_set_hash_ipportip.c | 34 ++---- + net/netfilter/ipset/ip_set_hash_ipportnet.c | 34 ++---- + net/netfilter/ipset/ip_set_hash_netport.c | 30 ++---- + net/socket.c | 114 ++++++++++++++++- + 27 files changed, 319 insertions(+), 282 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Merge made by recursive. + drivers/acpi/pci_root.c | 11 ++++++++--- + drivers/pci/pci.c | 6 ++++++ + drivers/pci/pcie/aspm.c | 33 +++++++++++++++++++++++++++++++++ + drivers/pci/pcie/portdrv_core.c | 5 +---- + include/linux/pci-aspm.h | 4 ++++ + include/linux/pci.h | 7 +++---- + 6 files changed, 55 insertions(+), 11 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Merge made by recursive. + drivers/net/wireless/ath/ath9k/xmit.c | 4 ++-- + drivers/net/wireless/iwlwifi/iwl-agn.c | 7 +++++-- + drivers/net/wireless/orinoco/main.c | 2 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 7 ++++++- + drivers/net/wireless/rtlwifi/efuse.c | 31 +++++++++++++++---------------- + drivers/net/wireless/zd1211rw/zd_usb.c | 1 + + include/net/cfg80211.h | 3 ++- + include/net/mac80211.h | 2 +- + net/mac80211/sta_info.c | 1 + + 9 files changed, 34 insertions(+), 24 deletions(-) +Merging driver-core.current/driver-core-linus +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus +$ git merge staging.current/staging-linus +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus +$ git merge sh-current/sh-fixes-for-linus +Already up-to-date. +Merging rmobile-current/rmobile-fixes-for-linus +$ git merge rmobile-current/rmobile-fixes-for-linus +Already up-to-date. +Merging fbdev-current/fbdev-fixes-for-linus +$ git merge fbdev-current/fbdev-fixes-for-linus +Already up-to-date. +Merging devicetree-current/devicetree/merge +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging spi-current/spi/merge +$ git merge spi-current/spi/merge +Already up-to-date. +Merging arm/for-next +$ git merge arm/for-next +Removing arch/arm/mach-realview/headsmp.S +Removing arch/arm/mach-realview/localtimer.c +Auto-merging arch/arm/plat-versatile/headsmp.S +Auto-merging arch/arm/plat-versatile/localtimer.c +Merge made by recursive. + arch/arm/Kconfig | 10 +- + arch/arm/include/asm/localtimer.h | 8 +- + arch/arm/include/asm/outercache.h | 14 +- + arch/arm/include/asm/pgtable.h | 3 +- + arch/arm/include/asm/setup.h | 2 +- + arch/arm/kernel/hw_breakpoint.c | 14 +- + arch/arm/kernel/setup.c | 7 +- + arch/arm/kernel/smp.c | 7 +- + arch/arm/kernel/traps.c | 6 +- + arch/arm/lib/uaccess_with_memcpy.c | 7 +- + arch/arm/mach-exynos4/localtimer.c | 3 +- + arch/arm/mach-integrator/Kconfig | 1 + + arch/arm/mach-integrator/common.h | 1 + + arch/arm/mach-integrator/core.c | 7 +- + arch/arm/mach-integrator/impd1.c | 5 + + arch/arm/mach-integrator/include/mach/cm.h | 4 +- + arch/arm/mach-integrator/integrator_ap.c | 44 +- + arch/arm/mach-integrator/integrator_cp.c | 239 +-- + arch/arm/mach-msm/timer.c | 3 +- + arch/arm/mach-omap2/Kconfig | 1 + + arch/arm/mach-omap2/timer-mpu.c | 7 +- + arch/arm/mach-realview/Makefile | 3 +- + arch/arm/mach-realview/core.c | 233 +-- + arch/arm/mach-realview/core.h | 2 +- + arch/arm/mach-realview/headsmp.S | 40 - + arch/arm/mach-realview/localtimer.c | 26 - + arch/arm/mach-realview/platsmp.c | 98 +- + arch/arm/mach-realview/realview_eb.c | 22 +- + arch/arm/mach-realview/realview_pb1176.c | 22 +- + arch/arm/mach-realview/realview_pb11mp.c | 22 +- + arch/arm/mach-realview/realview_pba8.c | 22 +- + arch/arm/mach-realview/realview_pbx.c | 22 +- + arch/arm/mach-shmobile/localtimer.c | 3 +- + arch/arm/mach-tegra/localtimer.c | 3 +- + arch/arm/mach-ux500/localtimer.c | 3 +- + arch/arm/mach-versatile/core.c | 295 +-- + arch/arm/mach-versatile/core.h | 2 +- + arch/arm/mach-versatile/include/mach/hardware.h | 2 +- + arch/arm/mach-versatile/versatile_ab.c | 1 + + arch/arm/mach-versatile/versatile_pb.c | 6 +- + arch/arm/mach-vexpress/Kconfig | 3 + + arch/arm/mach-vexpress/Makefile | 3 +- + arch/arm/mach-vexpress/core.h | 5 - + arch/arm/mach-vexpress/ct-ca9x4.c | 107 +- + arch/arm/mach-vexpress/include/mach/ct-ca9x4.h | 2 + + arch/arm/mach-vexpress/include/mach/motherboard.h | 22 + + arch/arm/mach-vexpress/platsmp.c | 125 +- + arch/arm/mach-vexpress/v2m.c | 90 +- + arch/arm/mm/dma-mapping.c | 11 +- + arch/arm/mm/fault-armv.c | 7 +- + arch/arm/mm/fault.c | 39 +- + arch/arm/mm/idmap.c | 35 +- + arch/arm/mm/init.c | 6 +- + arch/arm/mm/mm.h | 2 +- + arch/arm/mm/mmu.c | 71 +- + arch/arm/mm/pgd.c | 24 +- + arch/arm/plat-versatile/Kconfig | 17 + + arch/arm/plat-versatile/Makefile | 13 +- + arch/arm/plat-versatile/clcd.c | 182 ++ + arch/arm/plat-versatile/fpga-irq.c | 72 + + .../{mach-vexpress => plat-versatile}/headsmp.S | 8 +- + arch/arm/plat-versatile/include/plat/clcd.h | 9 + + arch/arm/plat-versatile/include/plat/fpga-irq.h | 12 + + .../{mach-vexpress => plat-versatile}/localtimer.c | 5 +- + arch/arm/plat-versatile/platsmp.c | 104 + + arch/arm/tools/mach-types | 2395 +------------------- + drivers/video/amba-clcd.c | 103 +- + include/linux/amba/clcd.h | 90 +- + 68 files changed, 1232 insertions(+), 3550 deletions(-) + delete mode 100644 arch/arm/mach-realview/headsmp.S + delete mode 100644 arch/arm/mach-realview/localtimer.c + create mode 100644 arch/arm/plat-versatile/Kconfig + create mode 100644 arch/arm/plat-versatile/clcd.c + create mode 100644 arch/arm/plat-versatile/fpga-irq.c + rename arch/arm/{mach-vexpress => plat-versatile}/headsmp.S (75%) + create mode 100644 arch/arm/plat-versatile/include/plat/clcd.h + create mode 100644 arch/arm/plat-versatile/include/plat/fpga-irq.h + rename arch/arm/{mach-vexpress => plat-versatile}/localtimer.c (80%) + create mode 100644 arch/arm/plat-versatile/platsmp.c +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Already up-to-date. +Merging i.MX/for-next +$ git merge i.MX/for-next +Resolved 'arch/arm/mach-mxs/mach-mx28evk.c' using previous resolution. +Auto-merging arch/arm/mach-mxs/mach-mx28evk.c +CONFLICT (content): Merge conflict in arch/arm/mach-mxs/mach-mx28evk.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0e6d192] Merge remote-tracking branch 'i.MX/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging linux-spec/for-next +$ git merge linux-spec/for-next +Already up-to-date. +Merging msm/for-next +$ git merge msm/for-next +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Auto-merging arch/arm/mach-omap2/board-omap4panda.c +Merge made by recursive. + arch/arm/mach-omap2/board-omap4panda.c | 28 ---------------------------- + arch/arm/mach-omap2/devices.c | 2 +- + arch/arm/mach-omap2/gpmc.c | 13 ++++++++----- + arch/arm/mach-omap2/omap_l3_smx.c | 11 ++++------- + arch/arm/plat-omap/include/plat/irqs.h | 2 +- + drivers/hwspinlock/Kconfig | 1 + + 6 files changed, 15 insertions(+), 42 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Merge made by recursive. + arch/arm/mach-s3c2410/h1940-bluetooth.c | 11 +- + arch/arm/mach-s3c2410/include/mach/h1940.h | 3 + + arch/arm/mach-s3c2410/mach-h1940.c | 303 ++++++++++++++++++++++++++-- + arch/arm/mach-s3c2440/mach-rx1950.c | 74 ++++++- + 4 files changed, 366 insertions(+), 25 deletions(-) +Merging s5p/for-next +$ git merge s5p/for-next +Already up-to-date. +Merging tegra/for-next +$ git merge tegra/for-next +Auto-merging arch/arm/mach-tegra/Kconfig +Auto-merging arch/arm/mach-tegra/Makefile +Merge made by recursive. + arch/arm/configs/tegra_defconfig | 29 +++++- + arch/arm/mach-tegra/Kconfig | 5 + + arch/arm/mach-tegra/Makefile | 4 + + arch/arm/mach-tegra/board-harmony-pcie.c | 24 ++++- + arch/arm/mach-tegra/board-harmony-pinmux.c | 28 +++-- + arch/arm/mach-tegra/board-harmony-power.c | 117 +++++++++++++++++++ + arch/arm/mach-tegra/board-harmony.c | 95 +++++++++++++++- + arch/arm/mach-tegra/board-harmony.h | 15 +++ + arch/arm/mach-tegra/board-paz00-pinmux.c | 157 ++++++++++++++++++++++++++ + arch/arm/mach-tegra/board-paz00.c | 128 +++++++++++++++++++++ + arch/arm/mach-tegra/board-paz00.h | 29 +++++ + arch/arm/mach-tegra/board-seaboard-pinmux.c | 11 +- + arch/arm/mach-tegra/board-seaboard.c | 68 ++++++++++- + arch/arm/mach-tegra/board-seaboard.h | 3 + + arch/arm/mach-tegra/board-trimslice-pinmux.c | 9 ++ + arch/arm/mach-tegra/board-trimslice.c | 19 +++ + arch/arm/mach-tegra/board-trimslice.h | 3 + + arch/arm/mach-tegra/devices.c | 70 ++++++++++++ + arch/arm/mach-tegra/devices.h | 4 + + arch/arm/mach-tegra/include/mach/iomap.h | 3 + + 20 files changed, 787 insertions(+), 34 deletions(-) + create mode 100644 arch/arm/mach-tegra/board-harmony-power.c + create mode 100644 arch/arm/mach-tegra/board-paz00-pinmux.c + create mode 100644 arch/arm/mach-tegra/board-paz00.c + create mode 100644 arch/arm/mach-tegra/board-paz00.h +Merging ux500-core/ux500-core +$ git merge ux500-core/ux500-core +Resolved 'arch/arm/configs/u8500_defconfig' using previous resolution. +Auto-merging arch/arm/configs/u8500_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/u8500_defconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f7632cb] Merge remote-tracking branch 'ux500-core/ux500-core' +$ git diff -M --stat --summary HEAD^.. + arch/arm/configs/u8500_defconfig | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Auto-merging arch/cris/Kconfig +Removing arch/cris/arch-v32/drivers/pcf8563.c +Merge made by recursive. + arch/cris/Kconfig | 3 +- + arch/cris/arch-v10/drivers/pcf8563.c | 2 +- + arch/cris/arch-v32/drivers/Makefile | 1 - + arch/cris/arch-v32/drivers/pcf8563.c | 377 ---------------------------------- + 4 files changed, 2 insertions(+), 381 deletions(-) + delete mode 100644 arch/cris/arch-v32/drivers/pcf8563.c +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. +Merging microblaze/next +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Auto-merging arch/mips/Kconfig +Merge made by recursive. + arch/mips/Kconfig | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) +Merging parisc/for-next +$ git merge parisc/for-next +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/powerpc/next +$ git merge 52xx-and-virtex/powerpc/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/include/asm/unistd.h | 5 ++- + arch/s390/kernel/compat_wrapper.S | 22 +++++++++ + arch/s390/kernel/early.c | 22 +++++---- + arch/s390/kernel/setup.c | 88 +++++++++++++++++------------------- + arch/s390/kernel/syscalls.S | 3 + + drivers/s390/cio/qdio_main.c | 3 +- + 6 files changed, 86 insertions(+), 57 deletions(-) +Merging sh/sh-latest +$ git merge sh/sh-latest +Already up-to-date. +Merging rmobile/rmobile-latest +$ git merge rmobile/rmobile-latest +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging tile/master +$ git merge tile/master +Already up-to-date. +Merging unicore32/unicore32 +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution. +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/xtensa/Makefile +Auto-merging arch/xtensa/boot/Makefile +Auto-merging arch/xtensa/configs/iss_defconfig +CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig +Auto-merging arch/xtensa/include/asm/coprocessor.h +Auto-merging arch/xtensa/kernel/Makefile +Auto-merging arch/xtensa/kernel/time.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e89fd9a] Merge remote-tracking branch 'xtensa/master' +$ git diff -M --stat --summary HEAD^.. + arch/xtensa/Kconfig | 17 +- + arch/xtensa/Makefile | 5 +- + arch/xtensa/boot/Makefile | 1 + + arch/xtensa/include/asm/coprocessor.h | 9 +- + arch/xtensa/include/asm/io.h | 40 ++-- + arch/xtensa/include/asm/irq.h | 7 +- + arch/xtensa/include/asm/serial.h | 12 +- + arch/xtensa/kernel/Makefile | 4 +- + arch/xtensa/kernel/time.c | 2 +- + arch/xtensa/platforms/xtavnet/Makefile | 10 + + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ + .../platforms/xtavnet/include/platform/lcd.h | 22 ++ + .../platforms/xtavnet/include/platform/serial.h | 1 + + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ + arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ + 15 files changed, 526 insertions(+), 37 deletions(-) + create mode 100644 arch/xtensa/platforms/xtavnet/Makefile + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c + create mode 100644 arch/xtensa/platforms/xtavnet/setup.c +Merging ceph/for-next +$ git merge ceph/for-next +Already up-to-date. +Merging cifs/master +$ git merge cifs/master +Removing fs/cifs/smbdes.c +Merge made by recursive. + fs/cifs/Kconfig | 35 +- + fs/cifs/Makefile | 4 +- + fs/cifs/README | 28 - + fs/cifs/TODO | 2 + + fs/cifs/cache.c | 8 +- + fs/cifs/cifs_debug.c | 386 ++++---- + fs/cifs/cifs_debug.h | 12 +- + fs/cifs/cifs_dfs_ref.c | 2 +- + fs/cifs/cifs_fs_sb.h | 4 +- + fs/cifs/cifs_spnego.c | 6 +- + fs/cifs/cifs_spnego.h | 2 +- + fs/cifs/cifs_unicode.c | 61 ++ + fs/cifs/cifs_unicode.h | 10 + + fs/cifs/cifsacl.c | 6 +- + fs/cifs/cifsacl.h | 2 +- + fs/cifs/cifsencrypt.c | 32 +- + fs/cifs/cifsfs.c | 69 +- + fs/cifs/cifsfs.h | 14 +- + fs/cifs/cifsglob.h | 197 +++-- + fs/cifs/cifspdu.h | 6 +- + fs/cifs/cifsproto.h | 182 ++-- + fs/cifs/cifssmb.c | 532 ++++++----- + fs/cifs/connect.c | 190 +++-- + fs/cifs/dir.c | 8 +- + fs/cifs/export.c | 4 +- + fs/cifs/file.c | 139 +--- + fs/cifs/fscache.c | 6 +- + fs/cifs/fscache.h | 8 +- + fs/cifs/inode.c | 52 +- + fs/cifs/ioctl.c | 2 +- + fs/cifs/link.c | 16 +- + fs/cifs/maperror.c | 1830 ++++++++++++++++++++++++++++++++++ + fs/cifs/misc.c | 45 +- + fs/cifs/ntlmssp.h | 10 + + fs/cifs/readdir.c | 8 +- + fs/cifs/sess.c | 78 +- + fs/cifs/smb2glob.h | 258 +++++ + fs/cifs/smb2misc.c | 336 +++++++ + fs/cifs/smb2pdu.c | 2506 +++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/smb2pdu.h | 996 +++++++++++++++++++ + fs/cifs/smb2proto.h | 200 ++++ + fs/cifs/smb2sess.c | 80 ++ + fs/cifs/smb2status.h | 1782 +++++++++++++++++++++++++++++++++ + fs/cifs/smb2transport.c | 322 ++++++ + fs/cifs/smbdes.c | 418 -------- + fs/cifs/smbencrypt.c | 124 ++- + fs/cifs/transport.c | 135 ++-- + fs/cifs/xattr.c | 28 +- + 48 files changed, 9677 insertions(+), 1504 deletions(-) + create mode 100644 fs/cifs/maperror.c + create mode 100644 fs/cifs/smb2glob.h + create mode 100644 fs/cifs/smb2misc.c + create mode 100644 fs/cifs/smb2pdu.c + create mode 100644 fs/cifs/smb2pdu.h + create mode 100644 fs/cifs/smb2proto.h + create mode 100644 fs/cifs/smb2sess.c + create mode 100644 fs/cifs/smb2status.h + create mode 100644 fs/cifs/smb2transport.c + delete mode 100644 fs/cifs/smbdes.c +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Merge made by recursive. + fs/ecryptfs/crypto.c | 22 +++++++++++++++ + fs/ecryptfs/ecryptfs_kernel.h | 28 +++++++++--------- + fs/ecryptfs/file.c | 12 +++++++- + fs/ecryptfs/inode.c | 42 ++-------------------------- + fs/ecryptfs/keystore.c | 1 + + fs/ecryptfs/main.c | 2 - + fs/ecryptfs/mmap.c | 61 +++++++++++++++++++++++------------------ + fs/ecryptfs/read_write.c | 12 +------- + fs/ecryptfs/super.c | 3 +- + 9 files changed, 87 insertions(+), 96 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Auto-merging fs/ext4/extents.c +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/ext4/super.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-fs-ext4 | 13 +- + Documentation/filesystems/ext4.txt | 207 +++++++++++++++++++- + fs/ext4/extents.c | 195 ++++++++++++++---- + fs/ext4/ialloc.c | 2 +- + fs/ext4/inode.c | 339 ++++++++++++------------------- + fs/ext4/ioctl.c | 6 + + fs/ext4/mballoc.c | 21 ++- + fs/ext4/mballoc.h | 2 +- + fs/ext4/migrate.c | 10 +- + fs/ext4/page-io.c | 13 +- + fs/ext4/resize.c | 4 +- + fs/ext4/super.c | 44 +++-- + fs/ext4/xattr.c | 2 +- + 13 files changed, 561 insertions(+), 297 deletions(-) +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Auto-merging fs/fuse/cuse.c +Merge made by recursive. + fs/fuse/cuse.c | 12 ++++++++++-- + fs/fuse/dev.c | 17 +++++++++++++++++ + fs/fuse/dir.c | 38 ++++++++++++++++++++++++++------------ + fs/fuse/file.c | 2 +- + fs/fuse/fuse_i.h | 1 - + 5 files changed, 54 insertions(+), 16 deletions(-) +Merging gfs2/master +$ git merge gfs2/master +Already up-to-date. +Merging hfsplus/for-next +$ git merge hfsplus/for-next +Merge made by recursive. + fs/hfsplus/extents.c | 9 ++++++--- + fs/hfsplus/super.c | 9 +++++++++ + fs/hfsplus/unicode.c | 35 +++++++++++++++++++++++++++-------- + fs/hfsplus/wrapper.c | 9 +++------ + 4 files changed, 45 insertions(+), 17 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging logfs/master +$ git merge logfs/master +Resolved 'fs/logfs/logfs.h' using previous resolution. +Auto-merging fs/logfs/logfs.h +CONFLICT (content): Merge conflict in fs/logfs/logfs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ab2938b] Merge remote-tracking branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merging fs/locks.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/vfs.c +Merge made by recursive. + fs/locks.c | 12 +--- + fs/nfsd/export.c | 1 - + fs/nfsd/nfs4idmap.c | 1 - + fs/nfsd/nfs4proc.c | 4 +- + fs/nfsd/nfs4state.c | 157 +++++++++++++++++++++++--------------------- + fs/nfsd/nfsctl.c | 35 ++++++++++- + fs/nfsd/vfs.c | 2 - + net/sunrpc/svcauth_unix.c | 18 +++--- + 8 files changed, 128 insertions(+), 102 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Already up-to-date. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merging fs/ocfs2/dir.c +Merge made by recursive. + fs/ocfs2/dir.c | 12 +++-- + fs/ocfs2/dlm/dlmdomain.c | 28 ++++++++------ + fs/ocfs2/dlmglue.c | 97 +++++++++++++++++++++++---------------------- + fs/ocfs2/ioctl.c | 38 ++++++++++++++---- + fs/ocfs2/ocfs2.h | 23 +++++++---- + 5 files changed, 117 insertions(+), 81 deletions(-) +Merging omfs/for-next +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Merge made by recursive. + Documentation/filesystems/squashfs.txt | 28 +++++++++++----- + fs/squashfs/Kconfig | 12 +++--- + fs/squashfs/decompressor.c | 34 ++++++++++++++++++++ + fs/squashfs/decompressor.h | 7 +--- + fs/squashfs/dir.c | 9 +++++ + fs/squashfs/lzo_wrapper.c | 4 +- + fs/squashfs/namei.c | 12 +++++++ + fs/squashfs/squashfs.h | 1 + + fs/squashfs/squashfs_fs.h | 4 ++ + fs/squashfs/super.c | 15 +++++--- + fs/squashfs/xz_wrapper.c | 53 ++++++++++++++++++++++++++------ + fs/squashfs/zlib_wrapper.c | 4 +- + 12 files changed, 142 insertions(+), 41 deletions(-) +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Merge made by recursive. + fs/9p/acl.c | 4 +- + fs/9p/fid.c | 19 ++++++++++-- + fs/9p/v9fs.h | 6 ++++ + fs/9p/vfs_file.c | 13 ++++++-- + fs/9p/vfs_inode.c | 29 ++++++++++++------ + fs/9p/vfs_inode_dotl.c | 22 ++++++++------ + fs/9p/vfs_super.c | 2 +- + net/9p/client.c | 10 +++--- + net/9p/protocol.c | 6 ++-- + net/9p/trans_common.c | 10 +++--- + net/9p/trans_fd.c | 2 +- + net/9p/trans_rdma.c | 6 ++-- + net/9p/trans_virtio.c | 72 ++++++++++++++++++++++++++++++----------------- + net/9p/util.c | 2 +- + 14 files changed, 129 insertions(+), 74 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging vfs-scale/vfs-scale-working +$ git merge vfs-scale/vfs-scale-working +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging hid/for-next +$ git merge hid/for-next +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Already up-to-date. +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Auto-merging MAINTAINERS +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/i2c/busses/i2c-designware-core.c +Removing drivers/i2c/busses/i2c-intel-mid.c +Merge made by recursive. + Documentation/i2c/busses/i2c-diolan-u2c | 26 + + MAINTAINERS | 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-pxa/balloon3.c | 3 +- + arch/arm/mach-pxa/cm-x300.c | 2 +- + arch/arm/mach-pxa/colibri-evalboard.c | 3 +- + arch/arm/mach-pxa/colibri-pxa270-income.c | 3 +- + arch/arm/mach-pxa/corgi.c | 2 +- + arch/arm/mach-pxa/csb726.c | 2 +- + arch/arm/mach-pxa/devices.c | 2 +- + arch/arm/mach-pxa/em-x270.c | 2 +- + arch/arm/mach-pxa/ezx.c | 2 +- + arch/arm/mach-pxa/hx4700.c | 2 +- + arch/arm/mach-pxa/littleton.c | 2 +- + arch/arm/mach-pxa/magician.c | 2 +- + arch/arm/mach-pxa/mainstone.c | 2 +- + arch/arm/mach-pxa/mioa701.c | 2 +- + arch/arm/mach-pxa/mxm8x10.c | 2 +- + arch/arm/mach-pxa/palm27x.c | 3 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 2 +- + arch/arm/mach-pxa/poodle.c | 2 +- + arch/arm/mach-pxa/pxa27x.c | 3 +- + arch/arm/mach-pxa/pxa3xx.c | 2 +- + arch/arm/mach-pxa/pxa95x.c | 2 +- + arch/arm/mach-pxa/raumfeld.c | 2 +- + arch/arm/mach-pxa/saar.c | 2 +- + arch/arm/mach-pxa/saarb.c | 3 +- + arch/arm/mach-pxa/spitz.c | 3 +- + arch/arm/mach-pxa/stargate2.c | 2 +- + arch/arm/mach-pxa/tavorevb3.c | 3 +- + arch/arm/mach-pxa/tosa.c | 2 +- + arch/arm/mach-pxa/trizeps4.c | 2 +- + arch/arm/mach-pxa/viper.c | 2 +- + arch/arm/mach-pxa/vpac270.c | 3 +- + arch/arm/mach-pxa/xcep.c | 3 +- + arch/arm/mach-pxa/z2.c | 3 +- + arch/arm/mach-pxa/zeus.c | 3 +- + arch/arm/mach-pxa/zylonite_pxa300.c | 2 +- + drivers/i2c/busses/Kconfig | 57 +- + drivers/i2c/busses/Makefile | 8 +- + .../{i2c-designware.c => i2c-designware-core.c} | 383 ++----- + drivers/i2c/busses/i2c-designware-core.h | 106 ++ + drivers/i2c/busses/i2c-designware-pcidrv.c | 405 +++++++ + drivers/i2c/busses/i2c-designware-platdrv.c | 215 ++++ + drivers/i2c/busses/i2c-diolan-u2c.c | 535 +++++++++ + drivers/i2c/busses/i2c-eg20t.c | 161 ++-- + drivers/i2c/busses/i2c-intel-mid.c | 1135 -------------------- + drivers/i2c/busses/i2c-mxs.c | 4 +- + drivers/i2c/busses/i2c-pxa-pci.c | 176 +++ + drivers/i2c/busses/i2c-pxa.c | 115 ++- + .../plat/i2c.h => include/linux/i2c/pxa-i2c.h | 0 + 53 files changed, 1859 insertions(+), 1561 deletions(-) + create mode 100644 Documentation/i2c/busses/i2c-diolan-u2c + rename drivers/i2c/busses/{i2c-designware.c => i2c-designware-core.c} (65%) + create mode 100644 drivers/i2c/busses/i2c-designware-core.h + create mode 100644 drivers/i2c/busses/i2c-designware-pcidrv.c + create mode 100644 drivers/i2c/busses/i2c-designware-platdrv.c + create mode 100644 drivers/i2c/busses/i2c-diolan-u2c.c + delete mode 100644 drivers/i2c/busses/i2c-intel-mid.c + create mode 100644 drivers/i2c/busses/i2c-pxa-pci.c + rename arch/arm/plat-pxa/include/plat/i2c.h => include/linux/i2c/pxa-i2c.h (100%) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. +Merging hwmon-staging/hwmon-next +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Recorded preimage for 'arch/arm/mach-omap2/devices.c' +Resolved 'drivers/staging/Kconfig' using previous resolution. +Resolved 'drivers/staging/Makefile' using previous resolution. +Resolved 'drivers/staging/easycap/easycap_ioctl.c' using previous resolution. +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging Documentation/ioctl/ioctl-number.txt +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-omap2/devices.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c +Auto-merging drivers/media/dvb/dvb-usb/dvb-usb-remote.c +Removing drivers/media/dvb/firewire/firedtv-1394.c +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/staging/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +CONFLICT (content): Merge conflict in drivers/staging/Makefile +Removing drivers/staging/dabusb/Kconfig +Removing drivers/staging/dabusb/Makefile +Removing drivers/staging/dabusb/TODO +CONFLICT (delete/modify): drivers/staging/dabusb/dabusb.c deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/dabusb/dabusb.c left in tree. +CONFLICT (delete/modify): drivers/staging/dabusb/dabusb.h deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/dabusb/dabusb.h left in tree. +Auto-merging drivers/staging/easycap/easycap_ioctl.c +CONFLICT (content): Merge conflict in drivers/staging/easycap/easycap_ioctl.c +Removing drivers/staging/se401/Kconfig +Removing drivers/staging/se401/Makefile +Removing drivers/staging/se401/TODO +Removing drivers/staging/se401/se401.c +Removing drivers/staging/se401/se401.h +Removing drivers/staging/se401/videodev.h +Removing drivers/staging/usbvideo/Kconfig +Removing drivers/staging/usbvideo/Makefile +Removing drivers/staging/usbvideo/TODO +CONFLICT (delete/modify): drivers/staging/usbvideo/usbvideo.c deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/usbvideo/usbvideo.c left in tree. +Removing drivers/staging/usbvideo/usbvideo.h +CONFLICT (delete/modify): drivers/staging/usbvideo/vicam.c deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/usbvideo/vicam.c left in tree. +Removing drivers/staging/usbvideo/videodev.h +Auto-merging drivers/video/matrox/matroxfb_base.c +Auto-merging include/media/s5p_fimc.h +Auto-merging sound/soc/codecs/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/usbvideo/usbvideo.c +arch/arm/mach-omap2/devices.c: needs merge +drivers/staging/Kconfig: needs merge +drivers/staging/Makefile: needs merge +drivers/staging/dabusb/dabusb.c: needs merge +drivers/staging/dabusb/dabusb.h: needs merge +drivers/staging/easycap/easycap_ioctl.c: needs merge +drivers/staging/usbvideo/usbvideo.c: needs merge +drivers/staging/usbvideo/vicam.c: needs merge +rm 'drivers/staging/usbvideo/usbvideo.c' +$ git rm -f drivers/staging/usbvideo/vicam.c +arch/arm/mach-omap2/devices.c: needs merge +drivers/staging/Kconfig: needs merge +drivers/staging/Makefile: needs merge +drivers/staging/dabusb/dabusb.c: needs merge +drivers/staging/dabusb/dabusb.h: needs merge +drivers/staging/easycap/easycap_ioctl.c: needs merge +drivers/staging/usbvideo/vicam.c: needs merge +rm 'drivers/staging/usbvideo/vicam.c' +$ git rm -f drivers/staging/dabusb/dabusb.c drivers/staging/dabusb/dabusb.h +arch/arm/mach-omap2/devices.c: needs merge +drivers/staging/Kconfig: needs merge +drivers/staging/Makefile: needs merge +drivers/staging/dabusb/dabusb.c: needs merge +drivers/staging/dabusb/dabusb.h: needs merge +drivers/staging/easycap/easycap_ioctl.c: needs merge +rm 'drivers/staging/dabusb/dabusb.c' +rm 'drivers/staging/dabusb/dabusb.h' +$ git commit -v -a +Recorded resolution for 'arch/arm/mach-omap2/devices.c'. +[master 244ee3b] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-media | 6 + + Documentation/DocBook/Makefile | 5 +- + Documentation/DocBook/media-entities.tmpl | 59 + + Documentation/DocBook/media.tmpl | 3 + + Documentation/DocBook/v4l/bayer.pdf | Bin 0 -> 12116 bytes + Documentation/DocBook/v4l/bayer.png | Bin 0 -> 9725 bytes + Documentation/DocBook/v4l/common.xml | 2 + + Documentation/DocBook/v4l/compat.xml | 26 +- + Documentation/DocBook/v4l/dev-capture.xml | 13 +- + Documentation/DocBook/v4l/dev-output.xml | 13 +- + Documentation/DocBook/v4l/dev-subdev.xml | 313 ++ + Documentation/DocBook/v4l/func-mmap.xml | 10 +- + Documentation/DocBook/v4l/func-munmap.xml | 3 +- + Documentation/DocBook/v4l/io.xml | 283 ++- + Documentation/DocBook/v4l/media-controller.xml | 89 + + Documentation/DocBook/v4l/media-func-close.xml | 59 + + Documentation/DocBook/v4l/media-func-ioctl.xml | 116 + + Documentation/DocBook/v4l/media-func-open.xml | 94 + + .../DocBook/v4l/media-ioc-device-info.xml | 133 + + .../DocBook/v4l/media-ioc-enum-entities.xml | 308 ++ + Documentation/DocBook/v4l/media-ioc-enum-links.xml | 207 ++ + Documentation/DocBook/v4l/media-ioc-setup-link.xml | 93 + + Documentation/DocBook/v4l/nv12mt.gif | Bin 0 -> 2108 bytes + Documentation/DocBook/v4l/nv12mt_example.gif | Bin 0 -> 6858 bytes + Documentation/DocBook/v4l/pipeline.pdf | Bin 0 -> 20276 bytes + Documentation/DocBook/v4l/pipeline.png | Bin 0 -> 12130 bytes + Documentation/DocBook/v4l/pixfmt-nv12m.xml | 154 + + Documentation/DocBook/v4l/pixfmt-nv12mt.xml | 74 + + Documentation/DocBook/v4l/pixfmt-srggb12.xml | 90 + + Documentation/DocBook/v4l/pixfmt-yuv420m.xml | 162 + + Documentation/DocBook/v4l/pixfmt.xml | 119 +- + Documentation/DocBook/v4l/planar-apis.xml | 62 + + Documentation/DocBook/v4l/subdev-formats.xml | 2467 +++++++++++++ + Documentation/DocBook/v4l/v4l2.xml | 30 +- + Documentation/DocBook/v4l/videodev2.h.xml | 141 +- + Documentation/DocBook/v4l/vidioc-enum-fmt.xml | 2 + + Documentation/DocBook/v4l/vidioc-g-fmt.xml | 15 +- + Documentation/DocBook/v4l/vidioc-qbuf.xml | 24 +- + Documentation/DocBook/v4l/vidioc-querybuf.xml | 14 +- + Documentation/DocBook/v4l/vidioc-querycap.xml | 18 +- + Documentation/DocBook/v4l/vidioc-streamon.xml | 9 + + .../v4l/vidioc-subdev-enum-frame-interval.xml | 152 + + .../DocBook/v4l/vidioc-subdev-enum-frame-size.xml | 154 + + .../DocBook/v4l/vidioc-subdev-enum-mbus-code.xml | 119 + + Documentation/DocBook/v4l/vidioc-subdev-g-crop.xml | 155 + + Documentation/DocBook/v4l/vidioc-subdev-g-fmt.xml | 180 + + .../DocBook/v4l/vidioc-subdev-g-frame-interval.xml | 141 + + Documentation/dvb/get_dvb_firmware | 8 +- + Documentation/feature-removal-schedule.txt | 36 - + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/media-framework.txt | 353 ++ + Documentation/video4linux/README.ivtv | 3 +- + Documentation/video4linux/gspca.txt | 10 + + Documentation/video4linux/omap3isp.txt | 278 ++ + Documentation/video4linux/v4l2-framework.txt | 127 +- + MAINTAINERS | 6 + + arch/arm/mach-omap2/devices.c | 62 +- + arch/arm/mach-omap2/devices.h | 19 + + arch/arm/plat-omap/include/plat/omap34xx.h | 16 +- + drivers/media/Kconfig | 22 + + drivers/media/Makefile | 6 + + drivers/media/common/tuners/tda9887.c | 9 +- + drivers/media/common/tuners/tea5761.c | 33 +- + drivers/media/common/tuners/tuner-types.c | 21 + + drivers/media/common/tuners/tuner-xc2028.c | 16 +- + drivers/media/common/tuners/xc5000.c | 56 +- + drivers/media/common/tuners/xc5000.h | 1 + + drivers/media/dvb/Kconfig | 2 +- + drivers/media/dvb/dvb-core/dvb_frontend.h | 1 - + drivers/media/dvb/dvb-usb/Kconfig | 8 + + drivers/media/dvb/dvb-usb/Makefile | 3 + + drivers/media/dvb/dvb-usb/af9015.c | 67 +- + drivers/media/dvb/dvb-usb/af9015.h | 1 + + drivers/media/dvb/dvb-usb/dib0700.h | 2 + + drivers/media/dvb/dvb-usb/dib0700_core.c | 47 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 1411 +++++++- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 7 + + drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 2 +- + drivers/media/dvb/dvb-usb/dvb-usb.h | 2 + + drivers/media/dvb/dvb-usb/dw2102.c | 550 +++- + drivers/media/dvb/dvb-usb/technisat-usb2.c | 807 +++++ + drivers/media/dvb/firewire/Kconfig | 8 +- + drivers/media/dvb/firewire/Makefile | 5 +- + drivers/media/dvb/firewire/firedtv-1394.c | 300 -- + drivers/media/dvb/firewire/firedtv-avc.c | 15 +- + drivers/media/dvb/firewire/firedtv-dvb.c | 135 +- + drivers/media/dvb/firewire/firedtv-fe.c | 8 +- + drivers/media/dvb/firewire/firedtv-fw.c | 146 +- + drivers/media/dvb/firewire/firedtv.h | 45 +- + drivers/media/dvb/frontends/Kconfig | 15 + + drivers/media/dvb/frontends/Makefile | 2 + + drivers/media/dvb/frontends/af9013.c | 55 +- + drivers/media/dvb/frontends/dib0090.c | 1595 +++++++-- + drivers/media/dvb/frontends/dib0090.h | 31 + + drivers/media/dvb/frontends/dib7000p.c | 1945 ++++++++--- + drivers/media/dvb/frontends/dib7000p.h | 96 +- + drivers/media/dvb/frontends/dib8000.c | 821 +++-- + drivers/media/dvb/frontends/dib8000.h | 20 + + drivers/media/dvb/frontends/dib9000.c | 2351 +++++++++++++ + drivers/media/dvb/frontends/dib9000.h | 131 + + drivers/media/dvb/frontends/dibx000_common.c | 279 ++- + drivers/media/dvb/frontends/dibx000_common.h | 152 +- + drivers/media/dvb/frontends/ds3000.c | 645 ++-- + drivers/media/dvb/frontends/ds3000.h | 3 + + drivers/media/dvb/frontends/dvb-pll.c | 79 +- + drivers/media/dvb/frontends/stv0367.c | 3459 +++++++++++++++++++ + drivers/media/dvb/frontends/stv0367.h | 66 + + drivers/media/dvb/frontends/stv0367_priv.h | 212 ++ + drivers/media/dvb/frontends/stv0367_regs.h | 3614 ++++++++++++++++++++ + drivers/media/dvb/frontends/stv0900.h | 2 + + drivers/media/dvb/frontends/stv0900_core.c | 27 +- + drivers/media/dvb/frontends/stv090x.c | 295 ++- + drivers/media/dvb/frontends/stv090x.h | 16 + + drivers/media/dvb/frontends/stv090x_reg.h | 16 +- + drivers/media/dvb/frontends/zl10036.c | 10 +- + drivers/media/dvb/ngene/Makefile | 3 + + drivers/media/dvb/ngene/ngene-cards.c | 179 +- + drivers/media/dvb/ngene/ngene-core.c | 236 +- + drivers/media/dvb/ngene/ngene-dvb.c | 71 +- + drivers/media/dvb/ngene/ngene.h | 24 + + drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 1 + + drivers/media/media-device.c | 382 +++ + drivers/media/media-devnode.c | 321 ++ + drivers/media/media-entity.c | 536 +++ + drivers/media/radio/Kconfig | 4 + + drivers/media/radio/Makefile | 1 + + drivers/media/radio/radio-wl1273.c | 365 +-- + drivers/media/radio/si470x/radio-si470x-common.c | 1 - + drivers/media/radio/wl128x/Kconfig | 17 + + drivers/media/radio/wl128x/Makefile | 6 + + drivers/media/radio/wl128x/fmdrv.h | 244 ++ + drivers/media/radio/wl128x/fmdrv_common.c | 1677 +++++++++ + drivers/media/radio/wl128x/fmdrv_common.h | 402 +++ + drivers/media/radio/wl128x/fmdrv_rx.c | 847 +++++ + drivers/media/radio/wl128x/fmdrv_rx.h | 59 + + drivers/media/radio/wl128x/fmdrv_tx.c | 425 +++ + drivers/media/radio/wl128x/fmdrv_tx.h | 37 + + drivers/media/radio/wl128x/fmdrv_v4l2.c | 580 ++++ + drivers/media/radio/wl128x/fmdrv_v4l2.h | 33 + + drivers/media/rc/keymaps/Makefile | 2 + + drivers/media/rc/keymaps/rc-technisat-usb2.c | 93 + + drivers/media/rc/keymaps/rc-terratec-slim-2.c | 72 + + drivers/media/video/Kconfig | 58 +- + drivers/media/video/Makefile | 12 +- + drivers/media/video/adv7343.c | 167 +- + drivers/media/video/adv7343_regs.h | 8 +- + drivers/media/video/au0828/au0828-cards.c | 3 +- + drivers/media/video/au0828/au0828-dvb.c | 3 - + drivers/media/video/au0828/au0828-video.c | 4 - + drivers/media/video/bt819.c | 129 +- + drivers/media/video/bt8xx/bttv-cards.c | 2 +- + drivers/media/video/bt8xx/bttv-input.c | 2 - + drivers/media/video/cpia2/cpia2_core.c | 34 +- + drivers/media/video/cpia2/cpia2_v4l.c | 373 +-- + drivers/media/video/cs5345.c | 87 +- + drivers/media/video/cx18/cx18-av-audio.c | 92 +- + drivers/media/video/cx18/cx18-av-core.c | 175 +- + drivers/media/video/cx18/cx18-av-core.h | 12 +- + drivers/media/video/cx18/cx18-controls.c | 285 +-- + drivers/media/video/cx18/cx18-controls.h | 7 +- + drivers/media/video/cx18/cx18-driver.c | 31 +- + drivers/media/video/cx18/cx18-driver.h | 2 +- + drivers/media/video/cx18/cx18-fileops.c | 32 +- + drivers/media/video/cx18/cx18-ioctl.c | 24 +- + drivers/media/video/cx18/cx18-mailbox.c | 5 +- + drivers/media/video/cx18/cx18-mailbox.h | 5 - + drivers/media/video/cx18/cx18-streams.c | 16 +- + drivers/media/video/cx18/cx23418.h | 2 +- + drivers/media/video/cx231xx/cx231xx-417.c | 4 +- + drivers/media/video/cx231xx/cx231xx-avcore.c | 14 +- + drivers/media/video/cx231xx/cx231xx-cards.c | 246 +- + drivers/media/video/cx231xx/cx231xx-core.c | 16 +- + drivers/media/video/cx231xx/cx231xx-i2c.c | 31 +- + drivers/media/video/cx231xx/cx231xx-video.c | 20 +- + drivers/media/video/cx231xx/cx231xx.h | 7 +- + drivers/media/video/cx23885/Kconfig | 12 +- + drivers/media/video/cx23885/Makefile | 1 + + drivers/media/video/cx23885/altera-ci.c | 838 +++++ + drivers/media/video/cx23885/altera-ci.h | 100 + + drivers/media/video/cx23885/cx23885-cards.c | 110 +- + drivers/media/video/cx23885/cx23885-core.c | 37 +- + drivers/media/video/cx23885/cx23885-dvb.c | 175 +- + drivers/media/video/cx23885/cx23885-reg.h | 1 + + drivers/media/video/cx23885/cx23885-video.c | 7 +- + drivers/media/video/cx23885/cx23885.h | 7 +- + drivers/media/video/cx88/cx88-alsa.c | 118 +- + drivers/media/video/cx88/cx88-cards.c | 24 +- + drivers/media/video/cx88/cx88-dvb.c | 23 + + drivers/media/video/cx88/cx88-input.c | 1 + + drivers/media/video/cx88/cx88-tvaudio.c | 8 +- + drivers/media/video/cx88/cx88-video.c | 78 +- + drivers/media/video/cx88/cx88.h | 14 +- + drivers/media/video/em28xx/em28xx-video.c | 33 +- + drivers/media/video/gspca/Kconfig | 19 + + drivers/media/video/gspca/Makefile | 4 + + drivers/media/video/gspca/autogain_functions.h | 179 + + drivers/media/video/gspca/cpia1.c | 37 +- + drivers/media/video/gspca/gspca.c | 13 +- + drivers/media/video/gspca/jeilinj.c | 2 - + drivers/media/video/gspca/nw80x.c | 2443 +++++++++++++ + drivers/media/video/gspca/ov519.c | 208 +- + drivers/media/video/gspca/ov534.c | 980 ++++--- + drivers/media/video/gspca/sn9c20x.c | 40 +- + drivers/media/video/gspca/sonixb.c | 306 +-- + drivers/media/video/gspca/sonixj.c | 353 ++- + drivers/media/video/gspca/stv06xx/stv06xx.c | 2 - + drivers/media/video/gspca/vicam.c | 381 ++ + drivers/media/video/gspca/zc3xx-reg.h | 2 - + drivers/media/video/gspca/zc3xx.c | 52 +- + drivers/media/video/ivtv/ivtv-udma.c | 7 +- + drivers/media/video/ivtv/ivtv-vbi.c | 2 +- + drivers/media/video/ivtv/ivtv-yuv.c | 52 +- + drivers/media/video/mem2mem_testdev.c | 231 +- + drivers/media/video/mt9m001.c | 2 +- + drivers/media/video/mt9v022.c | 4 +- + drivers/media/video/mx3_camera.c | 415 ++-- + drivers/media/video/noon010pc30.c | 792 +++++ + drivers/media/video/omap1_camera.c | 66 +- + drivers/media/video/omap24xxcam.c | 1 + + drivers/media/video/omap3isp/Makefile | 13 + + drivers/media/video/omap3isp/cfa_coef_table.h | 61 + + drivers/media/video/omap3isp/gamma_table.h | 90 + + drivers/media/video/omap3isp/isp.c | 2220 ++++++++++++ + drivers/media/video/omap3isp/isp.h | 431 +++ + drivers/media/video/omap3isp/ispccdc.c | 2268 ++++++++++++ + drivers/media/video/omap3isp/ispccdc.h | 219 ++ + drivers/media/video/omap3isp/ispccp2.c | 1173 +++++++ + drivers/media/video/omap3isp/ispccp2.h | 98 + + drivers/media/video/omap3isp/ispcsi2.c | 1317 +++++++ + drivers/media/video/omap3isp/ispcsi2.h | 166 + + drivers/media/video/omap3isp/ispcsiphy.c | 247 ++ + drivers/media/video/omap3isp/ispcsiphy.h | 74 + + drivers/media/video/omap3isp/isph3a.h | 117 + + drivers/media/video/omap3isp/isph3a_aewb.c | 374 ++ + drivers/media/video/omap3isp/isph3a_af.c | 429 +++ + drivers/media/video/omap3isp/isphist.c | 520 +++ + drivers/media/video/omap3isp/isphist.h | 40 + + drivers/media/video/omap3isp/isppreview.c | 2113 ++++++++++++ + drivers/media/video/omap3isp/isppreview.h | 214 ++ + drivers/media/video/omap3isp/ispqueue.c | 1153 +++++++ + drivers/media/video/omap3isp/ispqueue.h | 187 + + drivers/media/video/omap3isp/ispreg.h | 1589 +++++++++ + drivers/media/video/omap3isp/ispresizer.c | 1693 +++++++++ + drivers/media/video/omap3isp/ispresizer.h | 147 + + drivers/media/video/omap3isp/ispstat.c | 1092 ++++++ + drivers/media/video/omap3isp/ispstat.h | 169 + + drivers/media/video/omap3isp/ispvideo.c | 1255 +++++++ + drivers/media/video/omap3isp/ispvideo.h | 202 ++ + drivers/media/video/omap3isp/luma_enhance_table.h | 42 + + drivers/media/video/omap3isp/noise_filter_table.h | 30 + + drivers/media/video/ov6650.c | 10 +- + drivers/media/video/ov9740.c | 1009 ++++++ + drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 18 + + drivers/media/video/pvrusb2/pvrusb2-devattr.c | 24 + + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 84 +- + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 9 + + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 2 - + drivers/media/video/pwc/pwc-if.c | 38 +- + drivers/media/video/pwc/pwc-v4l.c | 1032 +++--- + drivers/media/video/pwc/pwc.h | 3 +- + drivers/media/video/s5p-fimc/fimc-capture.c | 602 ++-- + drivers/media/video/s5p-fimc/fimc-core.c | 1019 +++--- + drivers/media/video/s5p-fimc/fimc-core.h | 180 +- + drivers/media/video/s5p-fimc/fimc-reg.c | 205 +- + drivers/media/video/s5p-fimc/regs-fimc.h | 29 +- + drivers/media/video/saa7110.c | 115 +- + drivers/media/video/saa7134/saa7134-cards.c | 43 +- + drivers/media/video/saa7134/saa7134-core.c | 35 +- + drivers/media/video/saa7134/saa7134-empress.c | 4 + + drivers/media/video/saa7134/saa7134-input.c | 1 + + drivers/media/video/saa7134/saa7134.h | 1 + + drivers/media/video/saa7164/saa7164-api.c | 10 +- + drivers/media/video/saa7164/saa7164-buffer.c | 16 +- + drivers/media/video/saa7164/saa7164-bus.c | 8 +- + drivers/media/video/saa7164/saa7164-cmd.c | 10 +- + drivers/media/video/saa7164/saa7164-core.c | 8 +- + drivers/media/video/saa7164/saa7164-dvb.c | 4 +- + drivers/media/video/saa7164/saa7164-encoder.c | 8 +- + drivers/media/video/saa7164/saa7164-fw.c | 2 +- + drivers/media/video/saa7164/saa7164-vbi.c | 8 +- + drivers/media/video/sh_mobile_ceu_camera.c | 276 +- + drivers/media/video/sh_mobile_csi2.c | 6 +- + drivers/media/video/sn9c102/sn9c102_core.c | 6 +- + drivers/media/video/soc_camera.c | 131 +- + drivers/media/video/soc_mediabus.c | 16 +- + drivers/media/video/tlg2300/pd-video.c | 4 +- + drivers/media/video/tlv320aic23b.c | 74 +- + drivers/media/video/tuner-core.c | 1213 ++++--- + drivers/media/video/tvp514x.c | 236 +- + drivers/media/video/tvp5150.c | 199 +- + drivers/media/video/tvp7002.c | 117 +- + drivers/media/video/uvc/uvc_driver.c | 8 + + drivers/media/video/uvc/uvc_video.c | 14 +- + drivers/media/video/v4l2-common.c | 1 - + drivers/media/video/v4l2-compat-ioctl32.c | 244 ++- + drivers/media/video/v4l2-ctrls.c | 2 + + drivers/media/video/v4l2-dev.c | 76 +- + drivers/media/video/v4l2-device.c | 84 +- + drivers/media/video/v4l2-ioctl.c | 602 +++- + drivers/media/video/v4l2-mem2mem.c | 236 +- + drivers/media/video/v4l2-subdev.c | 332 ++ + drivers/media/video/via-camera.c | 64 + + drivers/media/video/videobuf-dma-contig.c | 2 +- + drivers/media/video/videobuf2-core.c | 1819 ++++++++++ + drivers/media/video/videobuf2-dma-contig.c | 185 + + drivers/media/video/videobuf2-dma-sg.c | 294 ++ + drivers/media/video/videobuf2-memops.c | 235 ++ + drivers/media/video/videobuf2-vmalloc.c | 132 + + drivers/media/video/vivi.c | 585 ++-- + drivers/media/video/vpx3220.c | 137 +- + drivers/media/video/wm8775.c | 126 +- + drivers/mfd/Kconfig | 2 +- + drivers/mfd/wl1273-core.c | 149 +- + drivers/staging/Kconfig | 8 +- + drivers/staging/Makefile | 5 +- + drivers/staging/altera-stapl/Kconfig | 8 + + drivers/staging/altera-stapl/Makefile | 3 + + drivers/staging/altera-stapl/altera-comp.c | 142 + + drivers/staging/altera-stapl/altera-exprt.h | 33 + + drivers/staging/altera-stapl/altera-jtag.c | 1020 ++++++ + drivers/staging/altera-stapl/altera-jtag.h | 113 + + drivers/staging/altera-stapl/altera-lpt.c | 70 + + drivers/staging/altera-stapl/altera.c | 2527 ++++++++++++++ + drivers/staging/cx25821/Kconfig | 1 - + drivers/staging/cx25821/cx25821-alsa.c | 2 + + drivers/staging/cx25821/cx25821-core.c | 16 +- + drivers/staging/cx25821/cx25821-video.c | 9 +- + drivers/staging/cx25821/cx25821.h | 3 +- + drivers/staging/cxd2099/Kconfig | 11 + + drivers/staging/cxd2099/Makefile | 5 + + drivers/staging/cxd2099/TODO | 12 + + drivers/staging/cxd2099/cxd2099.c | 574 ++++ + drivers/staging/cxd2099/cxd2099.h | 41 + + drivers/staging/dabusb/Kconfig | 14 - + drivers/staging/dabusb/Makefile | 2 - + drivers/staging/dabusb/TODO | 5 - + drivers/staging/dabusb/dabusb.c | 926 ----- + drivers/staging/dabusb/dabusb.h | 80 - + drivers/staging/se401/Kconfig | 13 - + drivers/staging/se401/Makefile | 1 - + drivers/staging/se401/TODO | 5 - + drivers/staging/se401/se401.c | 1492 -------- + drivers/staging/se401/se401.h | 236 -- + drivers/staging/se401/videodev.h | 318 -- + drivers/staging/tm6000/tm6000-alsa.c | 13 +- + drivers/staging/tm6000/tm6000-cards.c | 72 +- + drivers/staging/tm6000/tm6000-core.c | 298 ++- + drivers/staging/tm6000/tm6000-regs.h | 63 +- + drivers/staging/tm6000/tm6000-stds.c | 33 +- + drivers/staging/tm6000/tm6000-video.c | 327 ++- + drivers/staging/tm6000/tm6000.h | 23 +- + drivers/staging/usbvideo/Kconfig | 15 - + drivers/staging/usbvideo/Makefile | 2 - + drivers/staging/usbvideo/TODO | 5 - + drivers/staging/usbvideo/usbvideo.c | 2222 ------------ + drivers/staging/usbvideo/usbvideo.h | 395 --- + drivers/staging/usbvideo/vicam.c | 946 ----- + drivers/staging/usbvideo/videodev.h | 318 -- + drivers/video/matrox/matroxfb_base.c | 3 - + include/linux/Kbuild | 4 + + include/linux/media.h | 132 + + include/linux/mfd/wl1273-core.h | 2 + + include/linux/omap3isp.h | 646 ++++ + include/linux/v4l2-mediabus.h | 108 + + include/linux/v4l2-subdev.h | 141 + + include/linux/videodev2.h | 146 +- + include/media/media-device.h | 95 + + include/media/media-devnode.h | 97 + + include/media/media-entity.h | 151 + + include/media/noon010pc30.h | 28 + + include/media/rc-map.h | 2 + + include/media/{s3c_fimc.h => s5p_fimc.h} | 27 +- + include/media/soc_camera.h | 22 +- + include/media/soc_mediabus.h | 4 +- + include/media/tuner.h | 16 +- + include/media/v4l2-chip-ident.h | 4 + + include/media/v4l2-dev.h | 25 +- + include/media/v4l2-device.h | 10 + + include/media/v4l2-ioctl.h | 16 + + include/media/v4l2-mediabus.h | 61 +- + include/media/v4l2-mem2mem.h | 58 +- + include/media/v4l2-subdev.h | 113 +- + include/media/videobuf2-core.h | 380 ++ + include/media/videobuf2-dma-contig.h | 29 + + include/media/videobuf2-dma-sg.h | 32 + + include/media/videobuf2-memops.h | 45 + + include/media/videobuf2-vmalloc.h | 20 + + include/media/wm8775.h | 9 + + include/staging/altera.h | 49 + + sound/soc/codecs/Kconfig | 2 +- + sound/soc/codecs/wl1273.c | 11 +- + 391 files changed, 73952 insertions(+), 16265 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-media + create mode 100644 Documentation/DocBook/v4l/bayer.pdf + create mode 100644 Documentation/DocBook/v4l/bayer.png + create mode 100644 Documentation/DocBook/v4l/dev-subdev.xml + create mode 100644 Documentation/DocBook/v4l/media-controller.xml + create mode 100644 Documentation/DocBook/v4l/media-func-close.xml + create mode 100644 Documentation/DocBook/v4l/media-func-ioctl.xml + create mode 100644 Documentation/DocBook/v4l/media-func-open.xml + create mode 100644 Documentation/DocBook/v4l/media-ioc-device-info.xml + create mode 100644 Documentation/DocBook/v4l/media-ioc-enum-entities.xml + create mode 100644 Documentation/DocBook/v4l/media-ioc-enum-links.xml + create mode 100644 Documentation/DocBook/v4l/media-ioc-setup-link.xml + create mode 100644 Documentation/DocBook/v4l/nv12mt.gif + create mode 100644 Documentation/DocBook/v4l/nv12mt_example.gif + create mode 100644 Documentation/DocBook/v4l/pipeline.pdf + create mode 100644 Documentation/DocBook/v4l/pipeline.png + create mode 100644 Documentation/DocBook/v4l/pixfmt-nv12m.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-nv12mt.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-srggb12.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-yuv420m.xml + create mode 100644 Documentation/DocBook/v4l/planar-apis.xml + create mode 100644 Documentation/DocBook/v4l/subdev-formats.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-subdev-enum-frame-interval.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-subdev-enum-frame-size.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-subdev-enum-mbus-code.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-subdev-g-crop.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-subdev-g-fmt.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-subdev-g-frame-interval.xml + create mode 100644 Documentation/media-framework.txt + create mode 100644 Documentation/video4linux/omap3isp.txt + create mode 100644 arch/arm/mach-omap2/devices.h + create mode 100644 drivers/media/dvb/dvb-usb/technisat-usb2.c + delete mode 100644 drivers/media/dvb/firewire/firedtv-1394.c + create mode 100644 drivers/media/dvb/frontends/dib9000.c + create mode 100644 drivers/media/dvb/frontends/dib9000.h + create mode 100644 drivers/media/dvb/frontends/stv0367.c + create mode 100644 drivers/media/dvb/frontends/stv0367.h + create mode 100644 drivers/media/dvb/frontends/stv0367_priv.h + create mode 100644 drivers/media/dvb/frontends/stv0367_regs.h + create mode 100644 drivers/media/media-device.c + create mode 100644 drivers/media/media-devnode.c + create mode 100644 drivers/media/media-entity.c + create mode 100644 drivers/media/radio/wl128x/Kconfig + create mode 100644 drivers/media/radio/wl128x/Makefile + create mode 100644 drivers/media/radio/wl128x/fmdrv.h + create mode 100644 drivers/media/radio/wl128x/fmdrv_common.c + create mode 100644 drivers/media/radio/wl128x/fmdrv_common.h + create mode 100644 drivers/media/radio/wl128x/fmdrv_rx.c + create mode 100644 drivers/media/radio/wl128x/fmdrv_rx.h + create mode 100644 drivers/media/radio/wl128x/fmdrv_tx.c + create mode 100644 drivers/media/radio/wl128x/fmdrv_tx.h + create mode 100644 drivers/media/radio/wl128x/fmdrv_v4l2.c + create mode 100644 drivers/media/radio/wl128x/fmdrv_v4l2.h + create mode 100644 drivers/media/rc/keymaps/rc-technisat-usb2.c + create mode 100644 drivers/media/rc/keymaps/rc-terratec-slim-2.c + create mode 100644 drivers/media/video/cx23885/altera-ci.c + create mode 100644 drivers/media/video/cx23885/altera-ci.h + create mode 100644 drivers/media/video/gspca/autogain_functions.h + create mode 100644 drivers/media/video/gspca/nw80x.c + create mode 100644 drivers/media/video/gspca/vicam.c + create mode 100644 drivers/media/video/noon010pc30.c + create mode 100644 drivers/media/video/omap3isp/Makefile + create mode 100644 drivers/media/video/omap3isp/cfa_coef_table.h + create mode 100644 drivers/media/video/omap3isp/gamma_table.h + create mode 100644 drivers/media/video/omap3isp/isp.c + create mode 100644 drivers/media/video/omap3isp/isp.h + create mode 100644 drivers/media/video/omap3isp/ispccdc.c + create mode 100644 drivers/media/video/omap3isp/ispccdc.h + create mode 100644 drivers/media/video/omap3isp/ispccp2.c + create mode 100644 drivers/media/video/omap3isp/ispccp2.h + create mode 100644 drivers/media/video/omap3isp/ispcsi2.c + create mode 100644 drivers/media/video/omap3isp/ispcsi2.h + create mode 100644 drivers/media/video/omap3isp/ispcsiphy.c + create mode 100644 drivers/media/video/omap3isp/ispcsiphy.h + create mode 100644 drivers/media/video/omap3isp/isph3a.h + create mode 100644 drivers/media/video/omap3isp/isph3a_aewb.c + create mode 100644 drivers/media/video/omap3isp/isph3a_af.c + create mode 100644 drivers/media/video/omap3isp/isphist.c + create mode 100644 drivers/media/video/omap3isp/isphist.h + create mode 100644 drivers/media/video/omap3isp/isppreview.c + create mode 100644 drivers/media/video/omap3isp/isppreview.h + create mode 100644 drivers/media/video/omap3isp/ispqueue.c + create mode 100644 drivers/media/video/omap3isp/ispqueue.h + create mode 100644 drivers/media/video/omap3isp/ispreg.h + create mode 100644 drivers/media/video/omap3isp/ispresizer.c + create mode 100644 drivers/media/video/omap3isp/ispresizer.h + create mode 100644 drivers/media/video/omap3isp/ispstat.c + create mode 100644 drivers/media/video/omap3isp/ispstat.h + create mode 100644 drivers/media/video/omap3isp/ispvideo.c + create mode 100644 drivers/media/video/omap3isp/ispvideo.h + create mode 100644 drivers/media/video/omap3isp/luma_enhance_table.h + create mode 100644 drivers/media/video/omap3isp/noise_filter_table.h + create mode 100644 drivers/media/video/ov9740.c + create mode 100644 drivers/media/video/v4l2-subdev.c + create mode 100644 drivers/media/video/videobuf2-core.c + create mode 100644 drivers/media/video/videobuf2-dma-contig.c + create mode 100644 drivers/media/video/videobuf2-dma-sg.c + create mode 100644 drivers/media/video/videobuf2-memops.c + create mode 100644 drivers/media/video/videobuf2-vmalloc.c + create mode 100644 drivers/staging/altera-stapl/Kconfig + create mode 100644 drivers/staging/altera-stapl/Makefile + create mode 100644 drivers/staging/altera-stapl/altera-comp.c + create mode 100644 drivers/staging/altera-stapl/altera-exprt.h + create mode 100644 drivers/staging/altera-stapl/altera-jtag.c + create mode 100644 drivers/staging/altera-stapl/altera-jtag.h + create mode 100644 drivers/staging/altera-stapl/altera-lpt.c + create mode 100644 drivers/staging/altera-stapl/altera.c + create mode 100644 drivers/staging/cxd2099/Kconfig + create mode 100644 drivers/staging/cxd2099/Makefile + create mode 100644 drivers/staging/cxd2099/TODO + create mode 100644 drivers/staging/cxd2099/cxd2099.c + create mode 100644 drivers/staging/cxd2099/cxd2099.h + delete mode 100644 drivers/staging/dabusb/Kconfig + delete mode 100644 drivers/staging/dabusb/Makefile + delete mode 100644 drivers/staging/dabusb/TODO + delete mode 100644 drivers/staging/dabusb/dabusb.c + delete mode 100644 drivers/staging/dabusb/dabusb.h + delete mode 100644 drivers/staging/se401/Kconfig + delete mode 100644 drivers/staging/se401/Makefile + delete mode 100644 drivers/staging/se401/TODO + delete mode 100644 drivers/staging/se401/se401.c + delete mode 100644 drivers/staging/se401/se401.h + delete mode 100644 drivers/staging/se401/videodev.h + delete mode 100644 drivers/staging/usbvideo/Kconfig + delete mode 100644 drivers/staging/usbvideo/Makefile + delete mode 100644 drivers/staging/usbvideo/TODO + delete mode 100644 drivers/staging/usbvideo/usbvideo.c + delete mode 100644 drivers/staging/usbvideo/usbvideo.h + delete mode 100644 drivers/staging/usbvideo/vicam.c + delete mode 100644 drivers/staging/usbvideo/videodev.h + create mode 100644 include/linux/media.h + create mode 100644 include/linux/omap3isp.h + create mode 100644 include/linux/v4l2-mediabus.h + create mode 100644 include/linux/v4l2-subdev.h + create mode 100644 include/media/media-device.h + create mode 100644 include/media/media-devnode.h + create mode 100644 include/media/media-entity.h + create mode 100644 include/media/noon010pc30.h + rename include/media/{s3c_fimc.h => s5p_fimc.h} (69%) + create mode 100644 include/media/videobuf2-core.h + create mode 100644 include/media/videobuf2-dma-contig.h + create mode 100644 include/media/videobuf2-dma-sg.h + create mode 100644 include/media/videobuf2-memops.h + create mode 100644 include/media/videobuf2-vmalloc.h + create mode 100644 include/staging/altera.h +$ git reset --hard HEAD^ +HEAD is now at 13f75ce Merge branch 'quilt/jdelvare-hwmon' +Merging refs/next/20110321/v4l-dvb +$ git merge refs/next/20110321/v4l-dvb +Resolved 'drivers/staging/Kconfig' using previous resolution. +Resolved 'drivers/staging/Makefile' using previous resolution. +Resolved 'drivers/staging/easycap/easycap_ioctl.c' using previous resolution. +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging drivers/media/dvb/dvb-usb/dvb-usb-remote.c +Removing drivers/media/dvb/firewire/firedtv-1394.c +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/staging/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +CONFLICT (content): Merge conflict in drivers/staging/Makefile +Removing drivers/staging/dabusb/Kconfig +Removing drivers/staging/dabusb/Makefile +Removing drivers/staging/dabusb/TODO +CONFLICT (delete/modify): drivers/staging/dabusb/dabusb.c deleted in refs/next/20110321/v4l-dvb and modified in HEAD. Version HEAD of drivers/staging/dabusb/dabusb.c left in tree. +CONFLICT (delete/modify): drivers/staging/dabusb/dabusb.h deleted in refs/next/20110321/v4l-dvb and modified in HEAD. Version HEAD of drivers/staging/dabusb/dabusb.h left in tree. +Auto-merging drivers/staging/easycap/easycap_ioctl.c +CONFLICT (content): Merge conflict in drivers/staging/easycap/easycap_ioctl.c +Removing drivers/staging/se401/Kconfig +Removing drivers/staging/se401/Makefile +Removing drivers/staging/se401/TODO +Removing drivers/staging/se401/se401.c +Removing drivers/staging/se401/se401.h +Removing drivers/staging/se401/videodev.h +Removing drivers/staging/usbvideo/Kconfig +Removing drivers/staging/usbvideo/Makefile +Removing drivers/staging/usbvideo/TODO +CONFLICT (delete/modify): drivers/staging/usbvideo/usbvideo.c deleted in refs/next/20110321/v4l-dvb and modified in HEAD. Version HEAD of drivers/staging/usbvideo/usbvideo.c left in tree. +Removing drivers/staging/usbvideo/usbvideo.h +CONFLICT (delete/modify): drivers/staging/usbvideo/vicam.c deleted in refs/next/20110321/v4l-dvb and modified in HEAD. Version HEAD of drivers/staging/usbvideo/vicam.c left in tree. +Removing drivers/staging/usbvideo/videodev.h +Auto-merging drivers/video/matrox/matroxfb_base.c +Auto-merging include/media/s5p_fimc.h +Auto-merging sound/soc/codecs/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/usbvideo/usbvideo.c +drivers/staging/Kconfig: needs merge +drivers/staging/Makefile: needs merge +drivers/staging/dabusb/dabusb.c: needs merge +drivers/staging/dabusb/dabusb.h: needs merge +drivers/staging/easycap/easycap_ioctl.c: needs merge +drivers/staging/usbvideo/usbvideo.c: needs merge +drivers/staging/usbvideo/vicam.c: needs merge +rm 'drivers/staging/usbvideo/usbvideo.c' +$ git rm -f drivers/staging/usbvideo/vicam.c +drivers/staging/Kconfig: needs merge +drivers/staging/Makefile: needs merge +drivers/staging/dabusb/dabusb.c: needs merge +drivers/staging/dabusb/dabusb.h: needs merge +drivers/staging/easycap/easycap_ioctl.c: needs merge +drivers/staging/usbvideo/vicam.c: needs merge +rm 'drivers/staging/usbvideo/vicam.c' +$ git rm -f drivers/staging/dabusb/dabusb.c drivers/staging/dabusb/dabusb.h +drivers/staging/Kconfig: needs merge +drivers/staging/Makefile: needs merge +drivers/staging/dabusb/dabusb.c: needs merge +drivers/staging/dabusb/dabusb.h: needs merge +drivers/staging/easycap/easycap_ioctl.c: needs merge +rm 'drivers/staging/dabusb/dabusb.c' +rm 'drivers/staging/dabusb/dabusb.h' +$ git commit -v -a +[master b1c42d0] Merge commit 'refs/next/20110321/v4l-dvb' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/media-entities.tmpl | 8 + + Documentation/DocBook/v4l/common.xml | 2 + + Documentation/DocBook/v4l/compat.xml | 31 +- + Documentation/DocBook/v4l/dev-capture.xml | 13 +- + Documentation/DocBook/v4l/dev-output.xml | 13 +- + Documentation/DocBook/v4l/func-mmap.xml | 10 +- + Documentation/DocBook/v4l/func-munmap.xml | 3 +- + Documentation/DocBook/v4l/io.xml | 283 ++- + Documentation/DocBook/v4l/pixfmt-nv12m.xml | 154 + + Documentation/DocBook/v4l/pixfmt-yuv420m.xml | 162 + + Documentation/DocBook/v4l/pixfmt.xml | 118 +- + Documentation/DocBook/v4l/planar-apis.xml | 62 + + Documentation/DocBook/v4l/v4l2.xml | 30 +- + Documentation/DocBook/v4l/videodev2.h.xml | 141 +- + Documentation/DocBook/v4l/vidioc-enum-fmt.xml | 2 + + Documentation/DocBook/v4l/vidioc-g-fmt.xml | 15 +- + Documentation/DocBook/v4l/vidioc-qbuf.xml | 24 +- + Documentation/DocBook/v4l/vidioc-querybuf.xml | 14 +- + Documentation/DocBook/v4l/vidioc-querycap.xml | 18 +- + Documentation/dvb/get_dvb_firmware | 8 +- + Documentation/feature-removal-schedule.txt | 36 - + Documentation/video4linux/README.ivtv | 3 +- + Documentation/video4linux/gspca.txt | 1 + + drivers/media/common/tuners/tda9887.c | 9 +- + drivers/media/common/tuners/tea5761.c | 33 +- + drivers/media/common/tuners/tuner-types.c | 21 + + drivers/media/common/tuners/tuner-xc2028.c | 14 +- + drivers/media/common/tuners/xc5000.c | 56 +- + drivers/media/common/tuners/xc5000.h | 1 + + drivers/media/dvb/Kconfig | 2 +- + drivers/media/dvb/dvb-core/dvb_frontend.h | 1 - + drivers/media/dvb/dvb-usb/Kconfig | 8 + + drivers/media/dvb/dvb-usb/Makefile | 3 + + drivers/media/dvb/dvb-usb/dib0700.h | 2 + + drivers/media/dvb/dvb-usb/dib0700_core.c | 47 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 1411 ++++++++- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 7 + + drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 2 +- + drivers/media/dvb/dvb-usb/dvb-usb.h | 2 + + drivers/media/dvb/dvb-usb/dw2102.c | 550 +++- + drivers/media/dvb/dvb-usb/technisat-usb2.c | 807 +++++ + drivers/media/dvb/firewire/Kconfig | 8 +- + drivers/media/dvb/firewire/Makefile | 5 +- + drivers/media/dvb/firewire/firedtv-1394.c | 300 -- + drivers/media/dvb/firewire/firedtv-avc.c | 15 +- + drivers/media/dvb/firewire/firedtv-dvb.c | 135 +- + drivers/media/dvb/firewire/firedtv-fe.c | 8 +- + drivers/media/dvb/firewire/firedtv-fw.c | 146 +- + drivers/media/dvb/firewire/firedtv.h | 45 +- + drivers/media/dvb/frontends/Kconfig | 15 + + drivers/media/dvb/frontends/Makefile | 2 + + drivers/media/dvb/frontends/dib0090.c | 1595 +++++++-- + drivers/media/dvb/frontends/dib0090.h | 31 + + drivers/media/dvb/frontends/dib7000p.c | 1945 ++++++++--- + drivers/media/dvb/frontends/dib7000p.h | 96 +- + drivers/media/dvb/frontends/dib8000.c | 821 +++-- + drivers/media/dvb/frontends/dib8000.h | 20 + + drivers/media/dvb/frontends/dib9000.c | 2351 ++++++++++++++ + drivers/media/dvb/frontends/dib9000.h | 131 + + drivers/media/dvb/frontends/dibx000_common.c | 279 ++- + drivers/media/dvb/frontends/dibx000_common.h | 152 +- + drivers/media/dvb/frontends/ds3000.c | 645 ++-- + drivers/media/dvb/frontends/ds3000.h | 3 + + drivers/media/dvb/frontends/dvb-pll.c | 79 +- + drivers/media/dvb/frontends/stv0367.c | 3441 ++++++++++++++++++++ + drivers/media/dvb/frontends/stv0367.h | 66 + + drivers/media/dvb/frontends/stv0367_priv.h | 212 ++ + drivers/media/dvb/frontends/stv0367_regs.h | 3614 +++++++++++++++++++++ + drivers/media/dvb/frontends/stv0900.h | 2 + + drivers/media/dvb/frontends/stv0900_core.c | 27 +- + drivers/media/dvb/frontends/stv090x.c | 295 ++- + drivers/media/dvb/frontends/stv090x.h | 16 + + drivers/media/dvb/frontends/stv090x_reg.h | 16 +- + drivers/media/dvb/ngene/Makefile | 3 + + drivers/media/dvb/ngene/ngene-cards.c | 179 +- + drivers/media/dvb/ngene/ngene-core.c | 236 +- + drivers/media/dvb/ngene/ngene-dvb.c | 71 +- + drivers/media/dvb/ngene/ngene.h | 24 + + drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 1 + + drivers/media/radio/Kconfig | 4 + + drivers/media/radio/Makefile | 1 + + drivers/media/radio/radio-wl1273.c | 360 +-- + drivers/media/radio/si470x/radio-si470x-common.c | 1 - + drivers/media/radio/wl128x/Kconfig | 17 + + drivers/media/radio/wl128x/Makefile | 6 + + drivers/media/radio/wl128x/fmdrv.h | 244 ++ + drivers/media/radio/wl128x/fmdrv_common.c | 1677 ++++++++++ + drivers/media/radio/wl128x/fmdrv_common.h | 402 +++ + drivers/media/radio/wl128x/fmdrv_rx.c | 847 +++++ + drivers/media/radio/wl128x/fmdrv_rx.h | 59 + + drivers/media/radio/wl128x/fmdrv_tx.c | 425 +++ + drivers/media/radio/wl128x/fmdrv_tx.h | 37 + + drivers/media/radio/wl128x/fmdrv_v4l2.c | 580 ++++ + drivers/media/radio/wl128x/fmdrv_v4l2.h | 33 + + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-technisat-usb2.c | 93 + + drivers/media/video/Kconfig | 45 +- + drivers/media/video/Makefile | 8 + + drivers/media/video/adv7343.c | 167 +- + drivers/media/video/adv7343_regs.h | 8 +- + drivers/media/video/au0828/au0828-cards.c | 3 +- + drivers/media/video/bt819.c | 129 +- + drivers/media/video/bt8xx/bttv-cards.c | 2 +- + drivers/media/video/cpia2/cpia2_v4l.c | 373 +-- + drivers/media/video/cs5345.c | 87 +- + drivers/media/video/cx18/cx18-av-audio.c | 92 +- + drivers/media/video/cx18/cx18-av-core.c | 175 +- + drivers/media/video/cx18/cx18-av-core.h | 12 +- + drivers/media/video/cx18/cx18-controls.c | 285 +-- + drivers/media/video/cx18/cx18-controls.h | 7 +- + drivers/media/video/cx18/cx18-driver.c | 31 +- + drivers/media/video/cx18/cx18-driver.h | 2 +- + drivers/media/video/cx18/cx18-fileops.c | 32 +- + drivers/media/video/cx18/cx18-ioctl.c | 24 +- + drivers/media/video/cx18/cx18-mailbox.c | 5 +- + drivers/media/video/cx18/cx18-mailbox.h | 5 - + drivers/media/video/cx18/cx18-streams.c | 16 +- + drivers/media/video/cx18/cx23418.h | 2 +- + drivers/media/video/cx231xx/cx231xx-417.c | 4 +- + drivers/media/video/cx231xx/cx231xx-avcore.c | 14 +- + drivers/media/video/cx231xx/cx231xx-cards.c | 246 +- + drivers/media/video/cx231xx/cx231xx-core.c | 16 +- + drivers/media/video/cx231xx/cx231xx-i2c.c | 31 +- + drivers/media/video/cx231xx/cx231xx-video.c | 20 +- + drivers/media/video/cx231xx/cx231xx.h | 7 +- + drivers/media/video/cx23885/Kconfig | 12 +- + drivers/media/video/cx23885/Makefile | 1 + + drivers/media/video/cx23885/altera-ci.c | 832 +++++ + drivers/media/video/cx23885/altera-ci.h | 100 + + drivers/media/video/cx23885/cx23885-cards.c | 110 +- + drivers/media/video/cx23885/cx23885-core.c | 37 +- + drivers/media/video/cx23885/cx23885-dvb.c | 172 +- + drivers/media/video/cx23885/cx23885-reg.h | 1 + + drivers/media/video/cx23885/cx23885-video.c | 7 +- + drivers/media/video/cx23885/cx23885.h | 7 +- + drivers/media/video/cx88/cx88-alsa.c | 118 +- + drivers/media/video/cx88/cx88-cards.c | 24 +- + drivers/media/video/cx88/cx88-dvb.c | 23 + + drivers/media/video/cx88/cx88-input.c | 1 + + drivers/media/video/cx88/cx88-tvaudio.c | 8 +- + drivers/media/video/cx88/cx88-video.c | 78 +- + drivers/media/video/cx88/cx88.h | 14 +- + drivers/media/video/em28xx/em28xx-video.c | 33 +- + drivers/media/video/gspca/Kconfig | 10 + + drivers/media/video/gspca/Makefile | 2 + + drivers/media/video/gspca/cpia1.c | 6 +- + drivers/media/video/gspca/ov519.c | 90 +- + drivers/media/video/gspca/ov534.c | 980 ++++--- + drivers/media/video/gspca/sn9c20x.c | 40 +- + drivers/media/video/gspca/sonixj.c | 353 ++- + drivers/media/video/gspca/vicam.c | 381 +++ + drivers/media/video/gspca/zc3xx.c | 4 + + drivers/media/video/ivtv/ivtv-udma.c | 7 +- + drivers/media/video/ivtv/ivtv-vbi.c | 2 +- + drivers/media/video/ivtv/ivtv-yuv.c | 52 +- + drivers/media/video/mem2mem_testdev.c | 227 +- + drivers/media/video/mx3_camera.c | 415 ++-- + drivers/media/video/noon010pc30.c | 792 +++++ + drivers/media/video/omap1_camera.c | 66 +- + drivers/media/video/omap24xxcam.c | 1 + + drivers/media/video/ov9740.c | 1009 ++++++ + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 60 +- + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 9 + + drivers/media/video/pwc/pwc-if.c | 38 +- + drivers/media/video/pwc/pwc-v4l.c | 1032 +++--- + drivers/media/video/pwc/pwc.h | 3 +- + drivers/media/video/s5p-fimc/fimc-capture.c | 550 ++-- + drivers/media/video/s5p-fimc/fimc-core.c | 872 +++--- + drivers/media/video/s5p-fimc/fimc-core.h | 134 +- + drivers/media/video/s5p-fimc/fimc-reg.c | 199 +- + drivers/media/video/s5p-fimc/regs-fimc.h | 29 +- + drivers/media/video/saa7110.c | 115 +- + drivers/media/video/saa7134/saa7134-cards.c | 43 +- + drivers/media/video/saa7134/saa7134-core.c | 35 +- + drivers/media/video/saa7134/saa7134-empress.c | 4 + + drivers/media/video/saa7134/saa7134-input.c | 1 + + drivers/media/video/saa7134/saa7134.h | 1 + + drivers/media/video/saa7164/saa7164-api.c | 10 +- + drivers/media/video/saa7164/saa7164-buffer.c | 16 +- + drivers/media/video/saa7164/saa7164-bus.c | 8 +- + drivers/media/video/saa7164/saa7164-cmd.c | 10 +- + drivers/media/video/saa7164/saa7164-core.c | 8 +- + drivers/media/video/saa7164/saa7164-dvb.c | 4 +- + drivers/media/video/saa7164/saa7164-encoder.c | 8 +- + drivers/media/video/saa7164/saa7164-fw.c | 2 +- + drivers/media/video/saa7164/saa7164-vbi.c | 8 +- + drivers/media/video/sh_mobile_ceu_camera.c | 276 +- + drivers/media/video/sn9c102/sn9c102_core.c | 6 +- + drivers/media/video/soc_camera.c | 131 +- + drivers/media/video/soc_mediabus.c | 14 + + drivers/media/video/tlv320aic23b.c | 74 +- + drivers/media/video/tuner-core.c | 1213 ++++---- + drivers/media/video/tvp514x.c | 236 +- + drivers/media/video/tvp5150.c | 199 +- + drivers/media/video/tvp7002.c | 117 +- + drivers/media/video/v4l2-common.c | 1 - + drivers/media/video/v4l2-compat-ioctl32.c | 244 ++- + drivers/media/video/v4l2-ctrls.c | 2 + + drivers/media/video/v4l2-ioctl.c | 493 +++- + drivers/media/video/v4l2-mem2mem.c | 232 +- + drivers/media/video/via-camera.c | 64 + + drivers/media/video/videobuf2-core.c | 1804 ++++++++++ + drivers/media/video/videobuf2-dma-contig.c | 185 ++ + drivers/media/video/videobuf2-dma-sg.c | 292 ++ + drivers/media/video/videobuf2-memops.c | 235 ++ + drivers/media/video/videobuf2-vmalloc.c | 132 + + drivers/media/video/vivi.c | 585 ++-- + drivers/media/video/vpx3220.c | 137 +- + drivers/media/video/wm8775.c | 126 +- + drivers/mfd/Kconfig | 2 +- + drivers/mfd/wl1273-core.c | 149 +- + drivers/staging/Kconfig | 8 +- + drivers/staging/Makefile | 5 +- + drivers/staging/altera-stapl/Kconfig | 8 + + drivers/staging/altera-stapl/Makefile | 3 + + drivers/staging/altera-stapl/altera-comp.c | 142 + + drivers/staging/altera-stapl/altera-exprt.h | 33 + + drivers/staging/altera-stapl/altera-jtag.c | 1020 ++++++ + drivers/staging/altera-stapl/altera-jtag.h | 113 + + drivers/staging/altera-stapl/altera-lpt.c | 70 + + drivers/staging/altera-stapl/altera.c | 2527 ++++++++++++++ + drivers/staging/cx25821/Kconfig | 1 - + drivers/staging/cx25821/cx25821-alsa.c | 2 + + drivers/staging/cx25821/cx25821-core.c | 16 +- + drivers/staging/cx25821/cx25821-video.c | 9 +- + drivers/staging/cx25821/cx25821.h | 3 +- + drivers/staging/cxd2099/Kconfig | 11 + + drivers/staging/cxd2099/Makefile | 5 + + drivers/staging/cxd2099/TODO | 12 + + drivers/staging/cxd2099/cxd2099.c | 574 ++++ + drivers/staging/cxd2099/cxd2099.h | 41 + + drivers/staging/dabusb/Kconfig | 14 - + drivers/staging/dabusb/Makefile | 2 - + drivers/staging/dabusb/TODO | 5 - + drivers/staging/dabusb/dabusb.c | 926 ------ + drivers/staging/dabusb/dabusb.h | 80 - + drivers/staging/se401/Kconfig | 13 - + drivers/staging/se401/Makefile | 1 - + drivers/staging/se401/TODO | 5 - + drivers/staging/se401/se401.c | 1492 --------- + drivers/staging/se401/se401.h | 236 -- + drivers/staging/se401/videodev.h | 318 -- + drivers/staging/tm6000/tm6000-alsa.c | 13 +- + drivers/staging/tm6000/tm6000-cards.c | 72 +- + drivers/staging/tm6000/tm6000-core.c | 298 ++- + drivers/staging/tm6000/tm6000-regs.h | 63 +- + drivers/staging/tm6000/tm6000-stds.c | 33 +- + drivers/staging/tm6000/tm6000-video.c | 327 ++- + drivers/staging/tm6000/tm6000.h | 23 +- + drivers/staging/usbvideo/Kconfig | 15 - + drivers/staging/usbvideo/Makefile | 2 - + drivers/staging/usbvideo/TODO | 5 - + drivers/staging/usbvideo/usbvideo.c | 2222 ------------- + drivers/staging/usbvideo/usbvideo.h | 395 --- + drivers/staging/usbvideo/vicam.c | 946 ------ + drivers/staging/usbvideo/videodev.h | 318 -- + drivers/video/matrox/matroxfb_base.c | 3 - + include/linux/mfd/wl1273-core.h | 2 + + include/linux/videodev2.h | 141 +- + include/media/noon010pc30.h | 28 + + include/media/rc-map.h | 1 + + include/media/{s3c_fimc.h => s5p_fimc.h} | 20 +- + include/media/soc_camera.h | 22 +- + include/media/soc_mediabus.h | 1 + + include/media/tuner.h | 16 +- + include/media/v4l2-chip-ident.h | 4 + + include/media/v4l2-ioctl.h | 16 + + include/media/v4l2-mem2mem.h | 56 +- + include/media/v4l2-subdev.h | 2 + + include/media/videobuf2-core.h | 380 +++ + include/media/videobuf2-dma-contig.h | 29 + + include/media/videobuf2-dma-sg.h | 32 + + include/media/videobuf2-memops.h | 45 + + include/media/videobuf2-vmalloc.h | 20 + + include/media/wm8775.h | 9 + + include/staging/altera.h | 49 + + sound/soc/codecs/Kconfig | 2 +- + sound/soc/codecs/wl1273.c | 11 +- + 278 files changed, 41751 insertions(+), 15520 deletions(-) + create mode 100644 Documentation/DocBook/v4l/pixfmt-nv12m.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-yuv420m.xml + create mode 100644 Documentation/DocBook/v4l/planar-apis.xml + create mode 100644 drivers/media/dvb/dvb-usb/technisat-usb2.c + delete mode 100644 drivers/media/dvb/firewire/firedtv-1394.c + create mode 100644 drivers/media/dvb/frontends/dib9000.c + create mode 100644 drivers/media/dvb/frontends/dib9000.h + create mode 100644 drivers/media/dvb/frontends/stv0367.c + create mode 100644 drivers/media/dvb/frontends/stv0367.h + create mode 100644 drivers/media/dvb/frontends/stv0367_priv.h + create mode 100644 drivers/media/dvb/frontends/stv0367_regs.h + create mode 100644 drivers/media/radio/wl128x/Kconfig + create mode 100644 drivers/media/radio/wl128x/Makefile + create mode 100644 drivers/media/radio/wl128x/fmdrv.h + create mode 100644 drivers/media/radio/wl128x/fmdrv_common.c + create mode 100644 drivers/media/radio/wl128x/fmdrv_common.h + create mode 100644 drivers/media/radio/wl128x/fmdrv_rx.c + create mode 100644 drivers/media/radio/wl128x/fmdrv_rx.h + create mode 100644 drivers/media/radio/wl128x/fmdrv_tx.c + create mode 100644 drivers/media/radio/wl128x/fmdrv_tx.h + create mode 100644 drivers/media/radio/wl128x/fmdrv_v4l2.c + create mode 100644 drivers/media/radio/wl128x/fmdrv_v4l2.h + create mode 100644 drivers/media/rc/keymaps/rc-technisat-usb2.c + create mode 100644 drivers/media/video/cx23885/altera-ci.c + create mode 100644 drivers/media/video/cx23885/altera-ci.h + create mode 100644 drivers/media/video/gspca/vicam.c + create mode 100644 drivers/media/video/noon010pc30.c + create mode 100644 drivers/media/video/ov9740.c + create mode 100644 drivers/media/video/videobuf2-core.c + create mode 100644 drivers/media/video/videobuf2-dma-contig.c + create mode 100644 drivers/media/video/videobuf2-dma-sg.c + create mode 100644 drivers/media/video/videobuf2-memops.c + create mode 100644 drivers/media/video/videobuf2-vmalloc.c + create mode 100644 drivers/staging/altera-stapl/Kconfig + create mode 100644 drivers/staging/altera-stapl/Makefile + create mode 100644 drivers/staging/altera-stapl/altera-comp.c + create mode 100644 drivers/staging/altera-stapl/altera-exprt.h + create mode 100644 drivers/staging/altera-stapl/altera-jtag.c + create mode 100644 drivers/staging/altera-stapl/altera-jtag.h + create mode 100644 drivers/staging/altera-stapl/altera-lpt.c + create mode 100644 drivers/staging/altera-stapl/altera.c + create mode 100644 drivers/staging/cxd2099/Kconfig + create mode 100644 drivers/staging/cxd2099/Makefile + create mode 100644 drivers/staging/cxd2099/TODO + create mode 100644 drivers/staging/cxd2099/cxd2099.c + create mode 100644 drivers/staging/cxd2099/cxd2099.h + delete mode 100644 drivers/staging/dabusb/Kconfig + delete mode 100644 drivers/staging/dabusb/Makefile + delete mode 100644 drivers/staging/dabusb/TODO + delete mode 100644 drivers/staging/dabusb/dabusb.c + delete mode 100644 drivers/staging/dabusb/dabusb.h + delete mode 100644 drivers/staging/se401/Kconfig + delete mode 100644 drivers/staging/se401/Makefile + delete mode 100644 drivers/staging/se401/TODO + delete mode 100644 drivers/staging/se401/se401.c + delete mode 100644 drivers/staging/se401/se401.h + delete mode 100644 drivers/staging/se401/videodev.h + delete mode 100644 drivers/staging/usbvideo/Kconfig + delete mode 100644 drivers/staging/usbvideo/Makefile + delete mode 100644 drivers/staging/usbvideo/TODO + delete mode 100644 drivers/staging/usbvideo/usbvideo.c + delete mode 100644 drivers/staging/usbvideo/usbvideo.h + delete mode 100644 drivers/staging/usbvideo/vicam.c + delete mode 100644 drivers/staging/usbvideo/videodev.h + create mode 100644 include/media/noon010pc30.h + rename include/media/{s3c_fimc.h => s5p_fimc.h} (75%) + create mode 100644 include/media/videobuf2-core.h + create mode 100644 include/media/videobuf2-dma-contig.h + create mode 100644 include/media/videobuf2-dma-sg.h + create mode 100644 include/media/videobuf2-memops.h + create mode 100644 include/media/videobuf2-vmalloc.h + create mode 100644 include/staging/altera.h +Merging kbuild/for-next +$ git merge kbuild/for-next +Already up-to-date! +Merge made by recursive. +Merging kconfig/for-next +$ git merge kconfig/for-next +Already up-to-date! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/core/addr.c | 2 +- + drivers/infiniband/core/agent.c | 3 +- + drivers/infiniband/hw/nes/nes.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 725 +++++++++++++++++++++++------------ + drivers/infiniband/ulp/srp/ib_srp.h | 38 ++- + 5 files changed, 518 insertions(+), 252 deletions(-) +Merging acpi/test +$ git merge acpi/test +Resolved 'arch/x86/kernel/acpi/sleep.c' using previous resolution. +Auto-merging arch/x86/include/asm/acpi.h +Auto-merging arch/x86/kernel/acpi/sleep.c +CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/sleep.c +Auto-merging arch/x86/kernel/acpi/sleep.h +Auto-merging drivers/acpi/osl.c +Auto-merging drivers/acpi/sleep.c +Auto-merging include/acpi/acpi_bus.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 47bdae6] Merge remote-tracking branch 'acpi/test' +$ git diff -M --stat --summary HEAD^.. + arch/ia64/include/asm/acpi.h | 6 +- + arch/ia64/kernel/acpi.c | 14 +- + arch/x86/include/asm/acpi.h | 5 +- + arch/x86/kernel/acpi/sleep.c | 12 +- + arch/x86/kernel/acpi/sleep.h | 2 + + drivers/acpi/acpica/Makefile | 4 +- + drivers/acpi/acpica/acdispat.h | 38 ++- + drivers/acpi/acpica/acglobal.h | 4 + + drivers/acpi/acpica/aclocal.h | 19 - + drivers/acpi/acpica/dsargs.c | 391 +++++++++++++++++++++ + drivers/acpi/acpica/dscontrol.c | 410 ++++++++++++++++++++++ + drivers/acpi/acpica/dsopcode.c | 725 +-------------------------------------- + drivers/acpi/acpica/dswload.c | 670 +------------------------------------ + drivers/acpi/acpica/dswload2.c | 720 ++++++++++++++++++++++++++++++++++++++ + drivers/acpi/acpica/evgpe.c | 9 + + drivers/acpi/acpica/evregion.c | 2 + + drivers/acpi/acpica/evxfregn.c | 36 ++- + drivers/acpi/acpica/exfldio.c | 4 +- + drivers/acpi/acpica/tbfadt.c | 5 +- + drivers/acpi/acpica/utdecode.c | 548 +++++++++++++++++++++++++++++ + drivers/acpi/acpica/utglobal.c | 484 +-------------------------- + drivers/acpi/button.c | 11 +- + drivers/acpi/nvs.c | 22 +- + drivers/acpi/osl.c | 139 +++++---- + drivers/acpi/scan.c | 1 - + drivers/acpi/sleep.c | 28 +-- + drivers/pci/pci-acpi.c | 16 +- + include/acpi/acoutput.h | 12 +- + include/acpi/acpi_bus.h | 1 - + include/acpi/acpixf.h | 2 +- + include/acpi/actbl.h | 16 + + include/linux/acpi_io.h | 3 +- + 32 files changed, 2306 insertions(+), 2053 deletions(-) + create mode 100644 drivers/acpi/acpica/dsargs.c + create mode 100644 drivers/acpi/acpica/dscontrol.c + create mode 100644 drivers/acpi/acpica/dswload2.c + create mode 100644 drivers/acpi/acpica/utdecode.c +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Merge made by recursive. + drivers/idle/intel_idle.c | 22 +++++++++++----------- + 1 files changed, 11 insertions(+), 11 deletions(-) +Merging powertools/tools-test +$ git merge powertools/tools-test +Already up-to-date. +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date! +Merge made by recursive. +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Already up-to-date. +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/master +$ git merge swiotlb/master +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merging drivers/scsi/aacraid/Makefile +Auto-merging drivers/scsi/lpfc/Makefile +Auto-merging drivers/target/target_core_hba.c +Merge made by recursive. + Documentation/target/tcm_mod_builder.py | 18 +- + drivers/scsi/aacraid/Makefile | 2 +- + drivers/scsi/aacraid/aachba.c | 7 +- + drivers/scsi/aacraid/aacraid.h | 106 ++- + drivers/scsi/aacraid/commctrl.c | 3 +- + drivers/scsi/aacraid/comminit.c | 58 +- + drivers/scsi/aacraid/commsup.c | 41 +- + drivers/scsi/aacraid/dpcsup.c | 85 ++- + drivers/scsi/aacraid/linit.c | 15 +- + drivers/scsi/aacraid/nark.c | 3 +- + drivers/scsi/aacraid/rkt.c | 3 +- + drivers/scsi/aacraid/rx.c | 33 +- + drivers/scsi/aacraid/sa.c | 7 +- + drivers/scsi/aacraid/src.c | 594 +++++++++ + drivers/scsi/bnx2fc/bnx2fc.h | 22 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 88 +-- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 15 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 73 +- + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 4 +- + drivers/scsi/libiscsi_tcp.c | 15 +- + drivers/scsi/lpfc/Makefile | 2 +- + drivers/scsi/lpfc/lpfc.h | 27 +- + drivers/scsi/lpfc/lpfc_attr.c | 14 +- + drivers/scsi/lpfc/lpfc_bsg.c | 36 +- + drivers/scsi/lpfc/lpfc_crtn.h | 6 +- + drivers/scsi/lpfc/lpfc_els.c | 3 +- + drivers/scsi/lpfc/lpfc_hw.h | 15 +- + drivers/scsi/lpfc/lpfc_hw4.h | 113 ++- + drivers/scsi/lpfc/lpfc_init.c | 41 +- + drivers/scsi/lpfc/lpfc_scsi.c | 43 +- + drivers/scsi/lpfc/lpfc_sli.c | 513 +++++--- + drivers/scsi/lpfc/lpfc_sli4.h | 2 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 49 + + drivers/scsi/mpt2sas/mpt2sas_base.h | 20 + + drivers/scsi/mvsas/mv_init.c | 7 + + drivers/scsi/scsi_transport_iscsi.c | 2 +- + drivers/scsi/ses.c | 48 +- + drivers/target/Makefile | 4 +- + drivers/target/target_core_configfs.c | 117 ++- + drivers/target/target_core_device.c | 40 +- + drivers/target/target_core_fabric_configfs.c | 209 +++- + drivers/target/target_core_fabric_lib.c | 1 + + drivers/target/target_core_file.c | 28 +- + drivers/target/target_core_hba.c | 15 +- + drivers/target/target_core_iblock.c | 28 +- + drivers/target/target_core_pscsi.c | 22 +- + drivers/target/target_core_rd.c | 15 +- + drivers/target/target_core_rd.h | 2 - + drivers/target/target_core_stat.c | 1810 ++++++++++++++++++++++++++ + drivers/target/target_core_stat.h | 8 + + drivers/target/target_core_transport.c | 37 +- + include/scsi/libiscsi_tcp.h | 1 + + include/scsi/scsi_device.h | 2 +- + include/target/target_core_base.h | 73 +- + include/target/target_core_configfs.h | 4 + + include/target/target_core_fabric_ops.h | 2 +- + include/target/target_core_tmr.h | 52 +- + include/target/target_core_transport.h | 4 + + 59 files changed, 3974 insertions(+), 635 deletions(-) + create mode 100644 drivers/scsi/aacraid/src.c + create mode 100644 drivers/target/target_core_stat.c + create mode 100644 drivers/target/target_core_stat.h +Merging async_tx/next +$ git merge async_tx/next +Auto-merging drivers/dma/Makefile +Merge made by recursive. + arch/arm/mach-mxs/include/mach/dma.h | 26 + + arch/arm/plat-nomadik/include/plat/ste_dma40.h | 22 +- + arch/avr32/mach-at32ap/at32ap700x.c | 15 + + drivers/dma/Kconfig | 10 +- + drivers/dma/Makefile | 1 + + drivers/dma/dw_dmac.c | 103 ++- + drivers/dma/dw_dmac_regs.h | 12 +- + drivers/dma/mxs-dma.c | 724 ++++++++++++ + drivers/dma/pch_dma.c | 35 +- + drivers/dma/ste_dma40.c | 1402 +++++++++++------------- + drivers/dma/ste_dma40_ll.c | 218 ++--- + drivers/dma/ste_dma40_ll.h | 66 +- + include/linux/dw_dmac.h | 44 +- + 13 files changed, 1671 insertions(+), 1007 deletions(-) + create mode 100644 arch/arm/mach-mxs/include/mach/dma.h + create mode 100644 drivers/dma/mxs-dma.c +Merging net/master +$ git merge net/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging bluetooth/master +$ git merge bluetooth/master +Auto-merging drivers/bluetooth/btusb.c +Merge made by recursive. + drivers/bluetooth/btusb.c | 3 +- + include/net/bluetooth/hci.h | 10 +++- + include/net/bluetooth/hci_core.h | 3 +- + include/net/bluetooth/mgmt.h | 15 +++++++ + net/bluetooth/hci_core.c | 7 ++- + net/bluetooth/hci_event.c | 17 +++++--- + net/bluetooth/hci_sysfs.c | 6 +- + net/bluetooth/l2cap_core.c | 4 +- + net/bluetooth/mgmt.c | 81 ++++++++++++++++++++++++++++++++++++++ + 9 files changed, 129 insertions(+), 17 deletions(-) +Merging mtd/master +$ git merge mtd/master +Auto-merging arch/arm/plat-omap/include/plat/onenand.h +Auto-merging arch/cris/Kconfig +Auto-merging drivers/mtd/maps/physmap_of.c +Auto-merging drivers/mtd/nand/Kconfig +Auto-merging drivers/mtd/nand/mpc5121_nfc.c +Auto-merging drivers/mtd/nand/mxc_nand.c +Auto-merging drivers/mtd/nand/omap2.c +Auto-merging drivers/mtd/onenand/omap2.c +Auto-merging drivers/mtd/sm_ftl.c +Auto-merging lib/Kconfig +Auto-merging lib/Makefile +Merge made by recursive. + arch/arm/plat-omap/include/plat/onenand.h | 1 + + arch/arm/plat-pxa/include/plat/pxa3xx_nand.h | 2 +- + arch/cris/Kconfig | 1 - + arch/cris/arch-v10/drivers/axisflashmap.c | 6 - + arch/cris/arch-v32/drivers/Kconfig | 1 - + arch/cris/arch-v32/drivers/axisflashmap.c | 6 - + drivers/mtd/Kconfig | 26 +- + drivers/mtd/Makefile | 4 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 2 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 3 +- + drivers/mtd/chips/cfi_cmdset_0020.c | 2 +- + drivers/mtd/devices/m25p80.c | 5 +- + drivers/mtd/devices/mtdram.c | 1 + + drivers/mtd/devices/phram.c | 3 + + drivers/mtd/maps/Kconfig | 13 +- + drivers/mtd/maps/Makefile | 1 + + drivers/mtd/maps/ceiva.c | 6 - + drivers/mtd/maps/integrator-flash.c | 10 - + drivers/mtd/maps/latch-addr-flash.c | 272 +++++ + drivers/mtd/maps/physmap.c | 8 - + drivers/mtd/maps/physmap_of.c | 8 - + drivers/mtd/maps/sa1100-flash.c | 8 - + drivers/mtd/maps/ts5500_flash.c | 1 - + drivers/mtd/mtd_blkdevs.c | 37 +- + drivers/mtd/mtdconcat.c | 8 +- + drivers/mtd/mtdcore.c | 6 +- + drivers/mtd/mtdswap.c | 1593 ++++++++++++++++++++++++++ + drivers/mtd/nand/Kconfig | 15 + + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/atmel_nand.c | 166 +++- + drivers/mtd/nand/davinci_nand.c | 3 - + drivers/mtd/nand/mpc5121_nfc.c | 5 +- + drivers/mtd/nand/mxc_nand.c | 31 +- + drivers/mtd/nand/nand_base.c | 42 +- + drivers/mtd/nand/nand_bbt.c | 8 +- + drivers/mtd/nand/nand_bch.c | 243 ++++ + drivers/mtd/nand/nandsim.c | 43 +- + drivers/mtd/nand/omap2.c | 16 +- + drivers/mtd/nand/pxa3xx_nand.c | 977 ++++++++--------- + drivers/mtd/onenand/omap2.c | 7 +- + drivers/mtd/onenand/onenand_base.c | 15 +- + drivers/mtd/sm_ftl.c | 18 + + drivers/mtd/tests/mtd_speedtest.c | 80 ++- + drivers/mtd/tests/mtd_subpagetest.c | 10 +- + fs/jffs2/xattr.c | 2 +- + include/linux/bch.h | 79 ++ + include/linux/mtd/blktrans.h | 2 + + include/linux/mtd/cfi.h | 1 + + include/linux/mtd/latch-addr-flash.h | 29 + + include/linux/mtd/nand.h | 3 + + include/linux/mtd/nand_bch.h | 72 ++ + include/linux/mtd/onenand.h | 1 + + lib/Kconfig | 39 + + lib/Makefile | 1 + + lib/bch.c | 1368 ++++++++++++++++++++++ + 55 files changed, 4664 insertions(+), 647 deletions(-) + create mode 100644 drivers/mtd/maps/latch-addr-flash.c + create mode 100644 drivers/mtd/mtdswap.c + create mode 100644 drivers/mtd/nand/nand_bch.c + create mode 100644 include/linux/bch.h + create mode 100644 include/linux/mtd/latch-addr-flash.h + create mode 100644 include/linux/mtd/nand_bch.h + create mode 100644 lib/bch.c +$ git revert 89d8d32060de +[master ae4928d] Revert "mtd: fix printf format warnings, mostly lack of %zd for size_t, in mtdswap" + 1 files changed, 8 insertions(+), 8 deletions(-) +$ git revert a32159024620 +[master f56986d] Revert "mtd: Add mtdswap block driver" + 3 files changed, 0 insertions(+), 1612 deletions(-) + delete mode 100644 drivers/mtd/mtdswap.c +$ git revert c7519dbf6f4b +[master 7dd6c01] Revert "mtd_blkdevs: Add background processing support" + 2 files changed, 0 insertions(+), 28 deletions(-) +Merging crypto/master +$ git merge crypto/master +Auto-merging arch/x86/crypto/aesni-intel_asm.S +Merge made by recursive. + .../devicetree/bindings/crypto/fsl-sec4.txt | 409 +++++ + arch/powerpc/boot/dts/p4080ds.dts | 95 ++- + arch/x86/crypto/aesni-intel_asm.S | 5 +- + arch/x86/crypto/aesni-intel_glue.c | 14 +- + drivers/crypto/Kconfig | 2 + + drivers/crypto/Makefile | 1 + + drivers/crypto/caam/Kconfig | 72 + + drivers/crypto/caam/Makefile | 8 + + drivers/crypto/caam/caamalg.c | 1163 ++++++++++++++ + drivers/crypto/caam/compat.h | 35 + + drivers/crypto/caam/ctrl.c | 270 ++++ + drivers/crypto/caam/desc.h | 1605 ++++++++++++++++++++ + drivers/crypto/caam/desc_constr.h | 204 +++ + drivers/crypto/caam/error.c | 248 +++ + drivers/crypto/caam/error.h | 10 + + drivers/crypto/caam/intern.h | 113 ++ + drivers/crypto/caam/jr.c | 523 +++++++ + drivers/crypto/caam/jr.h | 21 + + drivers/crypto/caam/regs.h | 663 ++++++++ + 19 files changed, 5457 insertions(+), 4 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/fsl-sec4.txt + create mode 100644 drivers/crypto/caam/Kconfig + create mode 100644 drivers/crypto/caam/Makefile + create mode 100644 drivers/crypto/caam/caamalg.c + create mode 100644 drivers/crypto/caam/compat.h + create mode 100644 drivers/crypto/caam/ctrl.c + create mode 100644 drivers/crypto/caam/desc.h + create mode 100644 drivers/crypto/caam/desc_constr.h + create mode 100644 drivers/crypto/caam/error.c + create mode 100644 drivers/crypto/caam/error.h + create mode 100644 drivers/crypto/caam/intern.h + create mode 100644 drivers/crypto/caam/jr.c + create mode 100644 drivers/crypto/caam/jr.h + create mode 100644 drivers/crypto/caam/regs.h +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + sound/pci/hda/patch_realtek.c | 2 ++ + sound/sound_firmware.c | 2 +- + sound/usb/card.c | 22 ++++++++++++++++++---- + 3 files changed, 21 insertions(+), 5 deletions(-) +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Auto-merging arch/arm/mach-s3c2440/mach-mini2440.c +Merge made by recursive. + arch/arm/mach-s3c2440/mach-mini2440.c | 7 +++++++ + sound/soc/codecs/uda134x.c | 3 ++- + sound/soc/samsung/s3c24xx_uda134x.c | 3 ++- + sound/soc/soc-core.c | 2 -- + 4 files changed, 11 insertions(+), 4 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merging drivers/char/virtio_console.c +Merge made by recursive. + drivers/block/virtio_blk.c | 88 ++++++++++++++++++++++++++++++++++++----- + drivers/char/virtio_console.c | 16 ------- + drivers/virtio/virtio_pci.c | 15 ++++--- + include/linux/module.h | 28 +++++++------ + include/linux/moduleparam.h | 7 ++- + kernel/module.c | 4 +- + kernel/params.c | 9 +++- + 7 files changed, 113 insertions(+), 54 deletions(-) +Merging input/next +$ git merge input/next +Already up-to-date. +Merging input-mt/next +$ git merge input-mt/next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Resolved 'fs/aio.c' using previous resolution. +Resolved 'fs/super.c' using previous resolution. +Auto-merging block/blk-core.c +Auto-merging block/blk-lib.c +Auto-merging drivers/block/amiflop.c +Auto-merging drivers/block/drbd/drbd_nl.c +Auto-merging drivers/block/xsysace.c +Auto-merging drivers/md/md.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/staging/hv/blkvsc_drv.c +Auto-merging drivers/target/target_core_iblock.c +Auto-merging fs/adfs/inode.c +Auto-merging fs/aio.c +CONFLICT (content): Merge conflict in fs/aio.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/cifs/file.c +Auto-merging fs/direct-io.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/page-io.c +Auto-merging fs/fat/inode.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/gfs2/aops.c +Auto-merging fs/gfs2/log.c +Auto-merging fs/gfs2/lops.c +Auto-merging fs/gfs2/meta_io.c +Auto-merging fs/hpfs/file.c +Auto-merging fs/nilfs2/inode.c +Auto-merging fs/reiserfs/inode.c +Auto-merging fs/super.c +CONFLICT (content): Merge conflict in fs/super.c +Auto-merging fs/sync.c +Auto-merging fs/ubifs/super.c +Auto-merging fs/udf/file.c +Auto-merging fs/udf/inode.c +Auto-merging fs/ufs/inode.c +Auto-merging fs/ufs/truncate.c +Auto-merging fs/xfs/linux-2.6/xfs_aops.c +Auto-merging fs/xfs/linux-2.6/xfs_buf.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/sched.h +Auto-merging kernel/fork.c +Auto-merging kernel/sched.c +Auto-merging mm/memory-failure.c +Auto-merging mm/shmem.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3695700] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-pci-devices-cciss | 12 + + Documentation/block/biodoc.txt | 5 - + Documentation/cgroups/blkio-controller.txt | 30 +- + block/blk-cgroup.c | 16 +- + block/blk-cgroup.h | 14 +- + block/blk-core.c | 646 ++++++++++------- + block/blk-exec.c | 4 +- + block/blk-flush.c | 439 ++++++++---- + block/blk-lib.c | 2 - + block/blk-merge.c | 6 + + block/blk-settings.c | 15 - + block/blk-sysfs.c | 2 - + block/blk-throttle.c | 114 ++-- + block/blk.h | 16 +- + block/cfq-iosched.c | 172 +++--- + block/cfq.h | 6 +- + block/deadline-iosched.c | 9 - + block/elevator.c | 108 ++-- + block/genhd.c | 18 +- + block/noop-iosched.c | 8 - + drivers/block/DAC960.c | 8 +- + drivers/block/amiflop.c | 9 +- + drivers/block/ataflop.c | 14 +- + drivers/block/cciss.c | 92 ++- + drivers/block/cciss_cmd.h | 1 + + drivers/block/cciss_scsi.c | 13 +- + drivers/block/cpqarray.c | 3 - + drivers/block/drbd/drbd_actlog.c | 339 +++------- + drivers/block/drbd/drbd_bitmap.c | 753 +++++++++++++------- + drivers/block/drbd/drbd_int.h | 286 +++++---- + drivers/block/drbd/drbd_main.c | 709 ++++++++++++------- + drivers/block/drbd/drbd_nl.c | 183 ++++-- + drivers/block/drbd/drbd_proc.c | 114 +++- + drivers/block/drbd/drbd_receiver.c | 635 ++++++++++------- + drivers/block/drbd/drbd_req.c | 173 ++++-- + drivers/block/drbd/drbd_req.h | 36 +- + drivers/block/drbd/drbd_strings.c | 6 +- + drivers/block/drbd/drbd_worker.c | 361 +++++----- + drivers/block/drbd/drbd_wrappers.h | 20 +- + drivers/block/floppy.c | 11 +- + drivers/block/loop.c | 16 - + drivers/block/paride/pcd.c | 18 +- + drivers/block/paride/pd.c | 7 +- + drivers/block/paride/pf.c | 10 +- + drivers/block/pktcdvd.c | 15 +- + drivers/block/swim.c | 8 +- + drivers/block/swim3.c | 11 +- + drivers/block/ub.c | 10 +- + drivers/block/umem.c | 26 +- + drivers/block/xsysace.c | 9 +- + drivers/cdrom/gdrom.c | 16 +- + drivers/cdrom/viocd.c | 17 +- + drivers/ide/ide-atapi.c | 3 +- + drivers/ide/ide-cd.c | 23 +- + drivers/ide/ide-cd.h | 3 +- + drivers/ide/ide-cd_ioctl.c | 8 +- + drivers/ide/ide-gd.c | 14 +- + drivers/ide/ide-io.c | 4 - + drivers/ide/ide-park.c | 2 +- + drivers/md/bitmap.c | 5 +- + drivers/md/dm-crypt.c | 9 +- + drivers/md/dm-io.c | 2 +- + drivers/md/dm-kcopyd.c | 55 +-- + drivers/md/dm-raid.c | 2 +- + drivers/md/dm-raid1.c | 2 - + drivers/md/dm-table.c | 31 +- + drivers/md/dm.c | 45 +- + drivers/md/dm.h | 2 +- + drivers/md/linear.c | 20 +- + drivers/md/md.c | 20 +- + drivers/md/multipath.c | 38 +- + drivers/md/raid0.c | 19 +- + drivers/md/raid1.c | 91 +-- + drivers/md/raid10.c | 97 +-- + drivers/md/raid5.c | 63 +-- + drivers/md/raid5.h | 2 +- + drivers/message/i2o/i2o_block.c | 17 +- + drivers/mmc/card/queue.c | 3 +- + drivers/s390/block/dasd.c | 2 +- + drivers/s390/char/tape_block.c | 12 +- + drivers/scsi/scsi_lib.c | 44 +- + drivers/scsi/scsi_transport_fc.c | 2 +- + drivers/scsi/scsi_transport_sas.c | 6 +- + drivers/staging/hv/blkvsc_drv.c | 11 +- + .../westbridge/astoria/block/cyasblkdev_block.c | 11 +- + drivers/target/target_core_iblock.c | 7 +- + fs/adfs/inode.c | 1 - + fs/affs/file.c | 2 - + fs/aio.c | 77 +-- + fs/befs/linuxvfs.c | 1 - + fs/bfs/file.c | 1 - + fs/bio-integrity.c | 3 + + fs/bio.c | 10 +- + fs/block_dev.c | 27 +- + fs/btrfs/disk-io.c | 79 -- + fs/btrfs/extent_io.c | 2 +- + fs/btrfs/inode.c | 1 - + fs/btrfs/volumes.c | 91 +-- + fs/buffer.c | 51 +- + fs/cifs/file.c | 30 - + fs/direct-io.c | 7 +- + fs/efs/inode.c | 1 - + fs/exofs/inode.c | 1 - + fs/ext2/inode.c | 2 - + fs/ext3/inode.c | 3 - + fs/ext4/inode.c | 4 - + fs/ext4/page-io.c | 3 +- + fs/fat/inode.c | 1 - + fs/freevxfs/vxfs_subr.c | 1 - + fs/fuse/inode.c | 1 - + fs/gfs2/aops.c | 3 - + fs/gfs2/log.c | 4 +- + fs/gfs2/lops.c | 12 +- + fs/gfs2/meta_io.c | 3 +- + fs/hfs/inode.c | 2 - + fs/hfsplus/inode.c | 2 - + fs/hpfs/file.c | 1 - + fs/isofs/inode.c | 1 - + fs/jbd/commit.c | 22 +- + fs/jbd2/commit.c | 22 +- + fs/jfs/inode.c | 1 - + fs/jfs/jfs_metapage.c | 1 - + fs/logfs/dev_bdev.c | 2 - + fs/minix/inode.c | 1 - + fs/mpage.c | 8 + + fs/nilfs2/btnode.c | 7 +- + fs/nilfs2/gcinode.c | 1 - + fs/nilfs2/inode.c | 1 - + fs/nilfs2/mdt.c | 9 +- + fs/nilfs2/page.c | 5 +- + fs/nilfs2/page.h | 3 +- + fs/nilfs2/segbuf.c | 2 +- + fs/ntfs/aops.c | 4 - + fs/ntfs/compress.c | 3 +- + fs/ocfs2/aops.c | 1 - + fs/ocfs2/cluster/heartbeat.c | 4 - + fs/omfs/file.c | 1 - + fs/qnx4/inode.c | 1 - + fs/reiserfs/inode.c | 1 - + fs/super.c | 2 + + fs/sync.c | 4 +- + fs/sysv/itree.c | 1 - + fs/ubifs/super.c | 1 - + fs/udf/file.c | 1 - + fs/udf/inode.c | 1 - + fs/ufs/inode.c | 1 - + fs/ufs/truncate.c | 2 +- + fs/xfs/linux-2.6/xfs_aops.c | 4 +- + fs/xfs/linux-2.6/xfs_buf.c | 13 +- + include/linux/backing-dev.h | 16 - + include/linux/bio.h | 1 - + include/linux/blk_types.h | 6 +- + include/linux/blkdev.h | 101 ++- + include/linux/buffer_head.h | 1 - + include/linux/device-mapper.h | 5 - + include/linux/drbd.h | 23 +- + include/linux/drbd_limits.h | 12 +- + include/linux/drbd_nl.h | 13 +- + include/linux/drbd_tag_magic.h | 1 + + include/linux/elevator.h | 10 +- + include/linux/fs.h | 29 +- + include/linux/pagemap.h | 12 - + include/linux/sched.h | 6 + + include/linux/swap.h | 2 - + kernel/exit.c | 1 + + kernel/fork.c | 3 + + kernel/power/block_io.c | 2 +- + kernel/sched.c | 12 + + kernel/trace/blktrace.c | 15 +- + mm/backing-dev.c | 8 +- + mm/filemap.c | 74 +-- + mm/memory-failure.c | 8 +- + mm/nommu.c | 4 - + mm/page-writeback.c | 10 +- + mm/page_io.c | 2 +- + mm/readahead.c | 18 +- + mm/shmem.c | 1 - + mm/swap_state.c | 5 +- + mm/swapfile.c | 37 - + mm/vmscan.c | 2 +- + 180 files changed, 3747 insertions(+), 3497 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/md/dm-mpath.c +Merge made by recursive. + Documentation/device-mapper/dm-flakey.txt | 18 +++ + drivers/md/Kconfig | 6 + + drivers/md/Makefile | 1 + + drivers/md/dm-crypt.c | 19 ++- + drivers/md/dm-flakey.c | 212 +++++++++++++++++++++++++++++ + drivers/md/dm-ioctl.c | 46 ++++-- + drivers/md/dm-log.c | 2 +- + drivers/md/dm-mpath.c | 17 ++- + drivers/md/dm-snap.c | 2 +- + drivers/md/dm-stripe.c | 23 +++- + include/linux/dm-ioctl.h | 12 ++- + 11 files changed, 327 insertions(+), 31 deletions(-) + create mode 100644 Documentation/device-mapper/dm-flakey.txt + create mode 100644 drivers/md/dm-flakey.c +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Merge made by recursive. + drivers/leds/led-triggers.c | 20 + + drivers/power/Kconfig | 14 + + drivers/power/bq20z75.c | 310 ++++++++++++--- + drivers/power/bq27x00_battery.c | 725 +++++++++++++++++++++++++-------- + drivers/power/ds2782_battery.c | 1 + + drivers/power/power_supply_core.c | 4 +- + drivers/power/power_supply_leds.c | 19 + + drivers/power/power_supply_sysfs.c | 2 +- + drivers/power/s3c_adc_battery.c | 4 +- + drivers/power/twl4030_charger.c | 25 +- + drivers/power/z2_battery.c | 3 + + include/linux/leds.h | 3 + + include/linux/power/bq20z75.h | 39 ++ + include/linux/power/bq27x00_battery.h | 19 + + include/linux/power_supply.h | 47 +++ + 15 files changed, 1009 insertions(+), 226 deletions(-) + create mode 100644 include/linux/power/bq20z75.h + create mode 100644 include/linux/power/bq27x00_battery.h +Merging leds/for-mm +$ git merge leds/for-mm +Resolved 'drivers/leds/Kconfig' using previous resolution. +Auto-merging drivers/leds/Kconfig +CONFLICT (content): Merge conflict in drivers/leds/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 82af0a6] Merge remote-tracking branch 'leds/for-mm' +$ git diff -M --stat --summary HEAD^.. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging mmc/mmc-next +$ git merge mmc/mmc-next +Already up-to-date. +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging arch/x86/kernel/kgdb.c +Auto-merging drivers/tty/serial/kgdboc.c +Auto-merging kernel/debug/kdb/kdb_main.c +Merge made by recursive. + arch/x86/kernel/kgdb.c | 4 ++-- + drivers/misc/kgdbts.c | 2 +- + drivers/tty/serial/kgdboc.c | 2 +- + kernel/debug/kdb/kdb_main.c | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Merge made by recursive. + include/linux/slab.h | 1 - + include/linux/slub_def.h | 8 +- + mm/slab.c | 55 +++---- + mm/slob.c | 6 - + mm/slub.c | 366 ++++++++++++++++++++++++++++++++++++++-------- + 5 files changed, 333 insertions(+), 103 deletions(-) +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Resolved 'arch/arm/mach-imx/mach-mx27_3ds.c' using previous resolution. +Resolved 'arch/arm/mach-imx/mach-pcm038.c' using previous resolution. +Resolved 'arch/arm/mach-mx3/mach-mx31_3ds.c' using previous resolution. +Resolved 'arch/arm/mach-mx3/mach-mx31moboard.c' using previous resolution. +Resolved 'arch/arm/mach-ux500/board-mop500-regulators.c' using previous resolution. +Resolved 'arch/arm/mach-ux500/board-mop500.c' using previous resolution. +Resolved 'drivers/gpio/Kconfig' using previous resolution. +Auto-merging arch/arm/mach-imx/mach-mx27_3ds.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-mx27_3ds.c +Auto-merging arch/arm/mach-imx/mach-pcm038.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-pcm038.c +Auto-merging arch/arm/mach-mx3/mach-mx31_3ds.c +CONFLICT (content): Merge conflict in arch/arm/mach-mx3/mach-mx31_3ds.c +Auto-merging arch/arm/mach-mx3/mach-mx31moboard.c +CONFLICT (content): Merge conflict in arch/arm/mach-mx3/mach-mx31moboard.c +Auto-merging arch/arm/mach-omap2/board-4430sdp.c +Auto-merging arch/arm/mach-omap2/board-omap4panda.c +Auto-merging arch/arm/mach-ux500/board-mop500-regulators.c +CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500-regulators.c +Auto-merging arch/arm/mach-ux500/board-mop500.c +CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500.c +Auto-merging drivers/dma/timb_dma.c +Auto-merging drivers/gpio/Kconfig +CONFLICT (content): Merge conflict in drivers/gpio/Kconfig +Auto-merging drivers/hwmon/Kconfig +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/media/radio/radio-wl1273.c +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/mfd/wl1273-core.c +Auto-merging drivers/mmc/host/tmio_mmc.c +Auto-merging include/linux/i2c/twl.h +Auto-merging include/linux/mfd/wm831x/pdata.h +Auto-merging include/linux/pci_ids.h +Auto-merging sound/soc/codecs/wl1273.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 48278546] Merge remote-tracking branch 'mfd/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/hwmon/twl4030-madc-hwmon | 45 + + arch/arm/mach-imx/mach-mx27_3ds.c | 7 +- + arch/arm/mach-imx/mach-pcm038.c | 6 +- + arch/arm/mach-mx3/mach-mx31_3ds.c | 9 +- + arch/arm/mach-mx3/mach-mx31moboard.c | 6 +- + arch/arm/mach-omap2/board-4430sdp.c | 7 + + arch/arm/mach-omap2/board-omap4panda.c | 7 + + arch/arm/mach-ux500/Kconfig | 1 + + arch/arm/mach-ux500/board-mop500-regulators.c | 24 + + arch/arm/mach-ux500/board-mop500-regulators.h | 1 + + arch/arm/mach-ux500/board-mop500.c | 14 + + arch/x86/platform/olpc/olpc-xo1.c | 42 +- + drivers/dma/timb_dma.c | 3 +- + drivers/gpio/Kconfig | 7 +- + drivers/gpio/janz-ttl.c | 3 +- + drivers/gpio/rdc321x-gpio.c | 3 +- + drivers/gpio/sch_gpio.c | 57 +- + drivers/gpio/timbgpio.c | 6 +- + drivers/hwmon/Kconfig | 10 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/jz4740-hwmon.c | 4 +- + drivers/hwmon/twl4030-madc-hwmon.c | 157 ++++ + drivers/i2c/busses/i2c-ocores.c | 3 +- + drivers/i2c/busses/i2c-xiic.c | 3 +- + drivers/input/misc/88pm860x_onkey.c | 2 +- + drivers/input/misc/twl4030-vibra.c | 3 +- + drivers/leds/leds-88pm860x.c | 60 +- + drivers/leds/leds-mc13783.c | 7 +- + drivers/media/radio/radio-timb.c | 3 +- + drivers/media/radio/radio-wl1273.c | 2 +- + drivers/media/video/timblogiw.c | 3 +- + drivers/mfd/88pm860x-core.c | 567 +++++++------ + drivers/mfd/88pm860x-i2c.c | 103 +++ + drivers/mfd/Kconfig | 40 + + drivers/mfd/Makefile | 6 +- + drivers/mfd/ab3100-core.c | 10 +- + drivers/mfd/ab3550-core.c | 12 +- + drivers/mfd/ab8500-core.c | 56 ++- + drivers/mfd/ab8500-debugfs.c | 6 +- + drivers/mfd/ab8500-gpadc.c | 614 +++++++++++++ + drivers/mfd/ab8500-sysctrl.c | 80 ++ + drivers/mfd/adp5520.c | 15 +- + drivers/mfd/asic3.c | 10 +- + drivers/mfd/cs5535-mfd.c | 37 + + drivers/mfd/davinci_voicecodec.c | 4 +- + drivers/mfd/htc-pasic3.c | 7 +- + drivers/mfd/janz-cmodio.c | 3 +- + drivers/mfd/jz4740-adc.c | 4 - + drivers/mfd/lpc_sch.c | 7 +- + drivers/mfd/max8997-irq.c | 377 ++++++++ + drivers/mfd/max8997.c | 427 +++++++++ + drivers/mfd/max8998.c | 4 +- + drivers/mfd/mc13xxx-core.c | 21 +- + drivers/mfd/mfd-core.c | 135 +++- + drivers/mfd/pcf50633-core.c | 24 +- + drivers/mfd/rdc321x-southbridge.c | 4 +- + drivers/mfd/sh_mobile_sdhi.c | 4 +- + drivers/mfd/t7l66xb.c | 13 +- + drivers/mfd/tc6387xb.c | 7 +- + drivers/mfd/tc6393xb.c | 25 +- + drivers/mfd/timberdale.c | 81 +-- + drivers/mfd/tps6105x.c | 246 +++++ + drivers/mfd/tps6586x.c | 26 +- + drivers/mfd/twl-core.c | 8 +- + drivers/mfd/twl4030-codec.c | 6 +- + drivers/mfd/twl4030-madc.c | 802 ++++++++++++++++ + drivers/mfd/ucb1x00-ts.c | 5 +- + drivers/mfd/vx855.c | 1 + + drivers/mfd/wl1273-core.c | 6 +- + drivers/mfd/wm831x-i2c.c | 18 +- + drivers/mfd/wm831x-irq.c | 44 +- + drivers/mfd/wm831x-spi.c | 24 +- + drivers/mfd/wm8400-core.c | 2 +- + drivers/mfd/wm8994-core.c | 67 +- + drivers/mfd/wm8994-irq.c | 8 +- + drivers/mmc/host/tmio_mmc.c | 34 +- + drivers/mtd/nand/tmio_nand.c | 11 +- + drivers/net/can/janz-ican3.c | 3 +- + drivers/net/ks8842.c | 3 +- + drivers/power/jz4740-battery.c | 4 +- + drivers/regulator/88pm8607.c | 46 +- + drivers/regulator/Kconfig | 18 + + drivers/regulator/Makefile | 3 +- + drivers/regulator/ab3100.c | 3 +- + drivers/regulator/max8997.c | 1213 +++++++++++++++++++++++++ + drivers/regulator/mc13783-regulator.c | 7 +- + drivers/regulator/mc13892-regulator.c | 7 +- + drivers/regulator/tps6105x-regulator.c | 196 ++++ + drivers/regulator/twl-regulator.c | 24 +- + drivers/spi/xilinx_spi.c | 3 +- + drivers/usb/host/ohci-tmio.c | 8 +- + drivers/video/backlight/88pm860x_bl.c | 34 +- + drivers/video/tmiofb.c | 28 +- + drivers/w1/masters/ds1wm.c | 13 +- + drivers/watchdog/rdc321x_wdt.c | 3 +- + include/linux/i2c/twl.h | 2 + + include/linux/i2c/twl4030-madc.h | 141 +++ + include/linux/mfd/88pm860x.h | 20 +- + include/linux/mfd/ab8500.h | 4 +- + include/linux/mfd/ab8500/gpadc.h | 32 + + include/linux/mfd/ab8500/sysctrl.h | 254 ++++++ + include/linux/mfd/abx500.h | 1 - + include/linux/mfd/core.h | 54 +- + include/linux/mfd/max8997-private.h | 368 ++++++++ + include/linux/mfd/max8997.h | 117 +++ + include/linux/mfd/mc13xxx.h | 3 +- + include/linux/mfd/tps6105x.h | 101 ++ + include/linux/mfd/wm831x/pdata.h | 6 + + include/linux/mfd/wm8994/core.h | 4 +- + include/linux/pci_ids.h | 1 + + sound/soc/codecs/cq93vc.c | 3 +- + sound/soc/codecs/twl4030.c | 6 +- + sound/soc/codecs/wl1273.c | 3 +- + sound/soc/codecs/wm8400.c | 3 +- + sound/soc/davinci/davinci-vcif.c | 2 +- + 115 files changed, 6487 insertions(+), 771 deletions(-) + create mode 100644 Documentation/hwmon/twl4030-madc-hwmon + create mode 100644 drivers/hwmon/twl4030-madc-hwmon.c + create mode 100644 drivers/mfd/ab8500-gpadc.c + create mode 100644 drivers/mfd/ab8500-sysctrl.c + create mode 100644 drivers/mfd/max8997-irq.c + create mode 100644 drivers/mfd/max8997.c + create mode 100644 drivers/mfd/tps6105x.c + create mode 100644 drivers/mfd/twl4030-madc.c + create mode 100644 drivers/regulator/max8997.c + create mode 100644 drivers/regulator/tps6105x-regulator.c + create mode 100644 include/linux/i2c/twl4030-madc.h + create mode 100644 include/linux/mfd/ab8500/gpadc.h + create mode 100644 include/linux/mfd/ab8500/sysctrl.h + create mode 100644 include/linux/mfd/max8997-private.h + create mode 100644 include/linux/mfd/max8997.h + create mode 100644 include/linux/mfd/tps6105x.h +$ git revert d7d21d394c9d +[master e3d1644] Revert "mfd: Add MAX8997/8966 IRQ control feature" + 4 files changed, 3 insertions(+), 404 deletions(-) + delete mode 100644 drivers/mfd/max8997-irq.c +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging fbdev/master +$ git merge fbdev/master +Already up-to-date. +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Merge made by recursive. + drivers/video/via/chip.h | 1 - + drivers/video/via/hw.c | 17 ++++------ + drivers/video/via/hw.h | 3 +- + drivers/video/via/viafbdev.c | 74 +++++++++++++++++++++-------------------- + 4 files changed, 46 insertions(+), 49 deletions(-) +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Resolved 'arch/arm/mach-omap2/board-overo.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-omap2/board-3430sdp.c +Auto-merging arch/arm/mach-omap2/board-4430sdp.c +Auto-merging arch/arm/mach-omap2/board-cm-t35.c +Auto-merging arch/arm/mach-omap2/board-devkit8000.c +Auto-merging arch/arm/mach-omap2/board-igep0020.c +Auto-merging arch/arm/mach-omap2/board-omap3beagle.c +Auto-merging arch/arm/mach-omap2/board-omap3evm.c +Auto-merging arch/arm/mach-omap2/board-omap3pandora.c +Auto-merging arch/arm/mach-omap2/board-omap3stalker.c +Auto-merging arch/arm/mach-omap2/board-omap4panda.c +Auto-merging arch/arm/mach-omap2/board-overo.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-overo.c +Auto-merging arch/arm/mach-omap2/clock2420_data.c +Auto-merging arch/arm/mach-omap2/clock2430_data.c +Auto-merging arch/arm/mach-omap2/clock3xxx_data.c +Auto-merging arch/arm/mach-omap2/clock44xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_2420_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_2430_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 506a8b7] Merge remote-tracking branch 'omap_dss2/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 4 +- + arch/arm/configs/omap2plus_defconfig | 11 + + arch/arm/mach-omap2/board-3430sdp.c | 6 +- + arch/arm/mach-omap2/board-4430sdp.c | 75 ++ + arch/arm/mach-omap2/board-cm-t35.c | 2 +- + arch/arm/mach-omap2/board-devkit8000.c | 12 +- + arch/arm/mach-omap2/board-igep0020.c | 10 +- + arch/arm/mach-omap2/board-omap3beagle.c | 12 +- + arch/arm/mach-omap2/board-omap3evm.c | 12 +- + arch/arm/mach-omap2/board-omap3pandora.c | 3 +- + arch/arm/mach-omap2/board-omap3stalker.c | 12 +- + arch/arm/mach-omap2/board-omap4panda.c | 74 ++ + arch/arm/mach-omap2/board-overo.c | 357 +++++- + arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +- + arch/arm/mach-omap2/board-zoom-peripherals.c | 12 +- + arch/arm/mach-omap2/clock2420_data.c | 8 +- + arch/arm/mach-omap2/clock2430_data.c | 8 +- + arch/arm/mach-omap2/clock3xxx_data.c | 14 +- + arch/arm/mach-omap2/clock44xx_data.c | 15 +- + arch/arm/mach-omap2/display.c | 80 ++ + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 13 +- + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 12 +- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 23 +- + arch/arm/plat-omap/include/plat/display.h | 15 +- + drivers/video/omap/Kconfig | 7 +- + drivers/video/omap2/displays/Kconfig | 6 + + drivers/video/omap2/displays/Makefile | 1 + + drivers/video/omap2/displays/panel-generic-dpi.c | 25 + + .../omap2/displays/panel-lgphilips-lb035q02.c | 279 ++++ + drivers/video/omap2/displays/panel-taal.c | 123 +- + drivers/video/omap2/dss/Kconfig | 14 +- + drivers/video/omap2/dss/Makefile | 2 + + drivers/video/omap2/dss/core.c | 480 +------- + drivers/video/omap2/dss/dispc.c | 335 ++++-- + drivers/video/omap2/dss/display.c | 35 +- + drivers/video/omap2/dss/dpi.c | 45 +- + drivers/video/omap2/dss/dsi.c | 967 +++++++++++---- + drivers/video/omap2/dss/dss.c | 658 ++++++++-- + drivers/video/omap2/dss/dss.h | 153 ++- + drivers/video/omap2/dss/dss_features.c | 163 ++- + drivers/video/omap2/dss/dss_features.h | 27 + + drivers/video/omap2/dss/hdmi.c | 1332 ++++++++++++++++++++ + drivers/video/omap2/dss/hdmi.h | 415 ++++++ + drivers/video/omap2/dss/hdmi_omap4_panel.c | 222 ++++ + drivers/video/omap2/dss/manager.c | 13 +- + drivers/video/omap2/dss/overlay.c | 10 +- + drivers/video/omap2/dss/rfbi.c | 128 ++- + drivers/video/omap2/dss/sdi.c | 62 +- + drivers/video/omap2/dss/venc.c | 128 ++- + drivers/video/omap2/omapfb/Kconfig | 6 +- + drivers/video/omap2/omapfb/omapfb-main.c | 23 +- + 51 files changed, 5125 insertions(+), 1326 deletions(-) + create mode 100644 drivers/video/omap2/displays/panel-lgphilips-lb035q02.c + create mode 100644 drivers/video/omap2/dss/hdmi.c + create mode 100644 drivers/video/omap2/dss/hdmi.h + create mode 100644 drivers/video/omap2/dss/hdmi_omap4_panel.c +Merging voltage/for-next +$ git merge voltage/for-next +Auto-merging arch/arm/mach-ux500/board-mop500-regulators.h +Auto-merging arch/arm/mach-ux500/board-mop500.c +Auto-merging drivers/regulator/Kconfig +Auto-merging drivers/regulator/ab3100.c +Auto-merging drivers/regulator/wm831x-dcdc.c +Auto-merging include/linux/mfd/ab8500.h +Merge made by recursive. + arch/arm/mach-ux500/board-mop500-regulators.h | 2 + + arch/arm/mach-ux500/board-mop500.c | 1 + + drivers/regulator/Kconfig | 2 +- + drivers/regulator/ab3100.c | 51 +++-- + drivers/regulator/ab8500.c | 270 ++++++++++++++++++++++++- + drivers/regulator/core.c | 116 +++++++++++- + drivers/regulator/wm831x-dcdc.c | 26 +-- + drivers/regulator/wm831x-isink.c | 8 +- + drivers/regulator/wm831x-ldo.c | 17 +- + include/linux/mfd/ab8500.h | 6 + + include/linux/regulator/ab8500.h | 51 +++++- + include/linux/regulator/consumer.h | 2 + + include/linux/regulator/driver.h | 11 +- + include/linux/regulator/machine.h | 1 + + 14 files changed, 503 insertions(+), 61 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging selinux/master +$ git merge selinux/master +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Merge made by recursive. +Merging watchdog/master +$ git merge watchdog/master +Auto-merging drivers/watchdog/max63xx_wdt.c +Auto-merging drivers/watchdog/pnx4008_wdt.c +Auto-merging drivers/watchdog/s3c2410_wdt.c +Auto-merging drivers/watchdog/sp5100_tco.c +Merge made by recursive. + drivers/watchdog/davinci_wdt.c | 22 ++++++++++------------ + drivers/watchdog/max63xx_wdt.c | 20 ++++++++------------ + drivers/watchdog/pnx4008_wdt.c | 28 +++++++++++++--------------- + drivers/watchdog/s3c2410_wdt.c | 19 ++++++++----------- + drivers/watchdog/sp5100_tco.c | 16 ++++++++++++++-- + 5 files changed, 53 insertions(+), 52 deletions(-) +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Merge made by recursive. + drivers/pci/intel-iommu.c | 17 ++++++++++++++--- + 1 files changed, 14 insertions(+), 3 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merging fs/exofs/inode.c +Merge made by recursive. + Documentation/filesystems/exofs.txt | 10 ++- + fs/exofs/common.h | 18 +++- + fs/exofs/dir.c | 33 ++++--- + fs/exofs/exofs.h | 6 +- + fs/exofs/file.c | 16 +--- + fs/exofs/inode.c | 51 ++++++++-- + fs/exofs/super.c | 190 +++++++++++++++++++++++++++++++---- + 7 files changed, 259 insertions(+), 65 deletions(-) +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Already up-to-date. +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging fs/cachefiles/namei.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging include/linux/fsnotify_backend.h +Merge made by recursive. + 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 +$ git merge irda/for-next +Already up-to-date. +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'drivers/Makefile' using previous resolution. +Resolved 'include/linux/Kbuild' using previous resolution. +Resolved 'lib/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/Makefile +CONFLICT (content): Merge conflict in drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +CONFLICT (content): Merge conflict in include/linux/Kbuild +Auto-merging lib/Kconfig +CONFLICT (content): Merge conflict in lib/Kconfig +Auto-merging lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 97ebdf9] Merge remote-tracking branch 'alacrity/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 25 + + arch/x86/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/net/Kconfig | 14 + + drivers/net/Makefile | 1 + + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ + drivers/vbus/Kconfig | 25 + + drivers/vbus/Makefile | 6 + + drivers/vbus/bus-proxy.c | 248 +++++++ + drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++ + include/linux/Kbuild | 4 + + include/linux/ioq.h | 414 ++++++++++++ + include/linux/shm_signal.h | 189 ++++++ + include/linux/vbus_driver.h | 83 +++ + include/linux/vbus_pci.h | 145 ++++ + include/linux/venet.h | 133 ++++ + lib/Kconfig | 21 + + lib/Makefile | 2 + + lib/ioq.c | 304 +++++++++ + lib/shm_signal.c | 196 ++++++ + 20 files changed, 4389 insertions(+), 0 deletions(-) + create mode 100644 drivers/net/vbus-enet.c + create mode 100644 drivers/vbus/Kconfig + create mode 100644 drivers/vbus/Makefile + create mode 100644 drivers/vbus/bus-proxy.c + create mode 100644 drivers/vbus/pci-bridge.c + create mode 100644 include/linux/ioq.h + create mode 100644 include/linux/shm_signal.h + create mode 100644 include/linux/vbus_driver.h + create mode 100644 include/linux/vbus_pci.h + create mode 100644 include/linux/venet.h + create mode 100644 lib/ioq.c + create mode 100644 lib/shm_signal.c +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +Auto-merging drivers/edac/i7core_edac.c +Merge made by recursive. + drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++--- + 1 files changed, 20 insertions(+), 3 deletions(-) +Merging i7300_edac/linux_next +$ git merge i7300_edac/linux_next +Already up-to-date! +Merge made by recursive. +Merging devicetree/devicetree/next +$ git merge devicetree/devicetree/next +Merge made by recursive. + arch/powerpc/platforms/52xx/mpc52xx_common.c | 10 +-- + drivers/of/base.c | 3 + + drivers/of/platform.c | 118 +++++++++++++++----------- + include/linux/of_platform.h | 6 +- + 4 files changed, 79 insertions(+), 58 deletions(-) +Merging spi/spi/next +$ git merge spi/spi/next +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/Makefile +Removing arch/x86/kernel/probe_roms_32.c +Merge made by recursive. + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/mach_traps.h | 18 ++- + arch/x86/include/asm/olpc_ofw.h | 9 +- + arch/x86/include/asm/probe_roms.h | 8 + + arch/x86/include/asm/setup.h | 2 +- + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/head32.c | 1 - + arch/x86/kernel/probe_roms.c | 267 +++++++++++++++++++++++++++++++++++++ + arch/x86/kernel/probe_roms_32.c | 166 ----------------------- + arch/x86/kernel/x86_init.c | 2 +- + arch/x86/platform/olpc/Makefile | 4 +- + arch/x86/platform/olpc/olpc.c | 51 ++++---- + arch/x86/platform/olpc/olpc_dt.c | 19 +++ + 13 files changed, 342 insertions(+), 209 deletions(-) + create mode 100644 arch/x86/include/asm/probe_roms.h + create mode 100644 arch/x86/kernel/probe_roms.c + delete mode 100644 arch/x86/kernel/probe_roms_32.c +Merging rcu/rcu/next +$ git merge rcu/rcu/next +Already up-to-date. +Merging oprofile/for-next +$ git merge oprofile/for-next +Merge made by recursive. + arch/alpha/oprofile/common.c | 5 +---- + arch/avr32/oprofile/op_model_avr32.c | 5 +---- + arch/blackfin/oprofile/bfin_oprofile.c | 4 +--- + arch/ia64/oprofile/init.c | 2 +- + arch/m32r/oprofile/init.c | 4 +--- + arch/microblaze/oprofile/microblaze_oprofile.c | 4 +--- + arch/mips/oprofile/common.c | 2 +- + arch/mn10300/oprofile/op_model_null.c | 5 +---- + arch/parisc/oprofile/init.c | 4 +--- + arch/powerpc/oprofile/common.c | 4 +--- + arch/s390/oprofile/init.c | 2 +- + arch/sparc/oprofile/init.c | 4 +--- + arch/x86/oprofile/init.c | 2 +- + 13 files changed, 13 insertions(+), 34 deletions(-) +Merging xen-two/linux-next +$ git merge xen-two/linux-next +Merge made by recursive. +Merging xen-pvhvm/linux-next +$ git merge xen-pvhvm/linux-next +Already up-to-date. +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Resolved 'include/linux/pci_ids.h' using previous resolution. +Auto-merging include/linux/pci_ids.h +CONFLICT (content): Merge conflict in include/linux/pci_ids.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 153f51f] Merge remote-tracking branch 'edac-amd/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging percpu/for-next +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next +$ git merge workqueues/for-next +Already up-to-date. +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next +$ git merge drivers-x86/linux-next +Removing Documentation/ABI/testing/sysfs-platform-eeepc-wmi +Auto-merging MAINTAINERS +Auto-merging drivers/platform/x86/Kconfig +Auto-merging drivers/platform/x86/Makefile +Auto-merging drivers/platform/x86/acer-wmi.c +Auto-merging include/linux/input.h +Merge made by recursive. + .../ABI/testing/sysfs-driver-samsung-laptop | 19 + + Documentation/ABI/testing/sysfs-platform-asus-wmi | 31 + + Documentation/ABI/testing/sysfs-platform-eeepc-wmi | 10 - + Documentation/laptops/sony-laptop.txt | 37 +- + MAINTAINERS | 30 +- + drivers/platform/x86/Kconfig | 90 +- + drivers/platform/x86/Makefile | 9 +- + drivers/platform/x86/acer-wmi.c | 20 +- + drivers/platform/x86/asus-laptop.c | 180 +-- + drivers/platform/x86/asus-nb-wmi.c | 98 ++ + drivers/platform/x86/asus-wmi.c | 1655 ++++++++++++++++++++ + drivers/platform/x86/asus-wmi.h | 58 + + drivers/platform/x86/dell-wmi-aio.c | 171 ++ + drivers/platform/x86/eeepc-wmi.c | 912 +---------- + drivers/platform/x86/hp-wmi.c | 312 ++++- + drivers/platform/x86/ideapad-laptop.c | 2 + + drivers/platform/x86/intel_mid_powerbtn.c | 148 ++ + drivers/platform/x86/intel_mid_thermal.c | 576 +++++++ + drivers/platform/x86/msi-laptop.c | 94 +- + drivers/platform/x86/samsung-laptop.c | 832 ++++++++++ + drivers/platform/x86/sony-laptop.c | 494 +++++-- + drivers/platform/x86/xo15-ebook.c | 181 +++ + include/linux/input.h | 7 + + include/linux/sonypi.h | 1 + + 24 files changed, 4769 insertions(+), 1198 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-samsung-laptop + create mode 100644 Documentation/ABI/testing/sysfs-platform-asus-wmi + delete mode 100644 Documentation/ABI/testing/sysfs-platform-eeepc-wmi + create mode 100644 drivers/platform/x86/asus-nb-wmi.c + create mode 100644 drivers/platform/x86/asus-wmi.c + create mode 100644 drivers/platform/x86/asus-wmi.h + create mode 100644 drivers/platform/x86/dell-wmi-aio.c + create mode 100644 drivers/platform/x86/intel_mid_powerbtn.c + create mode 100644 drivers/platform/x86/intel_mid_thermal.c + create mode 100644 drivers/platform/x86/samsung-laptop.c + create mode 100644 drivers/platform/x86/xo15-ebook.c +$ git am -3 ../patches/0001-OLPC-fix-for-removal-of-run_wake_count.patch +Applying: OLPC: fix for removal of run_wake_count +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/platform/x86/xo15-ebook.c +$ git add . +$ git commit -v -a --amend +[master 31b77f3] Merge remote-tracking branch 'drivers-x86/linux-next' +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging driver-core/driver-core-next +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next +$ git merge usb/usb-next +Already up-to-date. +Merging staging/staging-next +$ git merge staging/staging-next +Already up-to-date. +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging bkl-config/config +$ git merge bkl-config/config +Already up-to-date. +Merging cleancache/linux-next +$ git merge cleancache/linux-next +Resolved 'fs/ocfs2/super.c' using previous resolution. +Resolved 'fs/super.c' using previous resolution. +Resolved 'include/linux/fs.h' using previous resolution. +Resolved 'mm/Kconfig' using previous resolution. +Auto-merging arch/x86/include/asm/xen/hypercall.h +Auto-merging drivers/xen/Makefile +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/buffer.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/mpage.c +Auto-merging fs/ocfs2/super.c +CONFLICT (content): Merge conflict in fs/ocfs2/super.c +Auto-merging fs/super.c +CONFLICT (content): Merge conflict in fs/super.c +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging include/xen/interface/xen.h +Auto-merging mm/Kconfig +CONFLICT (content): Merge conflict in mm/Kconfig +Auto-merging mm/Makefile +Auto-merging mm/filemap.c +Auto-merging mm/truncate.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5fe0ac7] Merge remote-tracking branch 'cleancache/linux-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-mm-cleancache | 11 + + Documentation/vm/cleancache.txt | 267 ++++++++++++++++++++ + arch/x86/include/asm/xen/hypercall.h | 7 + + drivers/xen/Makefile | 1 + + drivers/xen/tmem.c | 264 +++++++++++++++++++ + fs/btrfs/extent_io.c | 9 + + fs/btrfs/super.c | 2 + + fs/buffer.c | 5 + + fs/ext3/super.c | 2 + + fs/ext4/super.c | 2 + + fs/mpage.c | 7 + + fs/ocfs2/super.c | 2 + + fs/super.c | 3 + + include/linux/cleancache.h | 118 +++++++++ + include/linux/fs.h | 5 + + include/xen/interface/xen.h | 22 ++ + mm/Kconfig | 22 ++ + mm/Makefile | 1 + + mm/cleancache.c | 245 ++++++++++++++++++ + mm/filemap.c | 11 + + mm/truncate.c | 10 + + 21 files changed, 1016 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache + create mode 100644 Documentation/vm/cleancache.txt + create mode 100644 drivers/xen/tmem.c + create mode 100644 include/linux/cleancache.h + create mode 100644 mm/cleancache.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/remotes/scsi-post-merge/master:scsi-post-merge/master +From ../next + * [new branch] scsi-post-merge/master -> scsi-post-merge/master +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base +From ../next + * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base +$ git checkout scsi-post-merge/master +Switched to branch 'scsi-post-merge/master' +$ git rebase --onto master scsi-post-merge/merge-base +First, rewinding head to replay your work on top of it... +Fast-forwarded scsi-post-merge/master to master. +$ cd ../next +$ git pull -f ../rebase-tmp scsi-post-merge/master +From ../rebase-tmp + * branch scsi-post-merge/master -> FETCH_HEAD +Already up-to-date. +$ rm -rf ../rebase-tmp |