diff options
Diffstat (limited to 'Next/merge.log')
-rw-r--r-- | Next/merge.log | 4784 |
1 files changed, 4784 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..7117f9685a73 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4784 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at fe0bdec Merge branch 'audit.b61' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current +Merging origin/master +$ git merge origin/master +Updating fe0bdec..238c6d5 +Fast forward + Documentation/filesystems/ocfs2.txt | 3 +- + MAINTAINERS | 15 +- + arch/arm/mach-omap2/clock24xx.h | 4 +- + arch/parisc/include/asm/module.h | 6 +- + arch/parisc/kernel/module.c | 216 +- + arch/powerpc/platforms/cell/spufs/inode.c | 1 - + arch/s390/hypfs/inode.c | 1 - + arch/sparc/Kconfig | 57 +- + arch/sparc/configs/sparc64_defconfig | 105 +- + arch/sparc/include/asm/Kbuild | 20 - + arch/sparc/include/asm/byteorder.h | 12 +- + arch/sparc/include/asm/ipcbuf.h | 38 +- + arch/sparc/include/asm/ipcbuf_32.h | 31 - + arch/sparc/include/asm/ipcbuf_64.h | 28 - + arch/sparc/include/asm/jsflash.h | 2 +- + arch/sparc/include/asm/openprom.h | 277 ++- + arch/sparc/include/asm/openprom_32.h | 255 -- + arch/sparc/include/asm/openprom_64.h | 280 -- + arch/sparc/include/asm/posix_types.h | 157 +- + arch/sparc/include/asm/posix_types_32.h | 118 - + arch/sparc/include/asm/posix_types_64.h | 122 - + arch/sparc/include/asm/processor_32.h | 2 +- + arch/sparc/include/asm/ptrace.h | 448 ++- + arch/sparc/include/asm/ptrace_32.h | 186 - + arch/sparc/include/asm/ptrace_64.h | 356 -- + arch/sparc/include/asm/reg.h | 8 - + arch/sparc/include/asm/reg_32.h | 79 - + arch/sparc/include/asm/reg_64.h | 56 - + arch/sparc/include/asm/sigcontext.h | 102 +- + arch/sparc/include/asm/sigcontext_32.h | 62 - + arch/sparc/include/asm/sigcontext_64.h | 87 - + arch/sparc/include/asm/siginfo.h | 43 +- + arch/sparc/include/asm/siginfo_32.h | 17 - + arch/sparc/include/asm/siginfo_64.h | 32 - + arch/sparc/include/asm/signal.h | 212 +- + arch/sparc/include/asm/signal_32.h | 207 - + arch/sparc/include/asm/signal_64.h | 194 - + arch/sparc/include/asm/smp_32.h | 3 - + arch/sparc/include/asm/stat.h | 111 +- + arch/sparc/include/asm/stat_32.h | 76 - + arch/sparc/include/asm/stat_64.h | 47 - + arch/sparc/include/asm/thread_info_32.h | 2 +- + arch/sparc/include/asm/traps.h | 11 +- + arch/sparc/kernel/irq_32.c | 2 + + arch/sparc/kernel/kgdb_32.c | 12 +- + arch/sparc/kernel/muldiv.c | 8 +- + arch/sparc/kernel/pci_psycho.c | 5 +- + arch/sparc/kernel/process_32.c | 16 +- + arch/sparc/kernel/prom_common.c | 14 +- + arch/sparc/kernel/signal_32.c | 6 +- + arch/sparc/kernel/traps_32.c | 4 +- + arch/sparc/kernel/unaligned_32.c | 12 +- + arch/sparc/kernel/windows.c | 6 +- + arch/um/Makefile | 25 +- + arch/um/include/asm/system.h | 14 +- + arch/x86/Kconfig.cpu | 2 +- + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 6 +- + arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 51 +- + arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 9 + + arch/x86/kernel/pci-swiotlb_64.c | 2 +- + drivers/cpufreq/cpufreq.c | 55 +- + drivers/hid/Kconfig | 70 +- + drivers/hid/Makefile | 5 +- + drivers/hid/hid-bright.c | 71 - + drivers/hid/hid-core.c | 120 +- + drivers/hid/hid-dell.c | 76 - + drivers/hid/hid-dummy.c | 6 + + drivers/hid/hid-gaff.c | 185 + + drivers/hid/hid-ids.h | 21 +- + drivers/hid/hid-lg.c | 7 - + drivers/hid/hid-ntrig.c | 82 + + drivers/hid/hid-sony.c | 2 +- + drivers/hid/hid-topseed.c | 77 + + drivers/hid/hidraw.c | 32 +- + drivers/hid/usbhid/Kconfig | 2 +- + drivers/hid/usbhid/hid-core.c | 34 +- + drivers/hid/usbhid/hid-quirks.c | 1 + + drivers/hid/usbhid/hiddev.c | 135 +- + drivers/hid/usbhid/usbhid.h | 10 + + drivers/i2c/busses/i2c-omap.c | 420 ++- + drivers/i2c/busses/i2c-s3c2410.c | 185 +- + drivers/i2c/chips/Kconfig | 23 - + drivers/i2c/chips/Makefile | 2 - + drivers/infiniband/hw/ipath/ipath_fs.c | 3 - + drivers/isdn/capi/capidrv.c | 4 +- + drivers/isdn/capi/capifs.c | 2 - + drivers/md/Makefile | 5 +- + drivers/md/dm-crypt.c | 6 +- + drivers/md/dm-delay.c | 6 +- + drivers/md/dm-exception-store.c | 749 +---- + drivers/md/dm-exception-store.h | 148 + + drivers/md/dm-ioctl.c | 16 +- + drivers/md/dm-linear.c | 6 +- + drivers/md/dm-log.c | 40 +- + drivers/md/dm-mpath.c | 14 +- + drivers/md/dm-raid1.c | 24 +- + drivers/md/dm-snap-persistent.c | 704 ++++ + drivers/md/dm-snap-transient.c | 98 + + drivers/md/dm-snap.c | 48 +- + drivers/md/dm-snap.h | 129 +- + drivers/md/dm-stripe.c | 4 +- + drivers/md/dm-sysfs.c | 99 + + drivers/md/dm-table.c | 47 +- + drivers/md/dm-target.c | 15 +- + drivers/md/dm-zero.c | 5 +- + drivers/md/dm.c | 101 +- + drivers/md/dm.h | 10 + + drivers/message/i2o/exec-osm.c | 2 +- + drivers/message/i2o/i2o_config.c | 2 +- + drivers/message/i2o/iop.c | 2 +- + drivers/message/i2o/pci.c | 2 +- + drivers/mfd/Kconfig | 66 +- + drivers/mfd/Makefile | 7 +- + drivers/mfd/da903x.c | 16 +- + drivers/mfd/dm355evm_msp.c | 420 ++ + drivers/{i2c/chips => mfd}/menelaus.c | 0 + drivers/mfd/mfd-core.c | 1 + + drivers/{i2c/chips => mfd}/tps65010.c | 0 + drivers/mfd/twl4030-core.c | 472 ++- + drivers/mfd/twl4030-irq.c | 30 +- + drivers/mfd/wm8350-core.c | 266 +- + drivers/mfd/wm8350-i2c.c | 4 +- + drivers/mfd/wm8350-regmap.c | 2100 ++++++++++- + drivers/mfd/wm8400-core.c | 31 +- + drivers/misc/ibmasm/ibmasmfs.c | 2 - + drivers/net/acenic.c | 117 +- + drivers/net/acenic.h | 4 + + drivers/net/e100.c | 268 +- + drivers/net/ehea/ehea.h | 3 +- + drivers/net/ehea/ehea_main.c | 2 +- + drivers/net/enc28j60.c | 4 +- + drivers/net/igb/igb_main.c | 4 +- + drivers/net/myri10ge/myri10ge.c | 6 +- + drivers/net/qlge/qlge.h | 57 +- + drivers/net/qlge/qlge_dbg.c | 13 +- + drivers/net/qlge/qlge_ethtool.c | 8 +- + drivers/net/qlge/qlge_main.c | 116 +- + drivers/net/starfire.c | 54 +- + drivers/net/starfire_firmware.h | 346 -- + drivers/net/starfire_firmware.pl | 31 - + drivers/net/tg3.c | 792 +---- + drivers/net/tg3.h | 4 + + drivers/net/tun.c | 2 +- + drivers/oprofile/oprofilefs.c | 3 - + drivers/power/Kconfig | 14 + + drivers/power/Makefile | 2 + + drivers/power/da9030_battery.c | 600 +++ + drivers/power/power_supply_sysfs.c | 2 +- + drivers/power/wm8350_power.c | 532 +++ + drivers/regulator/wm8350-regulator.c | 7 + + drivers/s390/net/qeth_core.h | 1 - + drivers/s390/net/qeth_core_main.c | 57 +- + drivers/s390/net/qeth_l2_main.c | 8 +- + drivers/s390/net/qeth_l3_main.c | 26 +- + drivers/usb/core/inode.c | 1 - + drivers/usb/gadget/file_storage.c | 18 +- + drivers/usb/gadget/inode.c | 1 - + firmware/Makefile | 11 + + firmware/WHENCE | 49 + + firmware/acenic/tg1.bin.ihex | 4573 ++++++++++++++++++++ + firmware/acenic/tg2.bin.ihex | 4844 ++++++++++++++++++++++ + firmware/adaptec/starfire_rx.bin.ihex | 53 + + firmware/adaptec/starfire_tx.bin.ihex | 53 + + firmware/tigon/tg3.bin.ihex | 175 + + firmware/tigon/tg3_tso.bin.ihex | 446 ++ + firmware/tigon/tg3_tso5.bin.ihex | 252 ++ + fs/Kconfig | 18 +- + fs/Makefile | 1 + + fs/affs/inode.c | 3 +- + fs/autofs/inode.c | 2 - + fs/autofs4/inode.c | 4 - + fs/binfmt_misc.c | 3 - + fs/cifs/inode.c | 2 +- + fs/coda/file.c | 12 +- + fs/configfs/inode.c | 3 - + fs/cramfs/inode.c | 2 - + fs/debugfs/inode.c | 3 - + fs/devpts/inode.c | 4 - + fs/dlm/ast.c | 56 +- + fs/dlm/ast.h | 4 +- + fs/dlm/debug_fs.c | 310 ++- + fs/dlm/dir.c | 18 +- + fs/dlm/dlm_internal.h | 4 +- + fs/dlm/lock.c | 31 +- + fs/dlm/lowcomms.c | 8 +- + fs/dlm/memory.c | 6 +- + fs/dlm/midcomms.c | 2 +- + fs/dlm/netlink.c | 1 - + fs/dlm/user.c | 4 +- + fs/dlm/user.h | 2 +- + fs/dquot.c | 436 ++- + fs/ecryptfs/file.c | 15 +- + fs/ecryptfs/inode.c | 3 +- + fs/exec.c | 5 + + fs/ext3/super.c | 16 +- + fs/ext4/super.c | 15 +- + fs/filesystems.c | 23 +- + fs/gfs2/Makefile | 2 +- + fs/gfs2/acl.c | 2 +- + fs/gfs2/bmap.c | 77 +- + fs/gfs2/bmap.h | 34 +- + fs/gfs2/daemon.c | 136 - + fs/gfs2/daemon.h | 17 - + fs/gfs2/dir.c | 62 +- + fs/gfs2/dir.h | 1 + + fs/gfs2/eattr.c | 40 +- + fs/gfs2/glock.c | 303 +- + fs/gfs2/glock.h | 2 +- + fs/gfs2/glops.c | 56 +- + fs/gfs2/incore.h | 55 +- + fs/gfs2/inode.c | 53 +- + fs/gfs2/inode.h | 13 +- + fs/gfs2/locking/dlm/mount.c | 12 +- + fs/gfs2/locking/dlm/sysfs.c | 16 +- + fs/gfs2/main.c | 15 +- + fs/gfs2/mount.c | 29 +- + fs/gfs2/ops_address.c | 32 +- + fs/gfs2/ops_dentry.c | 2 +- + fs/gfs2/ops_dentry.h | 17 - + fs/gfs2/ops_export.c | 5 +- + fs/gfs2/ops_file.c | 22 +- + fs/gfs2/ops_fstype.c | 125 +- + fs/gfs2/ops_fstype.h | 19 - + fs/gfs2/ops_inode.c | 75 +- + fs/gfs2/ops_inode.h | 25 - + fs/gfs2/ops_super.c | 149 +- + fs/gfs2/ops_super.h | 17 - + fs/gfs2/quota.c | 113 +- + fs/gfs2/quota.h | 24 +- + fs/gfs2/recovery.c | 48 +- + fs/gfs2/recovery.h | 14 +- + fs/gfs2/rgrp.c | 58 +- + fs/gfs2/super.c | 246 +-- + fs/gfs2/super.h | 13 +- + fs/gfs2/sys.c | 66 +- + fs/gfs2/sys.h | 4 - + fs/gfs2/util.c | 1 + + fs/gfs2/util.h | 1 + + fs/hugetlbfs/inode.c | 1 - + fs/inode.c | 2 + + fs/ioctl.c | 44 +- + fs/isofs/inode.c | 6 - + fs/jbd2/commit.c | 9 + + fs/jbd2/journal.c | 19 + + fs/jbd2/transaction.c | 47 + + fs/jfs/jfs_imap.c | 10 +- + fs/libfs.c | 5 - + fs/namei.c | 32 +- + fs/nfsd/vfs.c | 43 +- + fs/notify/inotify/inotify_user.c | 2 +- + fs/ntfs/inode.c | 3 - + fs/ocfs2/Makefile | 7 + + fs/ocfs2/acl.c | 479 +++ + fs/ocfs2/acl.h | 58 + + fs/ocfs2/alloc.c | 710 +++- + fs/ocfs2/alloc.h | 30 +- + fs/ocfs2/aops.c | 59 +- + fs/ocfs2/blockcheck.c | 477 +++ + fs/ocfs2/blockcheck.h | 82 + + fs/ocfs2/buffer_head_io.c | 32 +- + fs/ocfs2/buffer_head_io.h | 27 +- + fs/ocfs2/cluster/masklog.c | 1 + + fs/ocfs2/cluster/masklog.h | 1 + + fs/ocfs2/dir.c | 399 ++- + fs/ocfs2/dir.h | 2 + + fs/ocfs2/dlm/dlmast.c | 52 +- + fs/ocfs2/dlm/dlmcommon.h | 3 + + fs/ocfs2/dlm/dlmdebug.c | 53 +- + fs/ocfs2/dlm/dlmdomain.c | 1 + + fs/ocfs2/dlm/dlmfs.c | 2 - + fs/ocfs2/dlm/dlmmaster.c | 42 +- + fs/ocfs2/dlm/dlmthread.c | 3 +- + fs/ocfs2/dlmglue.c | 168 +- + fs/ocfs2/dlmglue.h | 19 + + fs/ocfs2/extent_map.c | 96 +- + fs/ocfs2/extent_map.h | 24 + + fs/ocfs2/file.c | 209 +- + fs/ocfs2/file.h | 3 + + fs/ocfs2/inode.c | 175 +- + fs/ocfs2/inode.h | 18 +- + fs/ocfs2/journal.c | 364 ++- + fs/ocfs2/journal.h | 128 +- + fs/ocfs2/localalloc.c | 26 +- + fs/ocfs2/namei.c | 318 +- + fs/ocfs2/ocfs2.h | 46 +- + fs/ocfs2/ocfs2_fs.h | 213 +- + fs/ocfs2/ocfs2_jbd_compat.h | 82 - + fs/ocfs2/ocfs2_lockid.h | 5 + + fs/ocfs2/quota.h | 119 + + fs/ocfs2/quota_global.c | 1025 +++++ + fs/ocfs2/quota_local.c | 1253 ++++++ + fs/ocfs2/resize.c | 76 +- + fs/ocfs2/slot_map.c | 4 +- + fs/ocfs2/suballoc.c | 363 +- + fs/ocfs2/suballoc.h | 18 +- + fs/ocfs2/super.c | 328 ++- + fs/ocfs2/symlink.c | 2 +- + fs/ocfs2/xattr.c | 2984 ++++++++------ + fs/ocfs2/xattr.h | 45 + + fs/omfs/inode.c | 1 - + fs/open.c | 2 +- + fs/openpromfs/inode.c | 3 - + fs/proc/base.c | 4 - + fs/proc/proc_sysctl.c | 1 - + fs/quota.c | 11 +- + fs/quota_tree.c | 645 +++ + fs/quota_tree.h | 25 + + fs/quota_v1.c | 28 +- + fs/quota_v2.c | 631 +--- + {include/linux => fs}/quotaio_v1.h | 0 + {include/linux => fs}/quotaio_v2.h | 33 +- + fs/ramfs/inode.c | 1 - + fs/read_write.c | 13 + + fs/reiserfs/inode.c | 13 +- + fs/reiserfs/super.c | 10 +- + fs/romfs/inode.c | 1 - + fs/stat.c | 2 +- + fs/sync.c | 48 +- + fs/sysfs/inode.c | 3 - + fs/xattr.c | 2 +- + include/linux/Kbuild | 4 - + include/linux/cpufreq.h | 1 + + include/linux/device-mapper.h | 28 +- + include/linux/dma_remapping.h | 8 + + include/linux/dqblk_qtree.h | 56 + + include/linux/dqblk_v1.h | 7 - + include/linux/dqblk_v2.h | 22 +- + include/linux/fs.h | 5 +- + include/linux/hid.h | 16 +- + include/linux/hidraw.h | 2 + + include/linux/i2c/dm355evm_msp.h | 79 + + include/linux/i2c/twl4030.h | 81 +- + include/linux/jbd2.h | 32 + + include/linux/journal-head.h | 8 + + include/linux/mfd/da903x.h | 44 +- + include/linux/mfd/wm8350/comparator.h | 8 + + include/linux/mfd/wm8350/core.h | 52 +- + include/linux/mfd/wm8350/pmic.h | 4 + + include/linux/mfd/wm8350/supply.h | 25 +- + include/linux/moduleloader.h | 3 + + include/linux/netdevice.h | 16 +- + include/linux/power_supply.h | 1 + + include/linux/quota.h | 108 +- + include/linux/quotaops.h | 96 +- + include/linux/radix-tree.h | 2 +- + include/linux/stop_machine.h | 22 + + include/linux/syscalls.h | 2 +- + include/net/ndisc.h | 4 +- + init/Kconfig | 6 - + ipc/mqueue.c | 1 - + ipc/sem.c | 2 +- + kernel/cgroup.c | 1 - + kernel/cpu.c | 6 +- + kernel/module.c | 59 +- + kernel/stop_machine.c | 55 +- + lib/swiotlb.c | 3 +- + mm/filemap.c | 2 +- + mm/memory.c | 4 +- + mm/mmap.c | 2 +- + mm/mprotect.c | 2 +- + mm/mremap.c | 2 +- + mm/msync.c | 2 +- + mm/nommu.c | 2 +- + net/can/bcm.c | 208 +- + net/core/dev.c | 93 +- + net/core/skbuff.c | 15 +- + net/dcb/dcbnl.c | 14 +- + net/dccp/Kconfig | 4 - + net/dccp/Makefile | 15 +- + net/dccp/ackvec.h | 49 - + net/dccp/ccid.c | 254 +- + net/dccp/ccid.h | 14 +- + net/dccp/ccids/Kconfig | 79 +- + net/dccp/ccids/Makefile | 9 - + net/dccp/ccids/ccid2.c | 22 +- + net/dccp/ccids/ccid3.c | 23 +- + net/dccp/ccids/lib/Makefile | 3 - + net/dccp/ccids/lib/loss_interval.c | 3 - + net/dccp/ccids/lib/packet_history.c | 9 - + net/dccp/ccids/lib/tfrc.c | 19 +- + net/dccp/ccids/lib/tfrc.h | 11 +- + net/dccp/ccids/lib/tfrc_equation.c | 4 - + net/dccp/dccp.h | 2 - + net/dccp/feat.c | 6 +- + net/dccp/input.c | 2 - + net/dccp/proto.c | 7 + + net/ipv4/tcp.c | 9 +- + net/ipv6/ipv6_sockglue.c | 2 +- + net/ipv6/route.c | 52 +- + net/iucv/af_iucv.c | 28 +- + net/iucv/iucv.c | 18 +- + net/rfkill/rfkill.c | 4 +- + net/sched/cls_u32.c | 3 +- + net/sunrpc/rpc_pipe.c | 2 - + security/commoncap.c | 6 +- + security/inode.c | 3 - + security/selinux/selinuxfs.c | 2 - + sound/pci/hda/patch_conexant.c | 114 +- + sound/pci/hda/patch_realtek.c | 3 +- + sound/pci/ice1712/ice1724.c | 2 +- + sound/soc/codecs/twl4030.c | 377 +- + sound/soc/codecs/twl4030.h | 7 + + sound/soc/davinci/davinci-sffsdr.c | 4 + + sound/soc/pxa/pxa2xx-pcm.c | 4 +- + sound/soc/soc-core.c | 46 +- + sound/soc/soc-dapm.c | 10 +- + sound/usb/caiaq/caiaq-device.c | 4 +- + sound/usb/usbaudio.c | 8 +- + sound/usb/usbmidi.c | 39 +- + sound/usb/usbmixer.c | 5 +- + sound/usb/usx2y/us122l.c | 4 +- + sound/usb/usx2y/usbusx2y.c | 4 +- + 412 files changed, 31818 insertions(+), 11209 deletions(-) + delete mode 100644 arch/sparc/include/asm/ipcbuf_32.h + delete mode 100644 arch/sparc/include/asm/ipcbuf_64.h + delete mode 100644 arch/sparc/include/asm/openprom_32.h + delete mode 100644 arch/sparc/include/asm/openprom_64.h + delete mode 100644 arch/sparc/include/asm/posix_types_32.h + delete mode 100644 arch/sparc/include/asm/posix_types_64.h + delete mode 100644 arch/sparc/include/asm/ptrace_32.h + delete mode 100644 arch/sparc/include/asm/ptrace_64.h + delete mode 100644 arch/sparc/include/asm/reg.h + delete mode 100644 arch/sparc/include/asm/reg_32.h + delete mode 100644 arch/sparc/include/asm/reg_64.h + delete mode 100644 arch/sparc/include/asm/sigcontext_32.h + delete mode 100644 arch/sparc/include/asm/sigcontext_64.h + delete mode 100644 arch/sparc/include/asm/siginfo_32.h + delete mode 100644 arch/sparc/include/asm/siginfo_64.h + delete mode 100644 arch/sparc/include/asm/signal_32.h + delete mode 100644 arch/sparc/include/asm/signal_64.h + delete mode 100644 arch/sparc/include/asm/stat_32.h + delete mode 100644 arch/sparc/include/asm/stat_64.h + delete mode 100644 drivers/hid/hid-bright.c + delete mode 100644 drivers/hid/hid-dell.c + create mode 100644 drivers/hid/hid-gaff.c + create mode 100644 drivers/hid/hid-ntrig.c + create mode 100644 drivers/hid/hid-topseed.c + create mode 100644 drivers/md/dm-exception-store.h + create mode 100644 drivers/md/dm-snap-persistent.c + create mode 100644 drivers/md/dm-snap-transient.c + create mode 100644 drivers/md/dm-sysfs.c + create mode 100644 drivers/mfd/dm355evm_msp.c + rename drivers/{i2c/chips => mfd}/menelaus.c (100%) + rename drivers/{i2c/chips => mfd}/tps65010.c (100%) + delete mode 100644 drivers/net/starfire_firmware.h + delete mode 100644 drivers/net/starfire_firmware.pl + create mode 100644 drivers/power/da9030_battery.c + create mode 100644 drivers/power/wm8350_power.c + create mode 100644 firmware/acenic/tg1.bin.ihex + create mode 100644 firmware/acenic/tg2.bin.ihex + create mode 100644 firmware/adaptec/starfire_rx.bin.ihex + create mode 100644 firmware/adaptec/starfire_tx.bin.ihex + create mode 100644 firmware/tigon/tg3.bin.ihex + create mode 100644 firmware/tigon/tg3_tso.bin.ihex + create mode 100644 firmware/tigon/tg3_tso5.bin.ihex + delete mode 100644 fs/gfs2/daemon.c + delete mode 100644 fs/gfs2/daemon.h + delete mode 100644 fs/gfs2/ops_dentry.h + delete mode 100644 fs/gfs2/ops_fstype.h + delete mode 100644 fs/gfs2/ops_inode.h + delete mode 100644 fs/gfs2/ops_super.h + create mode 100644 fs/ocfs2/acl.c + create mode 100644 fs/ocfs2/acl.h + create mode 100644 fs/ocfs2/blockcheck.c + create mode 100644 fs/ocfs2/blockcheck.h + delete mode 100644 fs/ocfs2/ocfs2_jbd_compat.h + create mode 100644 fs/ocfs2/quota.h + create mode 100644 fs/ocfs2/quota_global.c + create mode 100644 fs/ocfs2/quota_local.c + create mode 100644 fs/quota_tree.c + create mode 100644 fs/quota_tree.h + rename {include/linux => fs}/quotaio_v1.h (100%) + rename {include/linux => fs}/quotaio_v2.h (68%) + create mode 100644 include/linux/dqblk_qtree.h + create mode 100644 include/linux/i2c/dm355evm_msp.h + delete mode 100644 net/dccp/ccids/Makefile + delete mode 100644 net/dccp/ccids/lib/Makefile +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 sparc-current/master +$ git merge sparc-current/master +Updating 238c6d5..3f4528d +Fast forward + arch/sparc/include/asm/timer_64.h | 2 +- + arch/sparc/include/asm/types.h | 2 +- + arch/sparc/kernel/ds.c | 34 +++++++++++++------------- + arch/sparc/kernel/iommu.c | 2 +- + arch/sparc/kernel/ldc.c | 23 +++++++++-------- + arch/sparc/kernel/mdesc.c | 14 +++++----- + arch/sparc/kernel/of_device_64.c | 2 +- + arch/sparc/kernel/pci.c | 2 +- + arch/sparc/kernel/pci_common.c | 2 +- + arch/sparc/kernel/pci_msi.c | 4 +- + arch/sparc/kernel/pci_schizo.c | 2 +- + arch/sparc/kernel/pci_sun4v.c | 2 +- + arch/sparc/kernel/power.c | 2 +- + arch/sparc/kernel/prom_irqtrans.c | 2 +- + arch/sparc/kernel/psycho_common.c | 14 +++++----- + arch/sparc/kernel/smp_64.c | 4 +- + arch/sparc/kernel/time_64.c | 12 ++++---- + arch/sparc/kernel/traps_64.c | 20 +++++++------- + arch/sparc/kernel/vio.c | 4 +- + arch/sparc/kernel/viohs.c | 6 +++- + arch/sparc/mm/fault_32.c | 3 +- + arch/sparc/mm/init_64.c | 48 ++++++++++++++++++++++-------------- + drivers/block/sunvdc.c | 8 +++--- + drivers/char/hw_random/n2-drv.c | 2 +- + drivers/net/sunvnet.c | 8 +++--- + drivers/sbus/char/display7seg.c | 2 +- + sound/sparc/cs4231.c | 2 +- + 27 files changed, 121 insertions(+), 107 deletions(-) +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. +Merging net-current/master +$ git merge net-current/master +Already up-to-date. +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Merge made by recursive. + include/sound/soc-dapm.h | 15 +++ + include/sound/soc.h | 30 ++++++ + sound/arm/pxa2xx-ac97-lib.c | 25 +++-- + sound/soc/atmel/sam9g20_wm8731.c | 4 +- + sound/soc/codecs/Kconfig | 20 +++- + sound/soc/codecs/twl4030.c | 118 +++++++++++------------ + sound/soc/davinci/davinci-evm.c | 19 +++- + sound/soc/omap/Kconfig | 1 + + sound/soc/omap/omap3pandora.c | 13 +++ + sound/soc/soc-core.c | 107 +++++++++++++++++++++ + sound/soc/soc-dapm.c | 197 +++++++++++++++++++++++++++++++++++++- + 11 files changed, 464 insertions(+), 85 deletions(-) +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + drivers/usb/storage/unusual_devs.h | 30 +++++++++++++++++++++++++++++- + 1 files changed, 29 insertions(+), 1 deletions(-) +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Auto-merged drivers/input/keyboard/omap-keypad.c +Auto-merged drivers/input/touchscreen/ads7846.c +Merge made by recursive. + Documentation/input/walkera0701.txt | 109 +++++++ + arch/arm/mach-pxa/include/mach/pxa930_rotary.h | 20 ++ + arch/arm/mach-pxa/include/mach/pxa930_trkball.h | 10 + + drivers/input/Makefile | 2 +- + drivers/input/evbug.c | 6 +- + drivers/input/evdev.c | 199 +----------- + drivers/input/gameport/gameport.c | 3 +- + drivers/input/gameport/ns558.c | 2 +- + drivers/input/input-compat.c | 135 ++++++++ + drivers/input/input-compat.h | 94 ++++++ + drivers/input/input.c | 4 +- + drivers/input/joydev.c | 2 +- + drivers/input/joystick/Kconfig | 24 ++ + drivers/input/joystick/Makefile | 2 + + drivers/input/joystick/maplecontrol.c | 193 +++++++++++ + drivers/input/joystick/walkera0701.c | 292 +++++++++++++++++ + drivers/input/keyboard/Kconfig | 9 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/atkbd.c | 60 ++++ + drivers/input/keyboard/gpio_keys.c | 4 + + drivers/input/keyboard/hil_kbd.c | 1 + + drivers/input/keyboard/omap-keypad.c | 6 +- + drivers/input/keyboard/pxa930_rotary.c | 212 ++++++++++++ + drivers/input/misc/pcspkr.c | 4 +- + drivers/input/misc/uinput.c | 172 +++++++++-- + drivers/input/mouse/Kconfig | 6 + + drivers/input/mouse/Makefile | 27 +- + drivers/input/mouse/appletouch.c | 274 ++++++++-------- + drivers/input/mouse/gpio_mouse.c | 2 +- + drivers/input/mouse/hgpk.c | 32 ++- + drivers/input/mouse/hil_ptr.c | 2 +- + drivers/input/mouse/pxa930_trkball.c | 269 ++++++++++++++++ + drivers/input/mouse/synaptics.c | 16 +- + drivers/input/mousedev.c | 3 +- + drivers/input/serio/hil_mlc.c | 1 + + drivers/input/serio/i8042-x86ia64io.h | 15 + + drivers/input/serio/libps2.c | 20 +- + drivers/input/serio/pcips2.c | 2 +- + drivers/input/serio/serio.c | 4 +- + drivers/input/serio/xilinx_ps2.c | 220 +++++++------- + drivers/input/tablet/gtco.c | 2 +- + drivers/input/tablet/wacom_wac.c | 2 +- + drivers/input/touchscreen/Kconfig | 32 ++ + drivers/input/touchscreen/Makefile | 3 + + drivers/input/touchscreen/ads7846.c | 6 +- + drivers/input/touchscreen/da9034-ts.c | 389 +++++++++++++++++++++++ + drivers/input/touchscreen/tsc2007.c | 381 ++++++++++++++++++++++ + drivers/input/touchscreen/usbtouchscreen.c | 5 +- + drivers/input/touchscreen/wacom_w8001.c | 325 +++++++++++++++++++ + include/linux/gpio_keys.h | 1 + + include/linux/i2c/tsc2007.h | 17 + + include/linux/libps2.h | 2 + + include/linux/map_to_7segment.h | 2 +- + include/linux/serio.h | 1 + + 54 files changed, 3105 insertions(+), 522 deletions(-) + create mode 100644 Documentation/input/walkera0701.txt + create mode 100644 arch/arm/mach-pxa/include/mach/pxa930_rotary.h + create mode 100644 arch/arm/mach-pxa/include/mach/pxa930_trkball.h + create mode 100644 drivers/input/input-compat.c + create mode 100644 drivers/input/input-compat.h + create mode 100644 drivers/input/joystick/maplecontrol.c + create mode 100644 drivers/input/joystick/walkera0701.c + create mode 100644 drivers/input/keyboard/pxa930_rotary.c + create mode 100644 drivers/input/mouse/pxa930_trkball.c + create mode 100644 drivers/input/touchscreen/da9034-ts.c + create mode 100644 drivers/input/touchscreen/tsc2007.c + create mode 100644 drivers/input/touchscreen/wacom_w8001.c + create mode 100644 include/linux/i2c/tsc2007.h +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 +Auto-merged drivers/char/tty_audit.c +CONFLICT (content): Merge conflict in drivers/char/tty_audit.c +Auto-merged drivers/char/tty_io.c +Auto-merged include/linux/audit.h +Auto-merged include/linux/tty.h +Auto-merged kernel/auditsc.c +CONFLICT (content): Merge conflict in kernel/auditsc.c +Auto-merged kernel/fork.c +Resolved 'drivers/char/tty_audit.c' using previous resolution. +Resolved 'kernel/auditsc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 3e37704: Merge commit 'audit-current/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Removed arch/arm/configs/clps7500_defconfig +Merge made by recursive. + arch/arm/configs/clps7500_defconfig | 801 ----------------------------------- + arch/arm/mach-clps711x/edb7211-mm.c | 1 - + arch/arm/mach-clps711x/fortunet.c | 1 - + arch/arm/mach-footbridge/common.c | 7 + + arch/arm/mach-pxa/e750.c | 52 +++ + 5 files changed, 59 insertions(+), 803 deletions(-) + delete mode 100644 arch/arm/configs/clps7500_defconfig +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/Kconfig | 19 + + arch/avr32/Makefile | 1 + + arch/avr32/boards/atngw100/setup.c | 2 +- + arch/avr32/boards/atstk1000/atstk1002.c | 20 +- + arch/avr32/boards/atstk1000/atstk1003.c | 20 +- + arch/avr32/boards/atstk1000/atstk1004.c | 2 +- + arch/avr32/boards/favr-32/setup.c | 31 +- + arch/avr32/boards/hammerhead/Kconfig | 43 + + arch/avr32/boards/hammerhead/Makefile | 1 + + arch/avr32/boards/hammerhead/flash.c | 377 +++++ + arch/avr32/boards/hammerhead/flash.h | 6 + + arch/avr32/boards/hammerhead/setup.c | 245 ++++ + arch/avr32/boards/mimc200/setup.c | 4 +- + arch/avr32/configs/atngw100_defconfig | 2 +- + arch/avr32/configs/atstk1002_defconfig | 2 +- + arch/avr32/configs/atstk1003_defconfig | 2 +- + arch/avr32/configs/atstk1006_defconfig | 2 +- + arch/avr32/configs/hammerhead_defconfig | 1467 ++++++++++++++++++++ + arch/avr32/kernel/process.c | 1 + + arch/avr32/kernel/signal.c | 1 + + arch/avr32/kernel/sys_avr32.c | 1 + + arch/avr32/mach-at32ap/at32ap700x.c | 6 +- + arch/avr32/mach-at32ap/clock.c | 4 +- + arch/avr32/mach-at32ap/clock.h | 3 + + arch/avr32/mach-at32ap/include/mach/at32ap700x.h | 3 + + arch/avr32/mach-at32ap/include/mach/portmux.h | 2 +- + arch/avr32/mach-at32ap/pio.c | 19 +- + arch/avr32/mm/cache.c | 1 + + drivers/mmc/host/atmel-mci.c | 2 +- + include/asm-avr32/syscalls.h | 39 + + .../include/asm => include/linux}/atmel-mci.h | 6 +- + 31 files changed, 2253 insertions(+), 81 deletions(-) + create mode 100644 arch/avr32/boards/hammerhead/Kconfig + create mode 100644 arch/avr32/boards/hammerhead/Makefile + create mode 100644 arch/avr32/boards/hammerhead/flash.c + create mode 100644 arch/avr32/boards/hammerhead/flash.h + create mode 100644 arch/avr32/boards/hammerhead/setup.c + create mode 100644 arch/avr32/configs/hammerhead_defconfig + create mode 100644 include/asm-avr32/syscalls.h + rename {arch/avr32/include/asm => include/linux}/atmel-mci.h (91%) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/include/arch-v10/arch/byteorder.h | 10 ++++++---- + arch/cris/include/arch-v32/arch/byteorder.h | 6 ++++-- + arch/cris/include/asm/byteorder.h | 20 ++++---------------- + 3 files changed, 14 insertions(+), 22 deletions(-) +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. + arch/m68knommu/platform/coldfire/entry.S | 15 ++------------- + 1 files changed, 2 insertions(+), 13 deletions(-) +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging parisc/master +$ git merge parisc/master +Merge made by recursive. + arch/parisc/Makefile | 2 +- + arch/parisc/include/asm/byteorder.h | 37 ++++++------------ + arch/parisc/include/asm/checksum.h | 2 +- + arch/parisc/include/asm/io.h | 12 +---- + arch/parisc/include/asm/mmu_context.h | 13 ++++-- + arch/parisc/include/asm/processor.h | 4 +- + arch/parisc/include/asm/uaccess.h | 2 + + arch/parisc/kernel/drivers.c | 40 ++++++++++++++++--- + arch/parisc/kernel/hpmc.S | 8 +++- + arch/parisc/kernel/irq.c | 11 +++-- + arch/parisc/kernel/pdc_cons.c | 2 +- + arch/parisc/kernel/perf.c | 4 +- + arch/parisc/kernel/processor.c | 68 +++++++++++++++++---------------- + arch/parisc/kernel/setup.c | 11 +---- + arch/parisc/kernel/smp.c | 32 +++++++-------- + arch/parisc/kernel/time.c | 4 +- + arch/parisc/kernel/topology.c | 4 +- + arch/parisc/kernel/traps.c | 9 +++- + arch/parisc/kernel/unwind.c | 2 +- + arch/parisc/lib/iomap.c | 2 +- + arch/parisc/lib/memcpy.c | 2 +- + arch/parisc/mm/fault.c | 58 +++++++++++++++------------- + drivers/parisc/asp.c | 3 +- + drivers/parisc/ccio-dma.c | 4 +- + drivers/parisc/dino.c | 4 +- + drivers/parisc/hppb.c | 2 +- + drivers/parisc/lasi.c | 5 +- + drivers/parisc/lba_pci.c | 2 +- + drivers/parisc/sba_iommu.c | 9 +--- + drivers/parisc/wax.c | 3 +- + drivers/rtc/rtc-parisc.c | 3 +- + 31 files changed, 191 insertions(+), 173 deletions(-) +Merging powerpc/next +$ git merge powerpc/next +Merge made by recursive. + Documentation/powerpc/dts-bindings/fsl/board.txt | 32 ++++- + arch/powerpc/boot/dts/mpc836x_mds.dts | 43 +++++- + arch/powerpc/boot/dts/mpc836x_rdk.dts | 19 ++- + arch/powerpc/boot/dts/mpc8641_hpcn.dts | 56 ++++--- + arch/powerpc/configs/85xx/mpc8572_ds_defconfig | 43 +++-- + arch/powerpc/include/asm/qe.h | 37 ++++- + arch/powerpc/include/asm/qe_ic.h | 21 ++- + arch/powerpc/platforms/83xx/mpc831x_rdb.c | 2 +- + arch/powerpc/platforms/83xx/mpc832x_mds.c | 9 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 5 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 81 +++++++++- + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 6 +- + arch/powerpc/platforms/83xx/mpc837x_mds.c | 1 - + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 - + arch/powerpc/platforms/83xx/mpc83xx.h | 1 + + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 7 + + arch/powerpc/platforms/85xx/smp.c | 1 + + arch/powerpc/platforms/Kconfig | 11 ++ + arch/powerpc/platforms/Kconfig.cputype | 2 +- + arch/powerpc/sysdev/Makefile | 1 + + arch/powerpc/sysdev/fsl_pci.c | 7 +- + arch/powerpc/sysdev/fsl_soc.h | 5 + + arch/powerpc/sysdev/qe_lib/Kconfig | 3 +- + arch/powerpc/sysdev/qe_lib/gpio.c | 195 ++++++++++++++++++++++ + arch/powerpc/sysdev/simple_gpio.c | 155 +++++++++++++++++ + arch/powerpc/sysdev/simple_gpio.h | 12 ++ + 26 files changed, 686 insertions(+), 71 deletions(-) + create mode 100644 arch/powerpc/sysdev/simple_gpio.c + create mode 100644 arch/powerpc/sysdev/simple_gpio.h +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging pxa/for-next +$ git merge pxa/for-next +Merge made by recursive. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/include/asm/posix_types.h | 4 ---- + arch/s390/include/asm/ptrace.h | 7 +++++-- + arch/s390/kernel/vdso32/gettimeofday.S | 4 ---- + drivers/s390/char/Kconfig | 2 +- + 4 files changed, 6 insertions(+), 11 deletions(-) +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/Kconfig | 7 + + arch/sh/boards/Kconfig | 4 +- + arch/sh/boards/mach-migor/setup.c | 140 +++++---------- + arch/sh/include/asm/gpio.h | 70 +++++--- + arch/sh/include/asm/posix_types_32.h | 8 +- + arch/sh/include/asm/posix_types_64.h | 8 +- + arch/sh/kernel/gpio.c | 338 +++++++++++++++++++++------------- + arch/sh/mm/ioremap_64.c | 2 +- + drivers/serial/sh-sci.h | 2 +- + 9 files changed, 313 insertions(+), 266 deletions(-) +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Already uptodate! +Merge made by recursive. +Merging xtensa/master +$ git merge xtensa/master +Auto-merged arch/xtensa/platforms/iss/network.c +Merge made by recursive. + arch/xtensa/Makefile | 28 +-- + arch/xtensa/boot/boot-elf/boot.lds.S | 2 +- + arch/xtensa/boot/boot-redboot/bootstrap.S | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/Kbuild | 0 + .../xtensa/include/asm}/asmmacro.h | 2 +- + .../xtensa/include/asm}/atomic.h | 0 + .../xtensa/include/asm}/auxvec.h | 0 + .../xtensa/include/asm}/bitops.h | 0 + .../xtensa/include/asm}/bootparam.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/bug.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/bugs.h | 0 + .../xtensa/include/asm}/byteorder.h | 32 ++-- + .../asm-xtensa => arch/xtensa/include/asm}/cache.h | 2 +- + .../xtensa/include/asm}/cacheasm.h | 0 + .../xtensa/include/asm}/cacheflush.h | 0 + .../xtensa/include/asm}/checksum.h | 2 +- + .../xtensa/include/asm}/coprocessor.h | 4 +- + .../xtensa/include/asm}/cpumask.h | 0 + .../xtensa/include/asm}/cputime.h | 0 + .../xtensa/include/asm}/current.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/delay.h | 0 + .../xtensa/include/asm}/device.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/div64.h | 0 + .../xtensa/include/asm}/dma-mapping.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/dma.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/elf.h | 0 + .../xtensa/include/asm}/emergency-restart.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/errno.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/fb.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/fcntl.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/futex.h | 0 + .../xtensa/include/asm}/hardirq.h | 0 + .../xtensa/include/asm}/highmem.h | 0 + .../xtensa/include/asm}/hw_irq.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/io.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/ioctl.h | 0 + .../xtensa/include/asm}/ioctls.h | 0 + .../xtensa/include/asm}/ipcbuf.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/irq.h | 4 +- + .../xtensa/include/asm}/irq_regs.h | 0 + .../xtensa/include/asm}/kdebug.h | 0 + .../xtensa/include/asm}/kmap_types.h | 0 + .../xtensa/include/asm}/linkage.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/local.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mman.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mmu.h | 0 + .../xtensa/include/asm}/mmu_context.h | 0 + .../xtensa/include/asm}/module.h | 0 + .../xtensa/include/asm}/msgbuf.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/mutex.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/page.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/param.h | 0 + .../xtensa/include/asm}/pci-bridge.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/pci.h | 0 + .../xtensa/include/asm}/percpu.h | 0 + .../xtensa/include/asm}/pgalloc.h | 0 + .../xtensa/include/asm}/pgtable.h | 0 + .../xtensa/include/asm}/platform.h | 2 - + .../asm-xtensa => arch/xtensa/include/asm}/poll.h | 0 + .../xtensa/include/asm}/posix_types.h | 0 + .../xtensa/include/asm}/processor.h | 2 +- + .../xtensa/include/asm}/ptrace.h | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/regs.h | 0 + .../xtensa/include/asm}/resource.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/rmap.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/rwsem.h | 0 + .../xtensa/include/asm}/scatterlist.h | 0 + .../xtensa/include/asm}/sections.h | 0 + .../xtensa/include/asm}/segment.h | 0 + .../xtensa/include/asm}/sembuf.h | 0 + .../xtensa/include/asm}/serial.h | 2 +- + .../asm-xtensa => arch/xtensa/include/asm}/setup.h | 0 + .../xtensa/include/asm}/shmbuf.h | 0 + .../xtensa/include/asm}/shmparam.h | 0 + .../xtensa/include/asm}/sigcontext.h | 0 + .../xtensa/include/asm}/siginfo.h | 0 + .../xtensa/include/asm}/signal.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/smp.h | 0 + .../xtensa/include/asm}/socket.h | 0 + .../xtensa/include/asm}/sockios.h | 0 + .../xtensa/include/asm}/spinlock.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/stat.h | 0 + .../xtensa/include/asm}/statfs.h | 0 + .../xtensa/include/asm}/string.h | 0 + .../xtensa/include/asm}/syscall.h | 0 + .../xtensa/include/asm}/system.h | 0 + .../xtensa/include/asm}/termbits.h | 0 + .../xtensa/include/asm}/termios.h | 0 + .../xtensa/include/asm}/thread_info.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/timex.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/tlb.h | 0 + .../xtensa/include/asm}/tlbflush.h | 0 + .../xtensa/include/asm}/topology.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/types.h | 0 + .../xtensa/include/asm}/uaccess.h | 0 + .../xtensa/include/asm}/ucontext.h | 0 + .../xtensa/include/asm}/unaligned.h | 12 +- + .../xtensa/include/asm}/unistd.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/user.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/vga.h | 0 + .../asm-xtensa => arch/xtensa/include/asm}/xor.h | 0 + arch/xtensa/kernel/entry.S | 2 +- + arch/xtensa/kernel/vmlinux.lds.S | 2 +- + arch/xtensa/lib/checksum.S | 2 +- + arch/xtensa/lib/memcopy.S | 2 +- + arch/xtensa/lib/memset.S | 2 +- + arch/xtensa/lib/strncpy_user.S | 2 +- + arch/xtensa/lib/strnlen_user.S | 2 +- + arch/xtensa/lib/usercopy.S | 2 +- + arch/xtensa/platforms/iss/console.c | 4 +- + .../platforms/iss/include/platform}/hardware.h | 0 + .../platforms/iss/include/platform}/simcall.h | 0 + arch/xtensa/platforms/iss/io.c | 2 +- + arch/xtensa/platforms/iss/network.c | 4 +- + arch/xtensa/platforms/xt2000/Makefile | 5 + + .../platforms/xt2000/include/platform/hardware.h | 55 ++++++ + .../platforms/xt2000/include/platform/serial.h | 28 +++ + arch/xtensa/platforms/xt2000/setup.c | 181 ++++++++++++++++++++ + .../xtensa/variants/dc232b/include/variant}/core.h | 0 + .../variants/dc232b/include/variant}/tie-asm.h | 0 + .../xtensa/variants/dc232b/include/variant}/tie.h | 0 + .../xtensa/variants/fsf/include/variant}/core.h | 0 + .../xtensa/variants/fsf/include/variant}/tie-asm.h | 0 + .../xtensa/variants/fsf/include/variant}/tie.h | 0 + 124 files changed, 324 insertions(+), 69 deletions(-) + rename {include/asm-xtensa => arch/xtensa/include/asm}/Kbuild (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/asmmacro.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/atomic.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/auxvec.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bitops.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bootparam.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bug.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/bugs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/byteorder.h (82%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cache.h (96%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cacheasm.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cacheflush.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/checksum.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/coprocessor.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cpumask.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/cputime.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/current.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/delay.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/device.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/div64.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/dma-mapping.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/dma.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/elf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/emergency-restart.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/errno.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/fb.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/fcntl.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/futex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/hardirq.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/highmem.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/hw_irq.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/io.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ioctl.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ioctls.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ipcbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/irq.h (89%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/irq_regs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/kdebug.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/kmap_types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/linkage.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/local.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mman.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mmu.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mmu_context.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/module.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/msgbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/mutex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/page.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/param.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pci-bridge.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pci.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/percpu.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pgalloc.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/pgtable.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/platform.h (98%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/poll.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/posix_types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/processor.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ptrace.h (99%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/regs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/resource.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/rmap.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/rwsem.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/scatterlist.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sections.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/segment.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sembuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/serial.h (92%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/setup.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/shmbuf.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/shmparam.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sigcontext.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/siginfo.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/signal.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/smp.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/socket.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/sockios.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/spinlock.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/stat.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/statfs.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/string.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/syscall.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/system.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/termbits.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/termios.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/thread_info.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/timex.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/tlb.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/tlbflush.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/topology.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/types.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/uaccess.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/ucontext.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/unaligned.h (80%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/unistd.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/user.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/vga.h (100%) + rename {include/asm-xtensa => arch/xtensa/include/asm}/xor.h (100%) + rename {include/asm-xtensa/platform-iss => arch/xtensa/platforms/iss/include/platform}/hardware.h (100%) + rename {include/asm-xtensa/platform-iss => arch/xtensa/platforms/iss/include/platform}/simcall.h (100%) + create mode 100644 arch/xtensa/platforms/xt2000/Makefile + create mode 100644 arch/xtensa/platforms/xt2000/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xt2000/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xt2000/setup.c + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/core.h (100%) + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/tie-asm.h (100%) + rename {include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/tie.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/core.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/tie-asm.h (100%) + rename {include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/tie.h (100%) +Merging quilt/driver-core +$ git merge quilt/driver-core +Removed arch/s390/include/asm/s390_rdev.h +Removed drivers/s390/s390_rdev.c +Merge made by recursive. + Documentation/DocBook/uio-howto.tmpl | 101 +++++++++++++++- + Documentation/kobject.txt | 4 +- + arch/arm/kernel/ecard.c | 2 +- + arch/arm/mach-aaec2000/core.c | 2 +- + arch/arm/mach-ep93xx/core.c | 6 +- + arch/arm/mach-integrator/core.c | 10 +- + arch/arm/mach-integrator/integrator_cp.c | 6 +- + arch/arm/mach-lh7a40x/clcd.c | 2 +- + arch/arm/mach-netx/fb.c | 2 +- + arch/arm/mach-realview/core.h | 2 +- + arch/arm/mach-versatile/core.h | 2 +- + arch/arm/plat-omap/include/mach/memory.h | 2 +- + arch/cris/arch-v32/drivers/iop_fw_load.c | 6 +- + arch/ia64/kernel/pci-dma.c | 2 +- + arch/ia64/sn/kernel/tiocx.c | 3 +- + arch/mips/kernel/vpe.c | 2 +- + arch/s390/include/asm/s390_rdev.h | 15 --- + block/bsg.c | 6 +- + block/genhd.c | 2 +- + drivers/ata/libata-scsi.c | 2 +- + drivers/base/attribute_container.c | 2 +- + drivers/base/base.h | 26 ++++ + drivers/base/bus.c | 52 +++++--- + drivers/base/core.c | 197 +++++++++++++++++++++++------- + drivers/base/dd.c | 26 ++-- + drivers/base/driver.c | 13 ++- + drivers/base/firmware_class.c | 8 +- + drivers/base/isa.c | 7 +- + drivers/base/platform.c | 130 ++++++++++---------- + drivers/base/power/main.c | 21 ++-- + drivers/base/power/trace.c | 4 +- + drivers/char/mwave/mwavedd.c | 2 +- + drivers/firmware/dmi-id.c | 2 +- + drivers/gpio/gpiolib.c | 2 +- + drivers/gpu/drm/drm_sysfs.c | 2 +- + drivers/hwmon/hwmon.c | 2 +- + drivers/hwmon/lm75.c | 2 +- + drivers/idle/i7300_idle.c | 2 +- + drivers/infiniband/core/sysfs.c | 2 +- + drivers/infiniband/core/ucm.c | 3 +- + drivers/infiniband/ulp/srp/ib_srp.c | 3 +- + drivers/isdn/mISDN/dsp_pipeline.c | 2 +- + drivers/lguest/lguest_device.c | 10 +- + drivers/macintosh/macio_asic.c | 24 ++-- + drivers/memstick/core/memstick.c | 5 +- + drivers/memstick/core/mspro_block.c | 14 +- + drivers/memstick/host/tifm_ms.c | 4 +- + drivers/message/i2o/device.c | 8 +- + drivers/message/i2o/i2o_proc.c | 2 +- + drivers/message/i2o/iop.c | 2 +- + drivers/misc/enclosure.c | 8 +- + drivers/misc/sgi-gru/grumain.c | 2 +- + drivers/misc/sgi-xp/xp_main.c | 2 +- + drivers/misc/sgi-xp/xpc_main.c | 8 +- + drivers/misc/sgi-xp/xpnet.c | 2 +- + drivers/misc/tifm_7xx1.c | 2 +- + drivers/misc/tifm_core.c | 7 +- + drivers/mtd/devices/m25p80.c | 16 ++-- + drivers/mtd/devices/mtd_dataflash.c | 30 +++--- + drivers/mtd/maps/integrator-flash.c | 2 +- + drivers/mtd/maps/ixp2000.c | 4 +- + drivers/mtd/maps/ixp4xx.c | 2 +- + drivers/mtd/maps/omap_nor.c | 2 +- + drivers/mtd/maps/physmap.c | 6 +- + drivers/mtd/maps/physmap_of.c | 4 +- + drivers/mtd/mtdconcat.c | 2 +- + drivers/mtd/nand/fsl_upm.c | 2 +- + drivers/mtd/nand/plat_nand.c | 2 +- + drivers/mtd/nand/tmio_nand.c | 2 +- + drivers/mtd/onenand/generic.c | 2 +- + drivers/mtd/onenand/omap2.c | 2 +- + drivers/mtd/ubi/build.c | 2 +- + drivers/mtd/ubi/vmt.c | 4 +- + drivers/pci/pci-driver.c | 132 ++++++++++++-------- + drivers/pnp/card.c | 7 +- + drivers/pnp/core.c | 5 +- + drivers/pnp/system.c | 2 +- + drivers/power/ds2760_battery.c | 4 +- + drivers/s390/Makefile | 2 +- + drivers/s390/block/dcssblk.c | 11 +- + drivers/s390/crypto/ap_bus.c | 7 +- + drivers/s390/kvm/kvm_virtio.c | 5 +- + drivers/s390/net/cu3088.c | 7 +- + drivers/s390/net/qeth_core_main.c | 7 +- + drivers/s390/net/qeth_l2_main.c | 2 - + drivers/s390/net/qeth_l3_main.c | 2 - + drivers/s390/s390_rdev.c | 51 -------- + drivers/scsi/aic94xx/aic94xx_tmf.c | 2 +- + drivers/scsi/hosts.c | 6 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/ipr.h | 2 +- + drivers/scsi/libsas/sas_discover.c | 2 +- + drivers/scsi/libsas/sas_dump.c | 2 +- + drivers/scsi/libsas/sas_port.c | 2 +- + drivers/scsi/raid_class.c | 3 +- + drivers/scsi/scsi_debug.c | 4 +- + drivers/scsi/scsi_ioctl.c | 3 +- + drivers/scsi/scsi_scan.c | 7 +- + drivers/scsi/scsi_sysfs.c | 12 +- + drivers/scsi/scsi_transport_fc.c | 18 ++-- + drivers/scsi/scsi_transport_iscsi.c | 11 +- + drivers/scsi/scsi_transport_sas.c | 42 ++++--- + drivers/scsi/scsi_transport_srp.c | 2 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/ses.c | 2 +- + drivers/serial/serial_core.c | 4 +- + drivers/spi/spi.c | 20 ++-- + drivers/spi/spi_bitbang.c | 2 +- + drivers/spi/spi_butterfly.c | 2 +- + drivers/spi/spi_lm70llp.c | 2 +- + drivers/thermal/thermal_sys.c | 6 +- + drivers/uio/uio.c | 159 +++++++++++++++++++++--- + drivers/uio/uio_cif.c | 3 +- + drivers/uio/uio_pdrv_genirq.c | 5 +- + drivers/usb/core/usb.c | 4 +- + drivers/usb/gadget/at91_udc.c | 2 +- + drivers/usb/gadget/atmel_usba_udc.c | 2 +- + drivers/usb/gadget/fsl_qe_udc.c | 2 +- + drivers/usb/gadget/lh7a40x_udc.c | 2 +- + drivers/usb/gadget/pxa25x_udc.c | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 2 +- + drivers/usb/gadget/s3c2410_udc.c | 2 +- + drivers/video/backlight/backlight.c | 2 +- + drivers/video/backlight/lcd.c | 2 +- + drivers/video/output.c | 2 +- + drivers/virtio/virtio_pci.c | 17 +-- + drivers/w1/w1.c | 19 ++-- + drivers/w1/w1_int.c | 3 +- + drivers/xen/xenbus/xenbus_probe.c | 27 +++-- + drivers/xen/xenbus/xenbus_probe.h | 4 +- + fs/partitions/check.c | 11 +-- + include/linux/device.h | 39 ++++-- + include/linux/init.h | 1 + + include/linux/kernel.h | 8 +- + include/linux/klist.h | 2 - + include/linux/mtd/concat.h | 2 +- + include/linux/pci.h | 1 - + include/linux/platform_device.h | 1 - + include/linux/pm.h | 88 +++++--------- + include/linux/uio_driver.h | 30 ++++- + init/Kconfig | 44 ++++--- + init/main.c | 9 ++ + kernel/ksysfs.c | 4 +- + kernel/power/main.c | 6 +- + lib/dynamic_printk.c | 58 ++++----- + lib/klist.c | 43 ++++++- + lib/kobject.c | 50 ++++++++ + lib/kobject_uevent.c | 8 +- + lib/swiotlb.c | 2 +- + net/iucv/iucv.c | 7 +- + 150 files changed, 1184 insertions(+), 768 deletions(-) + delete mode 100644 arch/s390/include/asm/s390_rdev.h + delete mode 100644 drivers/s390/s390_rdev.c +Merging quilt/usb +$ git merge quilt/usb +Removed drivers/usb/storage/dpcm.c +Removed drivers/usb/storage/dpcm.h +Merge made by recursive. + CREDITS | 17 + + Documentation/DocBook/networking.tmpl | 8 + + Documentation/kernel-parameters.txt | 36 + + Documentation/usb/power-management.txt | 22 +- + Documentation/wimax/README.i2400m | 260 ++ + Documentation/wimax/README.wimax | 81 + + MAINTAINERS | 17 + + arch/arm/plat-mxc/include/mach/usb.h | 23 + + arch/arm/plat-omap/usb.c | 32 - + arch/powerpc/boot/dts/sequoia.dts | 2 +- + drivers/Makefile | 1 + + drivers/block/ub.c | 11 +- + drivers/hid/usbhid/hid-core.c | 9 +- + drivers/i2c/chips/Kconfig | 12 - + drivers/i2c/chips/Makefile | 1 - + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +- + drivers/net/Kconfig | 2 + + drivers/net/Makefile | 1 + + drivers/net/usb/kaweth.c | 6 +- + drivers/net/usb/pegasus.c | 12 +- + drivers/net/wimax/Kconfig | 17 + + drivers/net/wimax/Makefile | 5 + + drivers/net/wimax/i2400m/Kconfig | 49 + + drivers/net/wimax/i2400m/Makefile | 29 + + drivers/net/wimax/i2400m/control.c | 1291 ++++++++ + drivers/net/wimax/i2400m/debug-levels.h | 45 + + drivers/net/wimax/i2400m/debugfs.c | 392 +++ + drivers/net/wimax/i2400m/driver.c | 728 +++++ + drivers/net/wimax/i2400m/fw.c | 1095 +++++++ + drivers/net/wimax/i2400m/i2400m-sdio.h | 132 + + drivers/net/wimax/i2400m/i2400m-usb.h | 264 ++ + drivers/net/wimax/i2400m/i2400m.h | 755 +++++ + drivers/net/wimax/i2400m/netdev.c | 524 ++++ + drivers/net/wimax/i2400m/op-rfkill.c | 207 ++ + drivers/net/wimax/i2400m/rx.c | 534 ++++ + drivers/net/wimax/i2400m/sdio-debug-levels.h | 22 + + drivers/net/wimax/i2400m/sdio-fw.c | 224 ++ + drivers/net/wimax/i2400m/sdio-rx.c | 255 ++ + drivers/net/wimax/i2400m/sdio-tx.c | 153 + + drivers/net/wimax/i2400m/sdio.c | 511 ++++ + drivers/net/wimax/i2400m/tx.c | 817 +++++ + drivers/net/wimax/i2400m/usb-debug-levels.h | 42 + + drivers/net/wimax/i2400m/usb-fw.c | 340 +++ + drivers/net/wimax/i2400m/usb-notif.c | 269 ++ + drivers/net/wimax/i2400m/usb-rx.c | 417 +++ + drivers/net/wimax/i2400m/usb-tx.c | 229 ++ + drivers/net/wimax/i2400m/usb.c | 591 ++++ + drivers/usb/Kconfig | 2 + + drivers/usb/class/cdc-acm.c | 2 +- + drivers/usb/class/cdc-wdm.c | 3 +- + drivers/usb/class/usbtmc.c | 9 +- + drivers/usb/core/devio.c | 7 +- + drivers/usb/core/driver.c | 181 +- + drivers/usb/core/endpoint.c | 4 +- + drivers/usb/core/generic.c | 10 +- + drivers/usb/core/hcd-pci.c | 201 +- + drivers/usb/core/hcd.c | 20 +- + drivers/usb/core/hcd.h | 16 +- + drivers/usb/core/hub.c | 142 +- + drivers/usb/core/message.c | 164 +- + drivers/usb/core/sysfs.c | 49 +- + drivers/usb/core/urb.c | 43 +- + drivers/usb/core/usb.c | 79 +- + drivers/usb/core/usb.h | 24 +- + drivers/usb/gadget/Kconfig | 43 +- + drivers/usb/gadget/Makefile | 2 + + drivers/usb/gadget/ci13xxx_udc.c | 2830 ++++++++++++++++++ + drivers/usb/gadget/ci13xxx_udc.h | 195 ++ + drivers/usb/gadget/epautoconf.c | 2 +- + drivers/usb/gadget/file_storage.c | 177 +- + drivers/usb/gadget/fsl_qe_udc.c | 12 +- + drivers/usb/gadget/gadget_chips.h | 8 +- + drivers/usb/gadget/goku_udc.c | 2 +- + drivers/usb/gadget/imx_udc.c | 1516 ++++++++++ + drivers/usb/gadget/imx_udc.h | 344 +++ + drivers/usb/gadget/m66592-udc.c | 9 +- + drivers/usb/gadget/net2280.c | 2 +- + drivers/usb/gadget/omap_udc.c | 4 +- + drivers/usb/gadget/pxa25x_udc.c | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 2 - + drivers/usb/gadget/s3c2410_udc.c | 34 +- + drivers/usb/host/Kconfig | 13 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-dbg.c | 8 +- + drivers/usb/host/ehci-hub.c | 27 +- + drivers/usb/host/ehci-pci.c | 12 +- + drivers/usb/host/ehci-ppc-of.c | 45 +- + drivers/usb/host/ehci.h | 34 + + drivers/usb/host/isp1760-hcd.c | 13 +- + drivers/usb/host/isp1760-hcd.h | 1 - + drivers/usb/host/isp1760-if.c | 116 +- + drivers/usb/host/ohci-hcd.c | 12 +- + drivers/usb/host/ohci-pci.c | 6 +- + drivers/usb/host/ohci-pnx4008.c | 85 +- + drivers/usb/host/ohci-ppc-of.c | 25 + + drivers/usb/host/ohci-tmio.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 3985 +++++++++++++++++++++++++ + drivers/usb/host/oxu210hp.h | 447 +++ + drivers/usb/host/pci-quirks.c | 14 +- + drivers/usb/host/r8a66597-hcd.c | 8 +- + drivers/usb/host/uhci-hcd.c | 2 + + drivers/usb/image/microtek.c | 11 +- + drivers/usb/misc/berry_charge.c | 5 + + drivers/usb/misc/emi26.c | 2 +- + drivers/usb/misc/usbtest.c | 2 - + drivers/usb/mon/Kconfig | 13 +- + drivers/usb/mon/Makefile | 3 +- + drivers/usb/musb/Kconfig | 12 +- + drivers/usb/musb/Makefile | 8 + + drivers/usb/musb/blackfin.c | 320 ++ + drivers/usb/musb/blackfin.h | 52 + + drivers/usb/musb/davinci.c | 18 +- + drivers/usb/musb/musb_core.c | 84 +- + drivers/usb/musb/musb_core.h | 73 +- + drivers/usb/musb/musb_gadget.c | 2 +- + drivers/usb/musb/musb_host.c | 45 +- + drivers/usb/musb/musb_io.h | 26 +- + drivers/usb/musb/musb_regs.h | 397 ++- + drivers/usb/musb/musbhsdma.c | 84 +- + drivers/usb/musb/musbhsdma.h | 149 + + drivers/usb/musb/omap2430.c | 15 +- + drivers/usb/musb/tusb6010.c | 7 +- + drivers/usb/otg/Kconfig | 54 + + drivers/usb/otg/Makefile | 15 + + drivers/usb/otg/gpio_vbus.c | 335 +++ + drivers/{i2c/chips => usb/otg}/isp1301_omap.c | 0 + drivers/usb/otg/otg.c | 65 + + drivers/usb/otg/twl4030-usb.c | 721 +++++ + drivers/usb/serial/Kconfig | 17 + + drivers/usb/serial/Makefile | 2 + + drivers/usb/serial/digi_acceleport.c | 28 +- + drivers/usb/serial/garmin_gps.c | 2 +- + drivers/usb/serial/ipw.c | 4 +- + drivers/usb/serial/iuu_phoenix.c | 38 +- + drivers/usb/serial/mos7840.c | 38 +- + drivers/usb/serial/opticon.c | 358 +++ + drivers/usb/serial/option.c | 11 +- + drivers/usb/serial/siemens_mpi.c | 77 + + drivers/usb/serial/spcp8x5.c | 20 +- + drivers/usb/serial/usb_debug.c | 2 +- + drivers/usb/storage/Kconfig | 11 +- + drivers/usb/storage/Makefile | 3 +- + drivers/usb/storage/dpcm.c | 86 - + drivers/usb/storage/dpcm.h | 32 - + drivers/usb/storage/libusual.c | 7 + + drivers/usb/storage/option_ms.c | 147 + + drivers/usb/storage/option_ms.h | 4 + + drivers/usb/storage/protocol.c | 24 +- + drivers/usb/storage/protocol.h | 3 +- + drivers/usb/storage/scsiglue.c | 43 + + drivers/usb/storage/sddr09.c | 43 + + drivers/usb/storage/sddr09.h | 5 +- + drivers/usb/storage/transport.c | 219 +- + drivers/usb/storage/transport.h | 2 - + drivers/usb/storage/unusual_devs.h | 338 +-- + drivers/usb/storage/usb.c | 106 +- + drivers/usb/storage/usb.h | 5 +- + drivers/usb/wusbcore/rh.c | 2 +- + fs/debugfs/file.c | 32 + + include/linux/Kbuild | 2 + + include/linux/debugfs.h | 2 + + include/linux/oxu210hp.h | 7 + + include/linux/usb.h | 30 +- + include/linux/usb/association.h | 22 +- + include/linux/usb/gpio_vbus.h | 30 + + include/linux/usb/musb.h | 5 + + include/linux/usb/otg.h | 1 + + include/linux/usb_usual.h | 7 +- + include/linux/wimax.h | 234 ++ + include/linux/wimax/Kbuild | 1 + + include/linux/wimax/debug.h | 453 +++ + include/linux/wimax/i2400m.h | 512 ++++ + include/net/wimax.h | 520 ++++ + net/Kconfig | 2 + + net/Makefile | 1 + + net/netlink/genetlink.c | 1 + + net/wimax/Kconfig | 38 + + net/wimax/Makefile | 13 + + net/wimax/debug-levels.h | 42 + + net/wimax/debugfs.c | 90 + + net/wimax/id-table.c | 142 + + net/wimax/op-msg.c | 421 +++ + net/wimax/op-reset.c | 143 + + net/wimax/op-rfkill.c | 532 ++++ + net/wimax/stack.c | 599 ++++ + net/wimax/wimax-internal.h | 91 + + 186 files changed, 28260 insertions(+), 1396 deletions(-) + create mode 100644 Documentation/wimax/README.i2400m + create mode 100644 Documentation/wimax/README.wimax + create mode 100644 arch/arm/plat-mxc/include/mach/usb.h + create mode 100644 drivers/net/wimax/Kconfig + create mode 100644 drivers/net/wimax/Makefile + create mode 100644 drivers/net/wimax/i2400m/Kconfig + create mode 100644 drivers/net/wimax/i2400m/Makefile + create mode 100644 drivers/net/wimax/i2400m/control.c + create mode 100644 drivers/net/wimax/i2400m/debug-levels.h + create mode 100644 drivers/net/wimax/i2400m/debugfs.c + create mode 100644 drivers/net/wimax/i2400m/driver.c + create mode 100644 drivers/net/wimax/i2400m/fw.c + create mode 100644 drivers/net/wimax/i2400m/i2400m-sdio.h + create mode 100644 drivers/net/wimax/i2400m/i2400m-usb.h + create mode 100644 drivers/net/wimax/i2400m/i2400m.h + create mode 100644 drivers/net/wimax/i2400m/netdev.c + create mode 100644 drivers/net/wimax/i2400m/op-rfkill.c + create mode 100644 drivers/net/wimax/i2400m/rx.c + create mode 100644 drivers/net/wimax/i2400m/sdio-debug-levels.h + create mode 100644 drivers/net/wimax/i2400m/sdio-fw.c + create mode 100644 drivers/net/wimax/i2400m/sdio-rx.c + create mode 100644 drivers/net/wimax/i2400m/sdio-tx.c + create mode 100644 drivers/net/wimax/i2400m/sdio.c + create mode 100644 drivers/net/wimax/i2400m/tx.c + create mode 100644 drivers/net/wimax/i2400m/usb-debug-levels.h + create mode 100644 drivers/net/wimax/i2400m/usb-fw.c + create mode 100644 drivers/net/wimax/i2400m/usb-notif.c + create mode 100644 drivers/net/wimax/i2400m/usb-rx.c + create mode 100644 drivers/net/wimax/i2400m/usb-tx.c + create mode 100644 drivers/net/wimax/i2400m/usb.c + create mode 100644 drivers/usb/gadget/ci13xxx_udc.c + create mode 100644 drivers/usb/gadget/ci13xxx_udc.h + create mode 100644 drivers/usb/gadget/imx_udc.c + create mode 100644 drivers/usb/gadget/imx_udc.h + create mode 100644 drivers/usb/host/oxu210hp-hcd.c + create mode 100644 drivers/usb/host/oxu210hp.h + create mode 100644 drivers/usb/musb/blackfin.c + create mode 100644 drivers/usb/musb/blackfin.h + create mode 100644 drivers/usb/musb/musbhsdma.h + create mode 100644 drivers/usb/otg/Kconfig + create mode 100644 drivers/usb/otg/Makefile + create mode 100644 drivers/usb/otg/gpio_vbus.c + rename drivers/{i2c/chips => usb/otg}/isp1301_omap.c (100%) + create mode 100644 drivers/usb/otg/otg.c + create mode 100644 drivers/usb/otg/twl4030-usb.c + create mode 100644 drivers/usb/serial/opticon.c + create mode 100644 drivers/usb/serial/siemens_mpi.c + delete mode 100644 drivers/usb/storage/dpcm.c + delete mode 100644 drivers/usb/storage/dpcm.h + create mode 100644 drivers/usb/storage/option_ms.c + create mode 100644 drivers/usb/storage/option_ms.h + create mode 100644 include/linux/oxu210hp.h + create mode 100644 include/linux/usb/gpio_vbus.h + create mode 100644 include/linux/wimax.h + create mode 100644 include/linux/wimax/Kbuild + create mode 100644 include/linux/wimax/debug.h + create mode 100644 include/linux/wimax/i2400m.h + create mode 100644 include/net/wimax.h + create mode 100644 net/wimax/Kconfig + create mode 100644 net/wimax/Makefile + create mode 100644 net/wimax/debug-levels.h + create mode 100644 net/wimax/debugfs.c + create mode 100644 net/wimax/id-table.c + create mode 100644 net/wimax/op-msg.c + create mode 100644 net/wimax/op-reset.c + create mode 100644 net/wimax/op-rfkill.c + create mode 100644 net/wimax/stack.c + create mode 100644 net/wimax/wimax-internal.h +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Auto-merged lib/swiotlb.c +Merge made by recursive. + arch/ia64/include/asm/swiotlb.h | 39 +------ + arch/x86/include/asm/swiotlb.h | 38 +------ + arch/x86/kernel/pci-swiotlb_64.c | 2 +- + include/linux/percpu_counter.h | 14 ++- + include/linux/rcupdate.h | 12 -- + include/linux/swiotlb.h | 3 +- + kernel/futex.c | 72 +++++++----- + kernel/rcupdate.c | 11 ++- + kernel/rcupreempt.c | 11 ++- + kernel/rcutorture.c | 18 ++-- + kernel/rcutree.c | 13 +-- + lib/percpu_counter.c | 18 +--- + lib/proportions.c | 6 +- + lib/swiotlb.c | 237 ++++++++++++++++---------------------- + mm/backing-dev.c | 2 +- + 15 files changed, 195 insertions(+), 301 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Auto-merged arch/x86/kernel/apic.c +Auto-merged arch/x86/kernel/cpu/common.c +Auto-merged arch/x86/kernel/cpuid.c +Auto-merged arch/x86/kernel/io_apic.c +Auto-merged arch/x86/kernel/reboot.c +Auto-merged arch/x86/kernel/setup_percpu.c +Auto-merged arch/x86/kernel/smpboot.c +Auto-merged kernel/rcuclassic.c +CONFLICT (content): Merge conflict in kernel/rcuclassic.c +Auto-merged kernel/sched.c +Auto-merged kernel/time/tick-sched.c +Resolved 'kernel/rcuclassic.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit a7047b3: Merge commit 'cpus4096/auto-cpus4096-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/smp.h | 32 +++++++- + arch/x86/kernel/cpu/common.c | 26 +++++- + arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 23 ++++-- + arch/x86/kernel/microcode_core.c | 83 ++++++++++---------- + arch/x86/kernel/setup_percpu.c | 25 ++++++- + arch/x86/kernel/smp.c | 17 +++- + arch/x86/kernel/smpboot.c | 128 ++++++++++++++++--------------- + 7 files changed, 210 insertions(+), 124 deletions(-) +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged init/main.c +Merge made by recursive. + Documentation/ABI/testing/debugfs-kmemtrace | 71 +++ + Documentation/kernel-parameters.txt | 10 + + Documentation/sysrq.txt | 2 + + Documentation/vm/kmemtrace.txt | 126 ++++ + MAINTAINERS | 6 + + arch/x86/kvm/Kconfig | 3 +- + drivers/char/sysrq.c | 2 +- + include/linux/slab_def.h | 68 ++- + include/linux/slob_def.h | 9 +- + include/linux/slub_def.h | 53 ++- + include/trace/kmemtrace.h | 75 +++ + init/main.c | 2 + + kernel/relay.c | 4 +- + kernel/trace/Kconfig | 21 + + kernel/trace/Makefile | 3 + + kernel/trace/kmemtrace.c | 345 +++++++++++ + kernel/trace/trace.c | 741 ++---------------------- + kernel/trace/trace.h | 61 ++- + kernel/trace/trace_boot.c | 1 + + kernel/trace/trace_branch.c | 295 ++++++---- + kernel/trace/trace_functions_graph.c | 8 +- + kernel/trace/trace_hw_branches.c | 1 + + kernel/trace/trace_mmiotrace.c | 4 +- + kernel/trace/trace_output.c | 832 +++++++++++++++++++++++++++ + kernel/trace/trace_output.h | 59 ++ + kernel/trace/trace_power.c | 1 + + kernel/trace/trace_selftest.c | 1 - + kernel/trace/trace_stat.c | 251 ++++++++ + mm/slab.c | 71 ++- + mm/slob.c | 37 +- + mm/slub.c | 83 +++- + 31 files changed, 2369 insertions(+), 877 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace + create mode 100644 Documentation/vm/kmemtrace.txt + create mode 100644 include/trace/kmemtrace.h + create mode 100644 kernel/trace/kmemtrace.c + create mode 100644 kernel/trace/trace_output.c + create mode 100644 kernel/trace/trace_output.h + create mode 100644 kernel/trace/trace_stat.c +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Auto-merged kernel/irq/chip.c +Merge made by recursive. + kernel/irq/chip.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merged arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 16 ++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Merge made by recursive. + include/linux/sched.h | 7 +++---- + include/linux/time.h | 1 + + kernel/sched.c | 11 ++++------- + kernel/sched_clock.c | 5 ++++- + kernel/sched_fair.c | 30 ++++++++++++------------------ + kernel/sys.c | 2 ++ + kernel/time/timekeeping.c | 7 +++++-- + 7 files changed, 31 insertions(+), 32 deletions(-) +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Auto-merged arch/x86/Kconfig +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/sched.c +Merge made by recursive. + arch/x86/Kconfig | 23 ++++++++++------------- + arch/x86/Kconfig.debug | 1 + + arch/x86/Makefile | 2 +- + arch/x86/include/asm/pda.h | 4 ++-- + arch/x86/include/asm/system.h | 6 +++++- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/process_64.c | 13 ++++++++++++- + arch/x86/mm/fault.c | 7 +++++++ + include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ + include/linux/magic.h | 1 + + include/linux/sched.h | 16 ++++++++++++++-- + include/linux/stackprotector.h | 16 ++++++++++++++++ + init/main.c | 7 +++++++ + kernel/exit.c | 5 +---- + kernel/fork.c | 5 +++++ + kernel/panic.c | 12 +++++++++++- + kernel/sched.c | 7 +------ + 17 files changed, 133 insertions(+), 31 deletions(-) + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/stackprotector.h +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Auto-merged include/linux/clockchips.h +Auto-merged kernel/hrtimer.c +Auto-merged kernel/time/tick-common.c +CONFLICT (content): Merge conflict in kernel/time/tick-common.c +Resolved 'kernel/time/tick-common.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 16f48ebe: Merge commit 'timers/auto-timers-next' +$ git diff -M --stat --summary HEAD^.. + include/linux/clockchips.h | 1 + + kernel/hrtimer.c | 34 +++++++++++++++++++++++++++++++++- + kernel/time/tick-common.c | 26 +++++++++++++++++++------- + 3 files changed, 53 insertions(+), 8 deletions(-) +$ git cherry-pick 3e80680208ba6ce9635ca7c21ad0019442ea166a +Finished one cherry-pick. +Created commit b874472: kmemtrace: add kmemtrace_init() + 1 files changed, 5 insertions(+), 0 deletions(-) +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged drivers/parisc/dino.c +Auto-merged drivers/pci/pci-driver.c +Auto-merged include/linux/pci.h +Merge made by recursive. + Documentation/PCI/pci.txt | 3 +- + Documentation/kernel-parameters.txt | 4 + + arch/alpha/kernel/pci.c | 18 -- + arch/alpha/kernel/pci_impl.h | 13 +- + arch/alpha/kernel/sys_dp264.c | 2 +- + arch/alpha/kernel/sys_eiger.c | 2 +- + arch/alpha/kernel/sys_miata.c | 2 +- + arch/alpha/kernel/sys_noritake.c | 2 +- + arch/alpha/kernel/sys_ruffian.c | 2 +- + arch/alpha/kernel/sys_sable.c | 2 +- + arch/arm/include/asm/mach/pci.h | 2 +- + arch/arm/kernel/bios32.c | 27 -- + arch/arm/mach-integrator/pci.c | 11 +- + arch/mips/pci/pci-ip27.c | 6 - + arch/mips/pci/pci.c | 24 +-- + arch/powerpc/kernel/prom_parse.c | 7 +- + arch/sh/drivers/pci/ops-cayman.c | 9 +- + arch/sh/drivers/pci/pci.c | 22 +-- + arch/x86/kernel/pci-dma.c | 2 +- + arch/x86/mm/init_32.c | 2 + + arch/x86/mm/init_64.c | 2 + + arch/x86/pci/acpi.c | 7 +- + arch/x86/pci/common.c | 12 +- + arch/x86/pci/i386.c | 4 +- + arch/x86/pci/init.c | 3 +- + arch/x86/pci/irq.c | 54 ++-- + arch/x86/pci/visws.c | 20 +-- + drivers/acpi/pci_root.c | 20 ++ + drivers/net/e1000e/netdev.c | 2 +- + drivers/net/sfc/falcon.c | 4 +- + drivers/parisc/dino.c | 4 +- + drivers/parisc/iosapic.c | 3 +- + drivers/pci/Kconfig | 9 + + drivers/pci/Makefile | 2 + + drivers/pci/access.c | 226 ++++++++++----- + drivers/pci/bus.c | 87 ++++--- + drivers/pci/hotplug/Makefile | 3 + + drivers/pci/hotplug/acpi_pcihp.c | 69 +++++ + drivers/pci/hotplug/acpiphp.h | 2 +- + drivers/pci/hotplug/acpiphp_glue.c | 117 ++------- + drivers/pci/hotplug/acpiphp_ibm.c | 2 +- + drivers/pci/hotplug/cpqphp_ctrl.c | 6 +- + drivers/pci/hotplug/cpqphp_pci.c | 2 +- + drivers/pci/hotplug/fakephp.c | 1 + + drivers/pci/hotplug/pciehp.h | 15 +- + drivers/pci/hotplug/pciehp_acpi.c | 141 ++++++++++ + drivers/pci/hotplug/pciehp_core.c | 1 + + drivers/pci/hotplug/pciehp_ctrl.c | 26 +- + drivers/pci/hotplug/pciehp_hpc.c | 329 +++++++---------------- + drivers/pci/irq.c | 2 +- + drivers/pci/msi.c | 31 +-- + drivers/pci/pci-acpi.c | 82 +++--- + drivers/pci/pci-driver.c | 74 +++-- + drivers/pci/pci-stub.c | 47 ++++ + drivers/pci/pci-sysfs.c | 95 +++---- + drivers/pci/pci.c | 469 +++++++++++++++++++++++++------- + drivers/pci/pci.h | 32 ++- + drivers/pci/pcie/aer/aerdrv_acpi.c | 1 - + drivers/pci/pcie/aer/aerdrv_errprint.c | 2 +- + drivers/pci/pcie/aspm.c | 165 +++++++++--- + drivers/pci/pcie/portdrv_bus.c | 32 +-- + drivers/pci/pcie/portdrv_core.c | 240 ++++++++++------- + drivers/pci/pcie/portdrv_pci.c | 21 +- + drivers/pci/probe.c | 40 ++-- + drivers/pci/proc.c | 18 +- + drivers/pci/quirks.c | 112 +++++++-- + drivers/pci/setup-bus.c | 5 +- + drivers/pci/setup-res.c | 24 +- + include/linux/ioport.h | 11 +- + include/linux/pci-acpi.h | 23 +- + include/linux/pci.h | 90 +++++-- + include/linux/pci_hotplug.h | 2 + + include/linux/pci_regs.h | 76 +++++- + kernel/resource.c | 61 ++++- + 74 files changed, 1903 insertions(+), 1187 deletions(-) + create mode 100644 drivers/pci/hotplug/pciehp_acpi.c + create mode 100644 drivers/pci/pci-stub.c +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-ioctl.c | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + drivers/hid/Kconfig | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merged drivers/i2c/busses/i2c-pxa.c +Auto-merged drivers/i2c/busses/i2c-s3c2410.c +Auto-merged drivers/i2c/busses/i2c-sh_mobile.c +Auto-merged drivers/media/video/cafe_ccic.c +Auto-merged drivers/media/video/ov7670.c +Auto-merged drivers/media/video/w9968cf.c +Merge made by recursive. + drivers/i2c/busses/i2c-ali1563.c | 4 +- + drivers/i2c/busses/i2c-amd756-s4882.c | 4 +- + drivers/i2c/busses/i2c-amd756.c | 5 +- + drivers/i2c/busses/i2c-at91.c | 2 +- + drivers/i2c/busses/i2c-bfin-twi.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 50 ++++++++++++++- + drivers/i2c/busses/i2c-pxa.c | 4 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/i2c/busses/i2c-sh7760.c | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 2 +- + drivers/i2c/busses/i2c-sis5595.c | 4 +- + drivers/i2c/busses/i2c-sis630.c | 4 +- + drivers/i2c/i2c-core.c | 8 +- + drivers/input/misc/apanel.c | 81 ++++++++---------------- + drivers/media/video/cafe_ccic.c | 1 - + drivers/media/video/ov7670.c | 1 - + drivers/media/video/ovcamchip/ovcamchip_core.c | 1 - + drivers/media/video/w9968cf.c | 1 - + include/linux/i2c.h | 4 - + 19 files changed, 98 insertions(+), 84 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merged Documentation/feature-removal-schedule.txt +Auto-merged drivers/spi/spi_lm70llp.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 8 + + Documentation/hwmon/f71882fg | 89 ++ + Documentation/hwmon/it87 | 20 +- + Documentation/hwmon/lm70 | 12 +- + Documentation/hwmon/lm85 | 2 +- + Documentation/hwmon/ltc4245 | 81 ++ + Documentation/spi/spi-lm70llp | 10 + + drivers/hwmon/Kconfig | 47 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/asb100.c | 5 +- + drivers/hwmon/dme1737.c | 5 + + drivers/hwmon/f71805f.c | 5 + + drivers/hwmon/f71882fg.c | 1547 +++++++++++++++++++++++----- + drivers/hwmon/fschmd.c | 448 ++++++++- + drivers/hwmon/i5k_amb.c | 7 + + drivers/hwmon/it87.c | 37 +- + drivers/hwmon/k8temp.c | 15 + + drivers/hwmon/lm70.c | 91 ++- + drivers/hwmon/ltc4245.c | 567 ++++++++++ + drivers/hwmon/pc87360.c | 6 + + drivers/hwmon/pc87427.c | 5 + + drivers/hwmon/sis5595.c | 5 + + drivers/hwmon/smsc47b397.c | 5 + + drivers/hwmon/smsc47m1.c | 5 + + drivers/hwmon/via686a.c | 5 + + drivers/hwmon/vt1211.c | 5 + + drivers/hwmon/vt8231.c | 5 + + drivers/hwmon/w83627ehf.c | 8 +- + drivers/hwmon/w83627hf.c | 5 + + drivers/hwmon/w83781d.c | 5 +- + drivers/hwmon/w83791d.c | 5 +- + drivers/hwmon/w83792d.c | 5 +- + drivers/hwmon/w83793.c | 5 +- + drivers/spi/spi_lm70llp.c | 33 +- + 34 files changed, 2743 insertions(+), 361 deletions(-) + create mode 100644 Documentation/hwmon/f71882fg + create mode 100644 Documentation/hwmon/ltc4245 + create mode 100644 drivers/hwmon/ltc4245.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Merge made by recursive. + drivers/media/video/videobuf-dma-sg.c | 3 +-- + drivers/staging/go7007/go7007-v4l2.c | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Merge made by recursive. + Documentation/ide/warm-plug-howto.txt | 5 + + drivers/ide/Kconfig | 7 + + drivers/ide/Makefile | 1 + + drivers/ide/aec62xx.c | 4 +- + drivers/ide/alim15x3.c | 10 +- + drivers/ide/amd74xx.c | 4 +- + drivers/ide/au1xxx-ide.c | 11 +- + drivers/ide/cmd640.c | 5 +- + drivers/ide/cmd64x.c | 23 +- + drivers/ide/cs5520.c | 2 +- + drivers/ide/cy82c693.c | 2 +- + drivers/ide/falconide.c | 1 - + drivers/ide/hpt366.c | 23 +- + drivers/ide/icside.c | 12 +- + drivers/ide/ide-acpi.c | 22 +- + drivers/ide/ide-atapi.c | 13 +- + drivers/ide/ide-cd.c | 118 +-------- + drivers/ide/ide-cd.h | 34 ++-- + drivers/ide/ide-disk.c | 4 +- + drivers/ide/ide-dma-sff.c | 63 +++-- + drivers/ide/ide-dma.c | 2 +- + drivers/ide/ide-floppy.c | 2 +- + drivers/ide/ide-gd.c | 3 +- + drivers/ide/ide-gd.h | 10 +- + drivers/ide/ide-h8300.c | 1 - + drivers/ide/ide-io.c | 409 ++++++++++++++--------------- + drivers/ide/ide-iops.c | 100 +++---- + drivers/ide/ide-lib.c | 9 +- + drivers/ide/ide-park.c | 16 +- + drivers/ide/ide-pm.c | 8 +- + drivers/ide/ide-probe.c | 474 +++++++++++++++++---------------- + drivers/ide/ide-proc.c | 23 +- + drivers/ide/ide-tape.c | 20 +- + drivers/ide/ide-taskfile.c | 14 +- + drivers/ide/ide.c | 187 +------------- + drivers/ide/it8172.c | 166 ++++++++++++ + drivers/ide/it8213.c | 4 +- + drivers/ide/it821x.c | 13 +- + drivers/ide/ns87415.c | 14 +- + drivers/ide/palm_bk3710.c | 3 +- + drivers/ide/pdc202xx_new.c | 4 +- + drivers/ide/pdc202xx_old.c | 14 +- + drivers/ide/piix.c | 8 +- + drivers/ide/pmac.c | 7 +- + drivers/ide/q40ide.c | 1 - + drivers/ide/qd65xx.c | 7 +- + drivers/ide/qd65xx.h | 4 +- + drivers/ide/sc1200.c | 9 +- + drivers/ide/scc_pata.c | 33 ++-- + drivers/ide/serverworks.c | 2 +- + drivers/ide/setup-pci.c | 12 +- + drivers/ide/sgiioc4.c | 15 +- + drivers/ide/siimage.c | 11 +- + drivers/ide/sis5513.c | 2 +- + drivers/ide/sl82c105.c | 5 +- + drivers/ide/slc90e66.c | 4 +- + drivers/ide/tc86c001.c | 17 +- + drivers/ide/triflex.c | 2 +- + drivers/ide/trm290.c | 10 +- + drivers/ide/tx4939ide.c | 23 +- + drivers/ide/umc8672.c | 13 +- + drivers/ide/via82cxxx.c | 2 +- + include/linux/ide.h | 171 +++++-------- + include/linux/pci_ids.h | 1 + + 64 files changed, 1036 insertions(+), 1183 deletions(-) + create mode 100644 drivers/ide/it8172.c +Merging libata/NEXT +$ git merge libata/NEXT +Auto-merged drivers/ata/libata-core.c +Auto-merged drivers/ata/libata-scsi.c +Auto-merged drivers/ata/sata_sil.c +Merge made by recursive. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/amso1100/c2.c | 20 ++++++++++++-------- + drivers/infiniband/hw/amso1100/c2_provider.c | 15 ++++++++------- + drivers/infiniband/hw/nes/nes_nic.c | 22 +++++++++++++--------- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 20 ++++++++++++-------- + 4 files changed, 45 insertions(+), 32 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merged Documentation/feature-removal-schedule.txt +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/kernel/acpi/boot.c +Auto-merged arch/x86/kernel/e820.c +Auto-merged arch/x86/kernel/reboot.c +Auto-merged drivers/Makefile +Auto-merged drivers/power/power_supply_sysfs.c +Auto-merged include/linux/power_supply.h +Auto-merged kernel/power/disk.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 8 + + Documentation/kernel-parameters.txt | 5 +- + arch/x86/kernel/acpi/boot.c | 11 + + arch/x86/kernel/acpi/sleep.c | 2 + + arch/x86/kernel/e820.c | 21 ++ + arch/x86/kernel/reboot.c | 2 +- + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/acpi/Kconfig | 84 ----- + drivers/acpi/Makefile | 3 - + drivers/acpi/battery.c | 14 +- + drivers/acpi/dispatcher/dsmethod.c | 3 + + drivers/acpi/dispatcher/dsopcode.c | 53 +++- + drivers/acpi/ec.c | 43 ++-- + drivers/acpi/events/evevent.c | 14 +- + drivers/acpi/events/evgpe.c | 36 +- + drivers/acpi/events/evgpeblk.c | 38 ++- + drivers/acpi/events/evmisc.c | 51 ++-- + drivers/acpi/events/evregion.c | 133 ++++---- + drivers/acpi/events/evrgnini.c | 41 +-- + drivers/acpi/events/evsci.c | 10 +- + drivers/acpi/events/evxface.c | 2 +- + drivers/acpi/events/evxfevnt.c | 12 +- + drivers/acpi/executer/exfldio.c | 11 +- + drivers/acpi/hardware/hwsleep.c | 77 ++--- + drivers/acpi/namespace/nsaccess.c | 11 +- + drivers/acpi/namespace/nseval.c | 70 +--- + drivers/acpi/namespace/nspredef.c | 256 ++++++++++++--- + drivers/acpi/namespace/nsutils.c | 8 +- + drivers/acpi/parser/psparse.c | 12 + + drivers/acpi/parser/psxface.c | 33 ++ + drivers/acpi/pci_link.c | 39 +-- + drivers/acpi/sbs.c | 31 +- + drivers/acpi/sleep/main.c | 67 ++++- + drivers/acpi/sleep/proc.c | 53 ++-- + drivers/acpi/tables/tbfadt.c | 38 ++- + drivers/acpi/tables/tbutils.c | 27 ++- + drivers/acpi/utilities/uteval.c | 6 +- + drivers/acpi/utilities/utglobal.c | 3 +- + drivers/acpi/utilities/utxface.c | 11 + + drivers/acpi/video.c | 15 + + drivers/misc/Kconfig | 284 +---------------- + drivers/misc/Makefile | 13 - + drivers/platform/Kconfig | 5 + + drivers/platform/Makefile | 5 + + drivers/platform/x86/Kconfig | 375 +++++++++++++++++++++ + drivers/platform/x86/Makefile | 19 + + drivers/{misc => platform/x86}/acer-wmi.c | 0 + drivers/{misc => platform/x86}/asus-laptop.c | 0 + drivers/{acpi => platform/x86}/asus_acpi.c | 0 + drivers/{misc => platform/x86}/compal-laptop.c | 0 + drivers/{misc => platform/x86}/eeepc-laptop.c | 0 + drivers/{misc => platform/x86}/fujitsu-laptop.c | 0 + drivers/{misc => platform/x86}/hp-wmi.c | 0 + drivers/{misc => platform/x86}/intel_menlow.c | 0 + drivers/{misc => platform/x86}/msi-laptop.c | 0 + drivers/{misc => platform/x86}/panasonic-laptop.c | 0 + drivers/{misc => platform/x86}/sony-laptop.c | 0 + drivers/{misc => platform/x86}/tc1100-wmi.c | 0 + drivers/{misc => platform/x86}/thinkpad_acpi.c | 0 + drivers/{acpi => platform/x86}/toshiba_acpi.c | 0 + drivers/{acpi => platform/x86}/wmi.c | 0 + drivers/power/power_supply_sysfs.c | 2 + + include/acpi/acconfig.h | 6 +- + include/acpi/acexcep.h | 4 +- + include/acpi/acglobal.h | 1 + + include/acpi/aclocal.h | 1 + + include/acpi/acnamesp.h | 5 +- + include/acpi/acpixf.h | 6 +- + include/acpi/actables.h | 2 + + include/acpi/actypes.h | 8 +- + include/linux/acpi.h | 1 + + include/linux/power_supply.h | 2 + + include/linux/suspend.h | 13 + + kernel/power/disk.c | 6 +- + kernel/power/snapshot.c | 370 +++++++++++---------- + kernel/power/swsusp.c | 122 +++++++ + 77 files changed, 1597 insertions(+), 1010 deletions(-) + create mode 100644 drivers/platform/Kconfig + create mode 100644 drivers/platform/Makefile + create mode 100644 drivers/platform/x86/Kconfig + create mode 100644 drivers/platform/x86/Makefile + rename drivers/{misc => platform/x86}/acer-wmi.c (100%) + rename drivers/{misc => platform/x86}/asus-laptop.c (100%) + rename drivers/{acpi => platform/x86}/asus_acpi.c (100%) + rename drivers/{misc => platform/x86}/compal-laptop.c (100%) + rename drivers/{misc => platform/x86}/eeepc-laptop.c (100%) + rename drivers/{misc => platform/x86}/fujitsu-laptop.c (100%) + rename drivers/{misc => platform/x86}/hp-wmi.c (100%) + rename drivers/{misc => platform/x86}/intel_menlow.c (100%) + rename drivers/{misc => platform/x86}/msi-laptop.c (100%) + rename drivers/{misc => platform/x86}/panasonic-laptop.c (100%) + rename drivers/{misc => platform/x86}/sony-laptop.c (100%) + rename drivers/{misc => platform/x86}/tc1100-wmi.c (100%) + rename drivers/{misc => platform/x86}/thinkpad_acpi.c (100%) + rename drivers/{acpi => platform/x86}/toshiba_acpi.c (100%) + rename drivers/{acpi => platform/x86}/wmi.c (100%) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Removed include/linux/lockd/sm_inter.h +Merge made by recursive. + fs/lockd/clntproc.c | 7 +- + fs/lockd/host.c | 170 ++----------- + fs/lockd/mon.c | 569 ++++++++++++++++++++++++++++++---------- + fs/lockd/svc.c | 72 ++++-- + fs/lockd/svc4proc.c | 13 +- + fs/lockd/svcproc.c | 13 +- + fs/lockd/svcsubs.c | 1 - + fs/lockd/xdr.c | 5 +- + fs/lockd/xdr4.c | 5 +- + fs/nfsd/auth.c | 4 +- + fs/nfsd/nfs4recover.c | 2 +- + fs/nfsd/nfs4state.c | 37 ++- + fs/nfsd/nfsctl.c | 479 +++++++++++++++++++++++++++++++-- + fs/nfsd/nfsfh.c | 30 ++- + fs/nfsd/vfs.c | 34 +++- + fs/sync.c | 18 +-- + include/linux/lockd/lockd.h | 68 +++-- + include/linux/lockd/sm_inter.h | 48 ---- + include/linux/lockd/xdr.h | 15 +- + include/linux/nfsd/nfsfh.h | 4 + + include/linux/sunrpc/svc.h | 5 +- + net/sunrpc/svc_xprt.c | 25 ++- + net/sunrpc/svcsock.c | 26 ++- + 23 files changed, 1133 insertions(+), 517 deletions(-) + delete mode 100644 include/linux/lockd/sm_inter.h +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Auto-merged drivers/media/dvb/Kconfig +Merge made by recursive. + drivers/firewire/fw-card.c | 84 ++-- + drivers/firewire/fw-cdev.c | 355 ++++++---- + drivers/firewire/fw-device.c | 51 +- + drivers/firewire/fw-device.h | 9 +- + drivers/firewire/fw-iso.c | 43 +- + drivers/firewire/fw-ohci.c | 236 ++++---- + drivers/firewire/fw-sbp2.c | 78 +-- + drivers/firewire/fw-topology.c | 44 +- + drivers/firewire/fw-topology.h | 13 +- + drivers/firewire/fw-transaction.c | 153 ++--- + drivers/firewire/fw-transaction.h | 136 ++--- + drivers/ieee1394/csr.c | 12 +- + drivers/ieee1394/csr.h | 10 +- + drivers/ieee1394/csr1212.c | 45 +- + drivers/ieee1394/csr1212.h | 9 +- + drivers/ieee1394/dma.h | 1 + + drivers/ieee1394/dv1394-private.h | 44 +- + drivers/ieee1394/dv1394.c | 12 +- + drivers/ieee1394/eth1394.c | 28 +- + drivers/ieee1394/eth1394.h | 16 +- + drivers/ieee1394/highlevel.c | 9 +- + drivers/ieee1394/highlevel.h | 7 +- + drivers/ieee1394/hosts.c | 6 +- + drivers/ieee1394/hosts.h | 2 +- + drivers/ieee1394/ieee1394.h | 3 + + drivers/ieee1394/ieee1394_core.c | 1 + + drivers/ieee1394/ieee1394_transactions.c | 29 + + drivers/ieee1394/ieee1394_transactions.h | 2 + + drivers/ieee1394/iso.h | 1 + + drivers/ieee1394/nodemgr.c | 30 +- + drivers/ieee1394/nodemgr.h | 21 +- + drivers/ieee1394/ohci1394.c | 26 +- + drivers/ieee1394/pcilynx.c | 2 +- + drivers/ieee1394/pcilynx.h | 2 +- + drivers/ieee1394/raw1394.c | 2 +- + drivers/ieee1394/sbp2.c | 4 +- + drivers/media/dvb/Kconfig | 2 + + drivers/media/dvb/Makefile | 2 + + drivers/media/dvb/firesat/Kconfig | 12 + + drivers/media/dvb/firesat/Makefile | 13 + + drivers/media/dvb/firesat/avc_api.c | 1051 ++++++++++++++++++++++++++++++ + drivers/media/dvb/firesat/avc_api.h | 432 ++++++++++++ + drivers/media/dvb/firesat/cmp.c | 171 +++++ + drivers/media/dvb/firesat/cmp.h | 9 + + drivers/media/dvb/firesat/firesat-ci.c | 261 ++++++++ + drivers/media/dvb/firesat/firesat-ci.h | 9 + + drivers/media/dvb/firesat/firesat-rc.c | 191 ++++++ + drivers/media/dvb/firesat/firesat-rc.h | 11 + + drivers/media/dvb/firesat/firesat.h | 227 +++++++ + drivers/media/dvb/firesat/firesat_1394.c | 291 +++++++++ + drivers/media/dvb/firesat/firesat_dvb.c | 276 ++++++++ + drivers/media/dvb/firesat/firesat_fe.c | 245 +++++++ + drivers/media/dvb/firesat/firesat_iso.c | 111 ++++ + include/linux/firewire-cdev.h | 4 +- + 54 files changed, 4072 insertions(+), 772 deletions(-) + create mode 100644 drivers/media/dvb/firesat/Kconfig + create mode 100644 drivers/media/dvb/firesat/Makefile + create mode 100644 drivers/media/dvb/firesat/avc_api.c + create mode 100644 drivers/media/dvb/firesat/avc_api.h + create mode 100644 drivers/media/dvb/firesat/cmp.c + create mode 100644 drivers/media/dvb/firesat/cmp.h + create mode 100644 drivers/media/dvb/firesat/firesat-ci.c + create mode 100644 drivers/media/dvb/firesat/firesat-ci.h + create mode 100644 drivers/media/dvb/firesat/firesat-rc.c + create mode 100644 drivers/media/dvb/firesat/firesat-rc.h + create mode 100644 drivers/media/dvb/firesat/firesat.h + create mode 100644 drivers/media/dvb/firesat/firesat_1394.c + create mode 100644 drivers/media/dvb/firesat/firesat_dvb.c + create mode 100644 drivers/media/dvb/firesat/firesat_fe.c + create mode 100644 drivers/media/dvb/firesat/firesat_iso.c +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/master +$ git merge kvm/master +Auto-merged arch/x86/kvm/Kconfig +Merge made by recursive. + arch/ia64/include/asm/kvm.h | 14 + + arch/ia64/include/asm/kvm_host.h | 8 +- + arch/ia64/kvm/Kconfig | 4 + + arch/ia64/kvm/kvm-ia64.c | 100 ++++- + arch/ia64/kvm/process.c | 15 - + arch/ia64/kvm/vcpu.c | 39 +-- + arch/ia64/kvm/vtlb.c | 5 - + arch/powerpc/include/asm/kvm.h | 7 + + arch/powerpc/include/asm/kvm_44x.h | 7 + + arch/powerpc/include/asm/kvm_asm.h | 7 +- + arch/powerpc/include/asm/kvm_e500.h | 67 +++ + arch/powerpc/include/asm/kvm_host.h | 21 +- + arch/powerpc/include/asm/kvm_ppc.h | 15 +- + arch/powerpc/kernel/asm-offsets.c | 4 +- + arch/powerpc/kvm/44x.c | 72 +--- + arch/powerpc/kvm/44x_emulate.c | 217 +-------- + arch/powerpc/kvm/44x_tlb.c | 39 ++- + arch/powerpc/kvm/44x_tlb.h | 9 - + arch/powerpc/kvm/Kconfig | 16 + + arch/powerpc/kvm/Makefile | 10 + + arch/powerpc/kvm/booke.c | 50 ++- + arch/powerpc/kvm/booke.h | 35 +- + arch/powerpc/kvm/booke_emulate.c | 266 +++++++++++ + arch/powerpc/kvm/booke_interrupts.S | 5 + + arch/powerpc/kvm/e500.c | 169 +++++++ + arch/powerpc/kvm/e500_emulate.c | 196 ++++++++ + arch/powerpc/kvm/e500_tlb.c | 737 +++++++++++++++++++++++++++++ + arch/powerpc/kvm/e500_tlb.h | 184 ++++++++ + arch/powerpc/kvm/emulate.c | 93 +++-- + arch/powerpc/kvm/powerpc.c | 35 +-- + arch/s390/include/asm/kvm.h | 7 + + arch/s390/include/asm/kvm_host.h | 3 - + arch/s390/kvm/Kconfig | 3 + + arch/s390/kvm/kvm-s390.c | 8 +- + arch/x86/include/asm/kvm.h | 23 + + arch/x86/include/asm/kvm_host.h | 54 ++- + arch/x86/include/asm/msr-index.h | 7 + + arch/x86/include/asm/svm.h | 4 - + arch/x86/include/asm/virtext.h | 2 +- + arch/x86/include/asm/vmx.h | 5 +- + arch/x86/kvm/Kconfig | 4 + + arch/x86/kvm/i8254.c | 23 +- + arch/x86/kvm/i8254.h | 2 + + arch/x86/kvm/kvm_svm.h | 16 +- + arch/x86/kvm/mmu.c | 186 ++++---- + arch/x86/kvm/paging_tmpl.h | 209 ++++----- + arch/x86/kvm/svm.c | 866 +++++++++++++++++++++++++++++++---- + arch/x86/kvm/vmx.c | 303 ++++++++----- + arch/x86/kvm/x86.c | 273 ++++++++---- + arch/x86/kvm/x86_emulate.c | 56 ++- + include/linux/kvm.h | 61 ++- + include/linux/kvm_host.h | 25 +- + include/linux/kvm_types.h | 13 - + virt/kvm/ioapic.c | 6 + + virt/kvm/irq_comm.c | 24 + + virt/kvm/kvm_main.c | 59 ++- + 56 files changed, 3620 insertions(+), 1068 deletions(-) + create mode 100644 arch/powerpc/include/asm/kvm_e500.h + create mode 100644 arch/powerpc/kvm/booke_emulate.c + create mode 100644 arch/powerpc/kvm/e500.c + create mode 100644 arch/powerpc/kvm/e500_emulate.c + create mode 100644 arch/powerpc/kvm/e500_tlb.c + create mode 100644 arch/powerpc/kvm/e500_tlb.h +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merged drivers/scsi/scsi_ioctl.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_ioctl.c +Resolved 'drivers/scsi/scsi_ioctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 3f70c16: Merge commit 'scsi/master' +$ git diff -M --stat --summary HEAD^.. + block/blk-map.c | 19 +- + drivers/message/fusion/mptctl.c | 5 +- + drivers/scsi/NCR_D700.c | 2 +- + drivers/scsi/a2091.c | 18 +- + drivers/scsi/advansys.c | 2 +- + drivers/scsi/gvp11.c | 8 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 14 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 16 +- + drivers/scsi/lasi700.c | 3 +- + drivers/scsi/libsas/sas_host_smp.c | 12 +- + drivers/scsi/lpfc/lpfc_init.c | 3 +- + drivers/scsi/mvsas.c | 2 +- + drivers/scsi/scsi.c | 4 - + drivers/scsi/scsi_error.c | 24 +-- + drivers/scsi/scsi_ioctl.c | 10 +- + drivers/scsi/scsi_lib.c | 74 ++++-- + drivers/scsi/sd_dif.c | 17 +- + drivers/scsi/sg.c | 2 + + drivers/scsi/sgiwd93.c | 3 +- + drivers/scsi/sim710.c | 4 +- + drivers/scsi/sni_53c710.c | 3 +- + drivers/scsi/st.c | 492 ++++++++++++++++-------------------- + drivers/scsi/st.h | 14 +- + drivers/scsi/zalon.c | 4 +- + fs/bio.c | 36 ++- + include/linux/blkdev.h | 2 + + 26 files changed, 395 insertions(+), 398 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/configfs/dir.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 59 insertions(+), 0 deletions(-) +Merging ext4/next +$ git merge ext4/next +Auto-merged fs/ext3/super.c +Auto-merged fs/ext4/super.c +Auto-merged fs/jbd2/commit.c +Auto-merged fs/jbd2/journal.c +Auto-merged fs/jbd2/transaction.c +Auto-merged include/linux/fs.h +Auto-merged include/linux/jbd2.h +Merge made by recursive. + Documentation/filesystems/ext4.txt | 85 ++++- + block/Kconfig | 6 + + fs/block_dev.c | 15 + + fs/ext3/hash.c | 77 ++++- + fs/ext3/namei.c | 11 +- + fs/ext3/super.c | 33 ++ + fs/ext4/balloc.c | 293 ++++++------------ + fs/ext4/bitmap.c | 5 +- + fs/ext4/dir.c | 10 +- + fs/ext4/ext4.h | 152 +++++++-- + fs/ext4/ext4_extents.h | 5 - + fs/ext4/ext4_i.h | 16 +- + fs/ext4/ext4_jbd2.c | 83 ++++-- + fs/ext4/ext4_jbd2.h | 87 ++++- + fs/ext4/ext4_sb.h | 6 +- + fs/ext4/extents.c | 60 ++-- + fs/ext4/file.c | 3 - + fs/ext4/hash.c | 77 ++++- + fs/ext4/ialloc.c | 324 +++++++++++-------- + fs/ext4/inode.c | 309 +++++++++++++----- + fs/ext4/ioctl.c | 2 +- + fs/ext4/mballoc.c | 629 ++++++++++++++++++++++++++---------- + fs/ext4/mballoc.h | 71 +---- + fs/ext4/migrate.c | 19 +- + fs/ext4/namei.c | 92 +++--- + fs/ext4/resize.c | 113 ++----- + fs/ext4/super.c | 614 ++++++++++++++++++++++------------- + fs/ext4/xattr.c | 25 +- + fs/ioprio.c | 3 +- + fs/jbd2/checkpoint.c | 24 +- + fs/jbd2/commit.c | 58 +++- + fs/jbd2/journal.c | 124 +++----- + fs/jbd2/transaction.c | 60 +++- + fs/super.c | 2 + + include/linux/ext3_fs.h | 28 ++- + include/linux/ext3_fs_sb.h | 1 + + include/linux/fs.h | 2 + + include/linux/ioprio.h | 2 + + include/linux/jbd2.h | 38 ++- + 39 files changed, 2266 insertions(+), 1298 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Renamed arch/avr32/include/asm/atmel-mci.h => include/linux/atmel-mci.h +Auto-merged include/linux/atmel-mci.h +Auto-merged arch/avr32/mach-at32ap/at32ap700x.c +Auto-merged drivers/mmc/host/atmel-mci.c +Auto-merged include/linux/netdevice.h +Auto-merged net/core/dev.c +Auto-merged net/ipv4/tcp.c +Auto-merged net/ipv4/tcp_input.c +Auto-merged net/ipv4/tcp_ipv4.c +Auto-merged net/ipv6/tcp_ipv6.c +Merge made by recursive. + Documentation/crypto/async-tx-api.txt | 96 ++--- + Documentation/dmaengine.txt | 1 + + arch/avr32/mach-at32ap/at32ap700x.c | 15 +- + crypto/async_tx/async_tx.c | 350 +--------------- + drivers/dca/dca-core.c | 2 +- + drivers/dma/Kconfig | 2 - + drivers/dma/dmaengine.c | 773 ++++++++++++++++++++++++--------- + drivers/dma/dmatest.c | 129 ++---- + drivers/dma/dw_dmac.c | 119 +++--- + drivers/dma/fsldma.c | 5 +- + drivers/dma/ioat.c | 92 ++--- + drivers/dma/ioat_dma.c | 5 +- + drivers/dma/iop-adma.c | 30 +-- + drivers/dma/mv_xor.c | 11 +- + drivers/mmc/host/atmel-mci.c | 103 ++---- + include/linux/async_tx.h | 17 +- + include/linux/atmel-mci.h | 6 +- + include/linux/dmaengine.h | 181 +++------ + include/linux/dw_dmac.h | 31 +- + include/linux/netdevice.h | 3 - + include/net/netdma.h | 11 - + net/core/dev.c | 147 +------ + net/ipv4/tcp.c | 5 +- + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv6/tcp_ipv6.c | 2 +- + 26 files changed, 887 insertions(+), 1253 deletions(-) + create mode 100644 Documentation/dmaengine.txt +$ git am -3 ../patches/0001-net-async_tx-merge-fix.patch +Applying: net: async_tx merge fix +$ git reset HEAD^ +net/core/dev.c: locally modified +$ git add . +$ git commit -v -a --amend +Created commit c5fbe39: Merge commit 'async_tx/next' +Merging udf/for_next +$ git merge udf/for_next +Auto-merged fs/udf/ialloc.c +Auto-merged fs/udf/namei.c +Merge made by recursive. + Documentation/filesystems/udf.txt | 2 + + fs/udf/balloc.c | 113 +++++----- + fs/udf/dir.c | 14 +- + fs/udf/directory.c | 38 ++-- + fs/udf/ecma_167.h | 416 ++++++++++++++++++------------------ + fs/udf/ialloc.c | 4 +- + fs/udf/inode.c | 213 ++++++++++--------- + fs/udf/misc.c | 29 ++-- + fs/udf/namei.c | 86 ++++---- + fs/udf/osta_udf.h | 22 +- + fs/udf/partition.c | 2 +- + fs/udf/super.c | 139 ++++++++----- + fs/udf/truncate.c | 44 ++-- + fs/udf/udf_i.h | 6 +- + fs/udf/udf_sb.h | 4 + + fs/udf/udfdecl.h | 46 +++-- + fs/udf/udfend.h | 28 ++-- + fs/udf/udftime.c | 6 +- + fs/udf/unicode.c | 41 +++-- + 19 files changed, 663 insertions(+), 590 deletions(-) +Merging net/master +$ git merge net/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Auto-merged drivers/mtd/devices/m25p80.c +CONFLICT (content): Merge conflict in drivers/mtd/devices/m25p80.c +Auto-merged drivers/mtd/devices/mtd_dataflash.c +CONFLICT (content): Merge conflict in drivers/mtd/devices/mtd_dataflash.c +Auto-merged drivers/mtd/maps/physmap.c +Auto-merged drivers/mtd/mtdconcat.c +Auto-merged drivers/mtd/ubi/build.c +Resolved 'drivers/mtd/devices/m25p80.c' using previous resolution. +Resolved 'drivers/mtd/devices/mtd_dataflash.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit ac4952a: Merge commit 'mtd/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/powerpc/dts-bindings/4xx/ndfc.txt | 39 ++ + arch/arm/mach-pxa/corgi.c | 54 ++ + arch/arm/mach-pxa/poodle.c | 51 ++ + arch/arm/mach-pxa/spitz.c | 77 +++ + drivers/mtd/Kconfig | 10 + + drivers/mtd/Makefile | 2 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 12 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 8 +- + drivers/mtd/chips/cfi_cmdset_0020.c | 14 +- + drivers/mtd/chips/fwh_lock.h | 4 +- + drivers/mtd/devices/lart.c | 6 +- + drivers/mtd/devices/m25p80.c | 41 +- + drivers/mtd/devices/mtd_dataflash.c | 24 +- + drivers/mtd/ftl.c | 100 ++-- + drivers/mtd/inftlcore.c | 2 +- + drivers/mtd/inftlmount.c | 4 +- + drivers/mtd/lpddr/Kconfig | 22 + + drivers/mtd/lpddr/Makefile | 6 + + drivers/mtd/lpddr/lpddr_cmds.c | 796 +++++++++++++++++++++++ + drivers/mtd/lpddr/qinfo_probe.c | 255 ++++++++ + drivers/mtd/maps/Kconfig | 21 +- + drivers/mtd/maps/alchemy-flash.c | 2 +- + drivers/mtd/maps/amd76xrom.c | 4 +- + drivers/mtd/maps/cfi_flagadm.c | 2 +- + drivers/mtd/maps/ck804xrom.c | 4 +- + drivers/mtd/maps/dbox2-flash.c | 2 +- + drivers/mtd/maps/edb7312.c | 2 +- + drivers/mtd/maps/esb2rom.c | 4 +- + drivers/mtd/maps/fortunet.c | 2 +- + drivers/mtd/maps/h720x-flash.c | 2 +- + drivers/mtd/maps/ichxrom.c | 4 +- + drivers/mtd/maps/impa7.c | 2 +- + drivers/mtd/maps/ipaq-flash.c | 2 +- + drivers/mtd/maps/mbx860.c | 2 +- + drivers/mtd/maps/nettel.c | 5 +- + drivers/mtd/maps/octagon-5066.c | 2 +- + drivers/mtd/maps/physmap.c | 41 +- + drivers/mtd/maps/pmcmsp-flash.c | 2 +- + drivers/mtd/maps/redwood.c | 2 +- + drivers/mtd/maps/rpxlite.c | 2 +- + drivers/mtd/maps/sbc8240.c | 2 +- + drivers/mtd/maps/scb2_flash.c | 8 +- + drivers/mtd/maps/sharpsl-flash.c | 2 +- + drivers/mtd/maps/tqm8xxl.c | 2 +- + drivers/mtd/maps/uclinux.c | 4 +- + drivers/mtd/maps/vmax301.c | 2 +- + drivers/mtd/maps/wr_sbc82xx_flash.c | 2 +- + drivers/mtd/mtdchar.c | 6 +- + drivers/mtd/mtdconcat.c | 35 +- + drivers/mtd/mtdcore.c | 16 +- + drivers/mtd/mtdoops.c | 9 +- + drivers/mtd/mtdpart.c | 34 +- + drivers/mtd/nand/Kconfig | 7 + + drivers/mtd/nand/alauda.c | 6 +- + drivers/mtd/nand/fsl_elbc_nand.c | 4 +- + drivers/mtd/nand/nand_base.c | 25 +- + drivers/mtd/nand/nand_bbt.c | 31 +- + drivers/mtd/nand/nandsim.c | 339 +++++++++-- + drivers/mtd/nand/ndfc.c | 269 ++++---- + drivers/mtd/nand/pxa3xx_nand.c | 6 +- + drivers/mtd/nand/sharpsl.c | 247 ++++---- + drivers/mtd/nftlcore.c | 2 +- + drivers/mtd/nftlmount.c | 4 +- + drivers/mtd/onenand/onenand_base.c | 8 +- + drivers/mtd/rfd_ftl.c | 29 +- + drivers/mtd/ssfdc.c | 7 +- + drivers/mtd/tests/Makefile | 7 + + drivers/mtd/tests/mtd_oobtest.c | 742 +++++++++++++++++++++ + drivers/mtd/tests/mtd_pagetest.c | 632 ++++++++++++++++++ + drivers/mtd/tests/mtd_readtest.c | 253 +++++++ + drivers/mtd/tests/mtd_speedtest.c | 502 ++++++++++++++ + drivers/mtd/tests/mtd_stresstest.c | 330 ++++++++++ + drivers/mtd/tests/mtd_subpagetest.c | 525 +++++++++++++++ + drivers/mtd/tests/mtd_torturetest.c | 530 +++++++++++++++ + drivers/mtd/ubi/build.c | 2 +- + drivers/mtd/ubi/gluebi.c | 17 +- + fs/jffs2/compr_rubin.c | 120 ++-- + fs/jffs2/erase.c | 5 +- + include/linux/mtd/ftl.h | 38 +- + include/linux/mtd/map.h | 1 + + include/linux/mtd/mtd.h | 75 ++- + include/linux/mtd/nand.h | 7 +- + include/linux/mtd/partitions.h | 6 +- + include/linux/mtd/pfow.h | 159 +++++ + include/linux/mtd/physmap.h | 1 + + include/linux/mtd/qinfo.h | 91 +++ + include/linux/mtd/sharpsl.h | 20 + + 87 files changed, 6127 insertions(+), 678 deletions(-) + create mode 100644 Documentation/powerpc/dts-bindings/4xx/ndfc.txt + create mode 100644 drivers/mtd/lpddr/Kconfig + create mode 100644 drivers/mtd/lpddr/Makefile + create mode 100644 drivers/mtd/lpddr/lpddr_cmds.c + create mode 100644 drivers/mtd/lpddr/qinfo_probe.c + create mode 100644 drivers/mtd/tests/Makefile + create mode 100644 drivers/mtd/tests/mtd_oobtest.c + create mode 100644 drivers/mtd/tests/mtd_pagetest.c + create mode 100644 drivers/mtd/tests/mtd_readtest.c + create mode 100644 drivers/mtd/tests/mtd_speedtest.c + create mode 100644 drivers/mtd/tests/mtd_stresstest.c + create mode 100644 drivers/mtd/tests/mtd_subpagetest.c + create mode 100644 drivers/mtd/tests/mtd_torturetest.c + create mode 100644 include/linux/mtd/pfow.h + create mode 100644 include/linux/mtd/qinfo.h + create mode 100644 include/linux/mtd/sharpsl.h +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Already uptodate! +Merge made by recursive. +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/kernel/cpu/common.c +Auto-merged arch/x86/kvm/svm.c +Auto-merged drivers/cpufreq/cpufreq.c +Auto-merged drivers/pci/pci-driver.c +Auto-merged init/Kconfig +Auto-merged init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merged kernel/module.c +Auto-merged kernel/sched.c +Auto-merged kernel/stop_machine.c +Resolved 'init/main.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit d804ae4: Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 8 + + arch/alpha/include/asm/percpu.h | 21 ++- + arch/cris/arch-v10/kernel/entry.S | 2 +- + arch/cris/arch-v32/mm/mmu.S | 2 +- + arch/ia64/include/asm/percpu.h | 5 +- + arch/ia64/kernel/crash.c | 4 +- + arch/ia64/kernel/ia64_ksyms.c | 4 +- + arch/ia64/kernel/setup.c | 8 +- + arch/ia64/mm/discontig.c | 2 +- + arch/mn10300/kernel/kprobes.c | 2 +- + arch/parisc/lib/fixup.S | 8 +- + arch/powerpc/kernel/sysfs.c | 43 ++---- + arch/powerpc/platforms/cell/interrupt.c | 14 +- + arch/powerpc/platforms/pseries/hvCall.S | 2 +- + arch/sparc/kernel/rtrap_64.S | 8 +- + arch/x86/include/asm/percpu.h | 24 ++- + arch/x86/include/asm/processor.h | 2 +- + arch/x86/include/asm/timer.h | 5 +- + arch/x86/kernel/cpu/common.c | 4 +- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 2 +- + arch/x86/kernel/entry_64.S | 4 +- + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/head_64.S | 2 +- + arch/x86/kernel/tsc.c | 4 +- + arch/x86/kvm/svm.c | 14 +- + arch/x86/xen/xen-asm_32.S | 4 +- + block/blktrace.c | 2 +- + drivers/acpi/processor_perflib.c | 4 +- + drivers/acpi/processor_throttling.c | 72 ++++---- + drivers/cpufreq/cpufreq.c | 16 +- + drivers/firmware/dcdbas.c | 44 ++--- + drivers/s390/net/netiucv.c | 8 +- + include/asm-generic/percpu.h | 60 ++++++- + include/linux/compiler.h | 4 +- + include/linux/percpu.h | 117 +++++++------ + include/net/snmp.h | 12 +- + init/main.c | 9 + + kernel/lockdep.c | 11 +- + kernel/module.c | 154 +---------------- + kernel/sched.c | 20 ++- + kernel/softirq.c | 4 +- + kernel/softlockup.c | 20 +- + kernel/stop_machine.c | 2 +- + kernel/workqueue.c | 2 +- + mm/allocpercpu.c | 265 +++++++++++++++++----------- + mm/vmstat.c | 6 +- + net/ipv4/af_inet.c | 14 +- + net/ipv4/ip_input.c | 3 +- + net/ipv4/route.c | 4 +- + 49 files changed, 519 insertions(+), 534 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 5b31d5d Merge commit 'sound/for-next' +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Removed fs/gfs2/mount.h +Merge made by recursive. + fs/gfs2/Kconfig | 2 +- + fs/gfs2/mount.c | 111 ++++++++---------------------------------------- + fs/gfs2/mount.h | 17 ------- + fs/gfs2/ops_address.c | 1 + + fs/gfs2/ops_file.c | 2 +- + fs/gfs2/ops_fstype.c | 11 ++++- + fs/gfs2/ops_super.c | 41 ++++++++++++++---- + fs/gfs2/super.h | 26 ++++++----- + 8 files changed, 76 insertions(+), 135 deletions(-) + delete mode 100644 fs/gfs2/mount.h +Merging input/next +$ git merge input/next +Already up-to-date. +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Auto-merged fs/fcntl.c +Auto-merged fs/ioctl.c +CONFLICT (content): Merge conflict in fs/ioctl.c +Resolved 'fs/ioctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 0b08141: Merge commit 'bkl-removal/bkl-removal' +$ git diff -M --stat --summary HEAD^.. + drivers/char/rtc.c | 17 ++++------------- + 1 files changed, 4 insertions(+), 13 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-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 +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Auto-merged drivers/media/dvb/ttpci/Kconfig +Removed drivers/media/dvb/ttpci/fdump.c +Auto-merged drivers/net/acenic.c +Removed drivers/net/acenic_firmware.h +Auto-merged drivers/net/e100.c +Auto-merged drivers/net/starfire.c +CONFLICT (content): Merge conflict in drivers/net/starfire.c +Auto-merged drivers/net/tg3.c +CONFLICT (content): Merge conflict in drivers/net/tg3.c +Auto-merged drivers/net/tg3.h +Auto-merged drivers/scsi/advansys.c +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Auto-merged drivers/scsi/qla1280.c +Removed drivers/scsi/qlogicpti_asm.c +Auto-merged firmware/Makefile +CONFLICT (content): Merge conflict in firmware/Makefile +Auto-merged firmware/WHENCE +CONFLICT (content): Merge conflict in firmware/WHENCE +Removed sound/isa/wavefront/yss225.c +Resolved 'drivers/net/starfire.c' using previous resolution. +Resolved 'drivers/net/tg3.c' using previous resolution. +Resolved 'firmware/Makefile' using previous resolution. +Resolved 'firmware/WHENCE' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 2d57d18: Merge commit 'firmware/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/dvb/ttpci/Kconfig | 23 +- + drivers/media/dvb/ttpci/Makefile | 9 - + drivers/media/dvb/ttpci/av7110.c | 16 - + drivers/media/dvb/ttpci/av7110_hw.c | 35 +- + drivers/media/dvb/ttpci/av7110_hw.h | 3 +- + drivers/media/dvb/ttpci/fdump.c | 44 - + drivers/net/acenic_firmware.h | 9456 ----------------------------- + drivers/net/e100.c | 283 +- + drivers/scsi/advansys.c | 1731 +----- + drivers/scsi/ql1040_fw.h | 2130 ------- + drivers/scsi/ql12160_fw.h | 1811 ------ + drivers/scsi/ql1280_fw.h | 2048 ------- + drivers/scsi/qla1280.c | 114 +- + drivers/scsi/qla1280.h | 6 + + drivers/scsi/qlogicpti.c | 63 +- + drivers/scsi/qlogicpti_asm.c | 1160 ---- + firmware/Makefile | 9 + + firmware/WHENCE | 71 + + firmware/advansys/3550.bin.ihex | 317 + + firmware/advansys/38C0800.bin.ihex | 336 + + firmware/advansys/38C1600.bin.ihex | 398 ++ + firmware/advansys/mcode.bin.ihex | 147 + + firmware/av7110/Boot.S | 109 + + firmware/av7110/bootcode.bin.ihex | 15 + + firmware/e100/d101m_ucode.bin.ihex | 38 + + firmware/e100/d101s_ucode.bin.ihex | 38 + + firmware/e100/d102e_ucode.bin.ihex | 38 + + firmware/qlogic/1040.bin.ihex | 2111 +++++++ + firmware/qlogic/12160.bin.ihex | 1771 ++++++ + firmware/qlogic/1280.bin.ihex | 2008 ++++++ + firmware/qlogic/isp1000.bin.ihex | 1158 ++++ + firmware/yamaha/yss225_registers.bin.ihex | 998 +++ + sound/isa/Kconfig | 10 - + sound/isa/wavefront/wavefront_fx.c | 16 - + sound/isa/wavefront/yss225.c | 2739 --------- + 35 files changed, 9889 insertions(+), 21370 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + delete mode 100644 drivers/net/acenic_firmware.h + delete mode 100644 drivers/scsi/ql1040_fw.h + delete mode 100644 drivers/scsi/ql12160_fw.h + delete mode 100644 drivers/scsi/ql1280_fw.h + delete mode 100644 drivers/scsi/qlogicpti_asm.c + create mode 100644 firmware/advansys/3550.bin.ihex + create mode 100644 firmware/advansys/38C0800.bin.ihex + create mode 100644 firmware/advansys/38C1600.bin.ihex + create mode 100644 firmware/advansys/mcode.bin.ihex + create mode 100644 firmware/av7110/Boot.S + create mode 100644 firmware/av7110/bootcode.bin.ihex + create mode 100644 firmware/e100/d101m_ucode.bin.ihex + create mode 100644 firmware/e100/d101s_ucode.bin.ihex + create mode 100644 firmware/e100/d102e_ucode.bin.ihex + create mode 100644 firmware/qlogic/1040.bin.ihex + create mode 100644 firmware/qlogic/12160.bin.ihex + create mode 100644 firmware/qlogic/1280.bin.ihex + create mode 100644 firmware/qlogic/isp1000.bin.ihex + create mode 100644 firmware/yamaha/yss225_registers.bin.ihex + delete mode 100644 sound/isa/wavefront/yss225.c +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Auto-merged drivers/mfd/wm8350-core.c +Auto-merged drivers/regulator/wm8350-regulator.c +Auto-merged include/linux/mfd/wm8350/pmic.h +Merge made by recursive. + drivers/leds/Kconfig | 15 ++- + drivers/leds/Makefile | 2 + + drivers/leds/led-class.c | 25 +-- + drivers/leds/leds-alix2.c | 209 +++++++++++++++++++++ + drivers/leds/leds-ams-delta.c | 4 +- + drivers/leds/leds-pca9532.c | 77 ++++++-- + drivers/leds/leds-wm8350.c | 333 ++++++++++++++++++++++++++++++++++ + drivers/leds/ledtrig-timer.c | 92 +++++----- + drivers/mfd/wm8350-core.c | 3 + + drivers/regulator/wm8350-regulator.c | 91 +++++++++ + include/linux/leds-pca9532.h | 2 + + include/linux/leds.h | 2 +- + include/linux/mfd/wm8350/pmic.h | 36 ++++ + 13 files changed, 803 insertions(+), 88 deletions(-) + create mode 100644 drivers/leds/leds-alix2.c + create mode 100644 drivers/leds/leds-wm8350.c +Merging backlight/for-mm +$ git merge backlight/for-mm +Auto-merged drivers/video/backlight/backlight.c +Auto-merged drivers/video/backlight/lcd.c +Merge made by recursive. + drivers/video/backlight/Makefile | 2 +- + drivers/video/backlight/backlight.c | 33 +++++++++---------- + drivers/video/backlight/cr_bllcd.c | 18 ++++------ + drivers/video/backlight/{da903x.c => da903x_bl.c} | 0 + drivers/video/backlight/hp680_bl.c | 20 +++++------- + drivers/video/backlight/lcd.c | 36 +++++++++----------- + drivers/video/backlight/progear_bl.c | 20 +++++------- + drivers/video/backlight/tosa_lcd.c | 27 ++++++++++++++- + drivers/video/backlight/vgg2432a4.c | 2 +- + 9 files changed, 81 insertions(+), 77 deletions(-) + rename drivers/video/backlight/{da903x.c => da903x_bl.c} (100%) +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Merge made by recursive. + include/linux/kgdb.h | 42 ++++++++++++++++++++++++++++++++++++++++-- + kernel/kgdb.c | 6 +++--- + 2 files changed, 43 insertions(+), 5 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Already up-to-date. +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Auto-merged fs/block_dev.c +Merge made by recursive. + drivers/md/bitmap.c | 3 +- + drivers/md/faulty.c | 3 +- + drivers/md/linear.c | 3 +- + drivers/md/md.c | 418 +++++++++++++++++++++++++++++++------------- + drivers/md/multipath.c | 3 +- + drivers/md/raid0.c | 178 +++++++++---------- + drivers/md/raid1.c | 11 +- + drivers/md/raid10.c | 3 +- + drivers/md/raid5.c | 8 +- + fs/block_dev.c | 14 ++ + include/linux/raid/md_k.h | 20 ++- + include/linux/raid/md_p.h | 2 + + include/linux/raid/raid0.h | 10 +- + 13 files changed, 431 insertions(+), 245 deletions(-) +Merging kmemcheck/auto-kmemcheck-next +$ git merge kmemcheck/auto-kmemcheck-next +Auto-merged MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/Makefile +Auto-merged arch/x86/kernel/traps.c +Auto-merged arch/x86/mm/fault.c +Auto-merged arch/x86/mm/init_32.c +Auto-merged arch/x86/mm/init_64.c +Auto-merged include/linux/interrupt.h +Auto-merged include/linux/slab_def.h +Auto-merged init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/softirq.c +Auto-merged mm/slab.c +Auto-merged mm/slub.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 58972ff: Merge commit 'kmemcheck/auto-kmemcheck-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kmemcheck.txt | 129 ++++++ + MAINTAINERS | 8 + + arch/x86/Kconfig.debug | 88 +++++ + arch/x86/Makefile | 5 + + arch/x86/include/asm/dma-mapping.h | 2 + + arch/x86/include/asm/pgtable.h | 4 +- + arch/x86/include/asm/pgtable_32.h | 6 + + arch/x86/include/asm/pgtable_64.h | 6 + + arch/x86/include/asm/string_32.h | 8 + + arch/x86/include/asm/string_64.h | 8 + + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/stacktrace.c | 7 + + arch/x86/kernel/traps.c | 5 + + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 18 +- + arch/x86/mm/init_32.c | 4 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/mm/kmemcheck/Makefile | 1 + + arch/x86/mm/kmemcheck/error.c | 229 +++++++++++ + arch/x86/mm/kmemcheck/error.h | 15 + + arch/x86/mm/kmemcheck/kmemcheck.c | 752 ++++++++++++++++++++++++++++++++++++ + arch/x86/mm/kmemcheck/opcode.c | 90 +++++ + arch/x86/mm/kmemcheck/opcode.h | 10 + + arch/x86/mm/kmemcheck/pte.c | 22 + + arch/x86/mm/kmemcheck/pte.h | 10 + + arch/x86/mm/kmemcheck/shadow.c | 124 ++++++ + arch/x86/mm/kmemcheck/shadow.h | 16 + + include/asm-x86/kmemcheck.h | 42 ++ + include/linux/gfp.h | 3 +- + include/linux/interrupt.h | 14 + + include/linux/kmemcheck.h | 86 ++++ + include/linux/mm_types.h | 8 + + include/linux/slab.h | 7 + + include/linux/slab_def.h | 81 ++++ + include/linux/stacktrace.h | 3 + + init/main.c | 4 + + kernel/fork.c | 16 +- + kernel/softirq.c | 11 + + kernel/sysctl.c | 11 + + mm/Makefile | 1 + + mm/kmemcheck.c | 103 +++++ + mm/slab.c | 101 +---- + mm/slub.c | 20 +- + 44 files changed, 1982 insertions(+), 104 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/mm/kmemcheck/Makefile + create mode 100644 arch/x86/mm/kmemcheck/error.c + create mode 100644 arch/x86/mm/kmemcheck/error.h + create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.h + create mode 100644 arch/x86/mm/kmemcheck/pte.c + create mode 100644 arch/x86/mm/kmemcheck/pte.h + create mode 100644 arch/x86/mm/kmemcheck/shadow.c + create mode 100644 arch/x86/mm/kmemcheck/shadow.h + create mode 100644 include/asm-x86/kmemcheck.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 mm/kmemcheck.c +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Already up-to-date. +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Auto-merged drivers/Makefile +Merge made by recursive. + Documentation/ABI/testing/sysfs-class-regulator | 136 +++---- + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/regulator.tmpl | 304 +++++++++++++++ + drivers/Makefile | 4 +- + drivers/regulator/core.c | 474 ++++++++++++++--------- + drivers/regulator/da903x.c | 12 +- + include/linux/regulator/consumer.h | 8 +- + include/linux/regulator/driver.h | 40 ++- + include/linux/regulator/machine.h | 41 ++ + 9 files changed, 749 insertions(+), 272 deletions(-) + create mode 100644 Documentation/DocBook/regulator.tmpl +Merging security-testing/next +$ git merge security-testing/next +Auto-merged Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Auto-merged include/linux/security.h +Auto-merged kernel/capability.c +Auto-merged security/commoncap.c +Auto-merged security/security.c +Auto-merged security/selinux/selinuxfs.c +Auto-merged security/smack/smack_lsm.c +Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 92213f6: Merge commit 'security-testing/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 12 + + include/linux/capability.h | 17 ++- + include/linux/security.h | 41 +++- + include/net/cipso_ipv4.h | 6 +- + include/net/netlabel.h | 86 ++++++- + kernel/capability.c | 2 +- + net/ipv4/cipso_ipv4.c | 88 +++++-- + net/netlabel/netlabel_cipso_v4.c | 61 ++---- + net/netlabel/netlabel_domainhash.c | 67 +++++ + net/netlabel/netlabel_domainhash.h | 4 + + net/netlabel/netlabel_kapi.c | 347 +++++++++++++++++++++----- + net/netlabel/netlabel_unlabeled.c | 26 +- + net/netlabel/netlabel_unlabeled.h | 15 ++ + security/commoncap.c | 29 +-- + security/keys/keyctl.c | 2 +- + security/security.c | 26 ++- + security/selinux/Kconfig | 27 -- + security/selinux/avc.c | 16 +- + security/selinux/hooks.c | 22 +- + security/selinux/include/avc_ss.h | 4 +- + security/selinux/selinuxfs.c | 16 +- + security/selinux/ss/context.h | 2 +- + security/smack/smack.h | 31 +++- + security/smack/smack_access.c | 28 ++- + security/smack/smack_lsm.c | 310 +++++++++++++++++++---- + security/smack/smackfs.c | 369 ++++++++++++++++++---------- + 26 files changed, 1230 insertions(+), 424 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Auto-merged MAINTAINERS +Auto-merged drivers/serial/serial_core.c +Auto-merged drivers/usb/serial/mos7840.c +Auto-merged fs/devpts/inode.c +CONFLICT (content): Merge conflict in fs/devpts/inode.c +Auto-merged include/linux/pci_ids.h +Recorded preimage for 'fs/devpts/inode.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/devpts/inode.c'. +Created commit 2c4076c: Merge branch 'quilt/ttydev' +$ git diff -M --stat --summary HEAD^.. +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging oprofile/auto-oprofile-next +$ git merge oprofile/auto-oprofile-next +Already up-to-date. +Merging fastboot/auto-fastboot-next +$ git merge fastboot/auto-fastboot-next +Already up-to-date. +Merging sparseirq/auto-sparseirq-next +$ git merge sparseirq/auto-sparseirq-next +Already uptodate! +Merge made by recursive. +Merging iommu/auto-iommu-next +$ git merge iommu/auto-iommu-next +Auto-merged lib/swiotlb.c +Merge made by recursive. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Already up-to-date. +Merging watchdog/master +$ git merge watchdog/master +Already up-to-date. +Merging proc/proc +$ git merge proc/proc +Auto-merged fs/proc/base.c +Merge made by recursive. + Documentation/filesystems/proc.txt | 1 + + arch/mips/kernel/stacktrace.c | 24 +++- + fs/proc/base.c | 231 ++++++++++++++++++++---------------- + fs/proc/generic.c | 8 +- + fs/proc/inode.c | 3 - + fs/proc/proc_net.c | 2 +- + fs/proc/root.c | 8 +- + 7 files changed, 153 insertions(+), 124 deletions(-) +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Auto-merged drivers/pci/intel-iommu.c +CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c +Auto-merged include/linux/dma_remapping.h +CONFLICT (content): Merge conflict in include/linux/dma_remapping.h +Auto-merged include/linux/intel-iommu.h +Resolved 'drivers/pci/intel-iommu.c' using previous resolution. +Resolved 'include/linux/dma_remapping.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit df30af7: Merge commit 'dwmw2-iommu/master' +$ git diff -M --stat --summary HEAD^.. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merged MAINTAINERS +Auto-merged drivers/scsi/scsi_scan.c +Merge made by recursive. + Documentation/devices.txt | 6 + + Documentation/scsi/osd.txt | 198 +++++ + MAINTAINERS | 10 + + drivers/scsi/Kconfig | 2 + + drivers/scsi/Makefile | 2 + + drivers/scsi/osd/Kbuild | 45 + + drivers/scsi/osd/Kconfig | 53 ++ + drivers/scsi/osd/Makefile | 37 + + drivers/scsi/osd/osd_debug.h | 30 + + drivers/scsi/osd/osd_initiator.c | 1646 ++++++++++++++++++++++++++++++++++++++ + drivers/scsi/osd/osd_ktests.c | 441 ++++++++++ + drivers/scsi/osd/osd_ktests.h | 31 + + drivers/scsi/osd/osd_uld.c | 457 +++++++++++ + drivers/scsi/scsi_scan.c | 1 + + include/linux/major.h | 1 + + include/scsi/osd_attributes.h | 327 ++++++++ + include/scsi/osd_initiator.h | 428 ++++++++++ + include/scsi/osd_protocol.h | 579 ++++++++++++++ + include/scsi/osd_sec.h | 45 + + include/scsi/osd_sense.h | 260 ++++++ + include/scsi/osd_types.h | 40 + + include/scsi/scsi.h | 1 + + 22 files changed, 4640 insertions(+), 0 deletions(-) + create mode 100644 Documentation/scsi/osd.txt + create mode 100644 drivers/scsi/osd/Kbuild + create mode 100644 drivers/scsi/osd/Kconfig + create mode 100755 drivers/scsi/osd/Makefile + create mode 100644 drivers/scsi/osd/osd_debug.h + create mode 100644 drivers/scsi/osd/osd_initiator.c + create mode 100644 drivers/scsi/osd/osd_ktests.c + create mode 100644 drivers/scsi/osd/osd_ktests.h + create mode 100644 drivers/scsi/osd/osd_uld.c + create mode 100644 include/scsi/osd_attributes.h + create mode 100644 include/scsi/osd_initiator.h + create mode 100644 include/scsi/osd_protocol.h + create mode 100644 include/scsi/osd_sec.h + create mode 100644 include/scsi/osd_sense.h + create mode 100644 include/scsi/osd_types.h +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Auto-merged fs/fuse/dev.c +Auto-merged fs/fuse/dir.c +Auto-merged fs/fuse/file.c +Merge made by recursive. + fs/fuse/control.c | 6 +- + fs/fuse/dev.c | 113 ++++++++--- + fs/fuse/dir.c | 48 +++--- + fs/fuse/file.c | 457 ++++++++++++++++++++++++++++++++++++++++++-- + fs/fuse/fuse_i.h | 83 ++++++--- + fs/fuse/inode.c | 157 ++++++++------- + include/linux/fuse.h | 79 +++++++- + include/linux/miscdevice.h | 42 ++-- + 8 files changed, 783 insertions(+), 202 deletions(-) +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Auto-merged Documentation/RCU/00-INDEX +Merge made by recursive. + Documentation/RCU/00-INDEX | 2 + + Documentation/RCU/rcubarrier.txt | 304 ++++++++++++++++++++++++++++++++++++++ + Documentation/bad_memory.txt | 45 ++++++ + 3 files changed, 351 insertions(+), 0 deletions(-) + create mode 100644 Documentation/RCU/rcubarrier.txt + create mode 100644 Documentation/bad_memory.txt +Merging nommu/master +$ git merge nommu/master +Auto-merged arch/powerpc/lib/dma-noncoherent.c +Auto-merged fs/binfmt_elf_fdpic.c +Auto-merged fs/binfmt_flat.c +Auto-merged include/linux/mm.h +Auto-merged include/linux/mm_types.h +Auto-merged ipc/shm.c +Auto-merged kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merged kernel/sysctl.c +Auto-merged lib/Kconfig.debug +Auto-merged mm/mmap.c +Auto-merged mm/nommu.c +Resolved 'kernel/fork.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit ba8bdc1: Merge commit 'nommu/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/nommu-mmap.txt | 31 +- + Documentation/sysctl/vm.txt | 18 + + arch/arm/include/asm/mmu.h | 1 - + arch/arm/mm/dma-mapping.c | 28 +- + arch/blackfin/include/asm/mmu.h | 1 - + arch/blackfin/kernel/ptrace.c | 6 +- + arch/blackfin/kernel/traps.c | 11 +- + arch/frv/kernel/ptrace.c | 11 +- + arch/h8300/include/asm/mmu.h | 1 - + arch/m68knommu/include/asm/mmu.h | 1 - + arch/sh/include/asm/mmu.h | 1 - + fs/binfmt_elf_fdpic.c | 35 +-- + fs/binfmt_flat.c | 34 +- + fs/proc/internal.h | 2 - + fs/proc/meminfo.c | 6 + + fs/proc/nommu.c | 71 ++-- + fs/proc/task_nommu.c | 120 ++++-- + include/asm-frv/mmu.h | 1 - + include/asm-m32r/mmu.h | 1 - + include/linux/mm.h | 26 +- + include/linux/mm_types.h | 19 +- + init/initramfs.c | 1 + + ipc/shm.c | 12 + + kernel/fork.c | 4 +- + kernel/sysctl.c | 14 + + lib/Kconfig.debug | 7 + + mm/mmap.c | 10 + + mm/nommu.c | 1027 ++++++++++++++++++++++++++------------ + mm/tiny-shmem.c | 11 - + 29 files changed, 982 insertions(+), 529 deletions(-) +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merged CREDITS +Auto-merged MAINTAINERS +Auto-merged drivers/hwmon/fschmd.c +Auto-merged drivers/input/keyboard/atkbd.c +Auto-merged drivers/scsi/qla1280.c +Auto-merged drivers/scsi/scsi_error.c +Auto-merged fs/proc/task_nommu.c +Auto-merged include/acpi/actypes.h +Auto-merged include/linux/mtd/mtd.h +Auto-merged include/linux/spi/spi.h +Auto-merged init/main.c +Auto-merged mm/slub.c +Auto-merged sound/usb/usx2y/usbusx2y.c +Merge made by recursive. + CREDITS | 2 +- + Documentation/dell_rbu.txt | 4 ++-- + Documentation/hwmon/abituguru-datasheet | 6 +++--- + Documentation/laptops/thinkpad-acpi.txt | 2 +- + Documentation/networking/rxrpc.txt | 2 +- + Documentation/networking/tuntap.txt | 2 +- + Documentation/scsi/ChangeLog.lpfc | 2 +- + Documentation/scsi/ChangeLog.ncr53c8xx | 2 +- + Documentation/scsi/ChangeLog.sym53c8xx | 2 +- + MAINTAINERS | 3 ++- + arch/blackfin/kernel/kgdb.c | 2 +- + arch/cris/arch-v32/kernel/signal.c | 2 +- + arch/ia64/kernel/kprobes.c | 2 +- + arch/m68k/Kconfig | 2 +- + arch/m68k/kernel/traps.c | 2 +- + arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c | 2 +- + arch/powerpc/boot/Makefile | 2 +- + arch/powerpc/kernel/kprobes.c | 2 +- + arch/powerpc/oprofile/cell/spu_profiler.c | 2 +- + arch/s390/Kconfig | 2 +- + arch/s390/kernel/kprobes.c | 2 +- + arch/sparc/kernel/kprobes.c | 2 +- + arch/x86/kernel/kprobes.c | 2 +- + arch/x86/kernel/mfgpt_32.c | 2 +- + drivers/acpi/acpi_memhotplug.c | 2 +- + drivers/acpi/executer/exprep.c | 2 +- + drivers/acpi/executer/exresolv.c | 2 +- + drivers/acpi/executer/exstore.c | 2 +- + drivers/acpi/resources/rscreate.c | 2 +- + drivers/acpi/utilities/utobject.c | 4 ++-- + drivers/base/Kconfig | 2 +- + drivers/char/epca.c | 2 +- + drivers/cpufreq/Kconfig | 4 ++-- + drivers/hwmon/fschmd.c | 2 +- + drivers/infiniband/hw/mlx4/cq.c | 2 +- + drivers/input/keyboard/atkbd.c | 2 +- + drivers/macintosh/Kconfig | 2 +- + drivers/message/i2o/i2o_scsi.c | 2 +- + drivers/misc/ibmasm/event.c | 2 +- + drivers/misc/phantom.c | 2 +- + drivers/mtd/devices/pmc551.c | 2 +- + drivers/mtd/ubi/eba.c | 2 +- + drivers/mtd/ubi/io.c | 2 +- + drivers/mtd/ubi/scan.c | 2 +- + drivers/mtd/ubi/ubi-media.h | 4 ++-- + drivers/mtd/ubi/vtbl.c | 2 +- + drivers/mtd/ubi/wl.c | 4 ++-- + drivers/net/bnx2x_link.c | 2 +- + drivers/net/e1000/e1000_hw.c | 4 ++-- + drivers/net/slip.h | 2 +- + drivers/net/tehuti.c | 4 ++-- + drivers/net/tokenring/smctr.c | 2 +- + drivers/net/wireless/atmel.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 4 ++-- + drivers/net/wireless/rt2x00/rt2x00crypto.c | 4 ++-- + drivers/net/wireless/strip.c | 2 +- + drivers/rtc/rtc-ds1511.c | 2 +- + drivers/rtc/rtc-stk17ta8.c | 2 +- + drivers/s390/block/dasd_eer.c | 4 ++-- + drivers/s390/char/vmlogrdr.c | 4 ++-- + drivers/scsi/a100u2w.c | 2 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 4 ++-- + drivers/scsi/lpfc/lpfc_sli.c | 10 +++++----- + drivers/scsi/megaraid.c | 4 ++-- + drivers/scsi/qla1280.c | 4 ++-- + drivers/scsi/qla4xxx/ql4_mbx.c | 2 +- + drivers/scsi/scsi_error.c | 2 +- + drivers/serial/8250.c | 2 +- + drivers/serial/crisv10.c | 4 ++-- + drivers/uwb/i1480/dfu/usb.c | 2 +- + drivers/video/console/vgacon.c | 2 +- + fs/ncpfs/ioctl.c | 2 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/proc/task_nommu.c | 2 +- + fs/ubifs/Kconfig | 2 +- + fs/ubifs/budget.c | 4 ++-- + fs/ubifs/gc.c | 2 +- + fs/ubifs/journal.c | 2 +- + fs/ubifs/shrinker.c | 2 +- + fs/xfs/linux-2.6/xfs_super.c | 2 +- + include/acpi/acmacros.h | 4 ++-- + include/acpi/actypes.h | 2 +- + include/linux/mtd/mtd.h | 2 +- + include/linux/ncp_fs.h | 2 +- + include/linux/spi/spi.h | 4 ++-- + include/mtd/ubi-user.h | 2 +- + init/main.c | 3 ++- + kernel/pid.c | 2 +- + kernel/printk.c | 2 +- + kernel/time/jiffies.c | 2 +- + lib/radix-tree.c | 11 ++++++----- + mm/slub.c | 2 +- + net/sctp/auth.c | 4 ++-- + net/sctp/sm_statefuns.c | 6 +++--- + net/sctp/socket.c | 2 +- + net/sctp/tsnmap.c | 2 +- + sound/oss/aedsp16.c | 2 +- + sound/usb/usx2y/usbusx2y.c | 2 +- + 98 files changed, 132 insertions(+), 129 deletions(-) +Merging squashfs/master +$ git merge squashfs/master +Auto-merged MAINTAINERS +Auto-merged fs/Kconfig +Auto-merged fs/Makefile +Merge made by recursive. + Documentation/filesystems/squashfs.txt | 225 ++++++++++++++ + MAINTAINERS | 7 + + fs/Kconfig | 52 ++++ + fs/Makefile | 1 + + fs/squashfs/Makefile | 8 + + fs/squashfs/block.c | 274 +++++++++++++++++ + fs/squashfs/cache.c | 412 ++++++++++++++++++++++++++ + fs/squashfs/dir.c | 235 +++++++++++++++ + fs/squashfs/export.c | 155 ++++++++++ + fs/squashfs/file.c | 502 ++++++++++++++++++++++++++++++++ + fs/squashfs/fragment.c | 98 +++++++ + fs/squashfs/id.c | 94 ++++++ + fs/squashfs/inode.c | 346 ++++++++++++++++++++++ + fs/squashfs/namei.c | 242 +++++++++++++++ + fs/squashfs/squashfs.h | 90 ++++++ + fs/squashfs/squashfs_fs.h | 381 ++++++++++++++++++++++++ + fs/squashfs/squashfs_fs_i.h | 45 +++ + fs/squashfs/squashfs_fs_sb.h | 76 +++++ + fs/squashfs/super.c | 440 ++++++++++++++++++++++++++++ + fs/squashfs/symlink.c | 118 ++++++++ + init/do_mounts_rd.c | 14 + + 21 files changed, 3815 insertions(+), 0 deletions(-) + create mode 100644 Documentation/filesystems/squashfs.txt + create mode 100644 fs/squashfs/Makefile + create mode 100644 fs/squashfs/block.c + create mode 100644 fs/squashfs/cache.c + create mode 100644 fs/squashfs/dir.c + create mode 100644 fs/squashfs/export.c + create mode 100644 fs/squashfs/file.c + create mode 100644 fs/squashfs/fragment.c + create mode 100644 fs/squashfs/id.c + create mode 100644 fs/squashfs/inode.c + create mode 100644 fs/squashfs/namei.c + create mode 100644 fs/squashfs/squashfs.h + create mode 100644 fs/squashfs/squashfs_fs.h + create mode 100644 fs/squashfs/squashfs_fs_i.h + create mode 100644 fs/squashfs/squashfs_fs_sb.h + create mode 100644 fs/squashfs/super.c + create mode 100644 fs/squashfs/symlink.c +Merging quilt/staging +$ git merge quilt/staging +Auto-merged drivers/staging/go7007/go7007-v4l2.c +Removed drivers/staging/winbond/adapter.h +Removed drivers/staging/winbond/linux/common.h +Removed drivers/staging/winbond/linux/sysdef.h +Removed drivers/staging/winbond/linux/wb35rx_f.h +Removed drivers/staging/winbond/linux/wb35tx_f.h +Removed drivers/staging/winbond/linux/wbusb.c +Removed drivers/staging/winbond/linux/wbusb_f.h +Removed drivers/staging/winbond/rxisr.c +Removed drivers/staging/winbond/sme_api.c +Removed drivers/staging/winbond/wblinux.c +Removed drivers/staging/winbond/wblinux_s.h +Removed drivers/staging/wlan-ng/hfa384x.c +Removed drivers/staging/wlan-ng/p80211mod.c +Removed drivers/staging/wlan-ng/prism2_cs.c +Removed drivers/staging/wlan-ng/prism2_pci.c +Removed drivers/staging/wlan-ng/prism2_plx.c +Removed drivers/staging/wlan-ng/version.h +Merge made by recursive. + arch/arm/Kconfig | 2 + + arch/cris/Kconfig | 2 + + arch/h8300/Kconfig | 2 + + drivers/staging/Kconfig | 32 + + drivers/staging/Makefile | 16 + + drivers/staging/agnx/Kconfig | 5 + + drivers/staging/agnx/Makefile | 8 + + drivers/staging/agnx/TODO | 22 + + drivers/staging/agnx/agnx.h | 154 + + drivers/staging/agnx/debug.h | 418 + + drivers/staging/agnx/pci.c | 644 ++ + drivers/staging/agnx/phy.c | 960 +++ + drivers/staging/agnx/phy.h | 409 + + drivers/staging/agnx/rf.c | 894 ++ + drivers/staging/agnx/sta.c | 219 + + drivers/staging/agnx/sta.h | 222 + + drivers/staging/agnx/table.c | 168 + + drivers/staging/agnx/table.h | 10 + + drivers/staging/agnx/xmit.c | 819 ++ + drivers/staging/agnx/xmit.h | 250 + + drivers/staging/altpciechdma/Kconfig | 10 + + drivers/staging/altpciechdma/Makefile | 2 + + drivers/staging/altpciechdma/TODO | 15 + + drivers/staging/altpciechdma/altpciechdma.c | 1184 +++ + drivers/staging/android/Kconfig | 86 + + drivers/staging/android/Makefile | 5 + + drivers/staging/android/TODO | 10 + + drivers/staging/android/binder.c | 3503 ++++++++ + drivers/staging/android/binder.h | 330 + + drivers/staging/android/logger.c | 607 ++ + drivers/staging/android/logger.h | 48 + + drivers/staging/android/lowmemorykiller.c | 119 + + drivers/staging/android/ram_console.c | 395 + + drivers/staging/android/timed_gpio.c | 177 + + drivers/staging/android/timed_gpio.h | 31 + + drivers/staging/asus_oled/Kconfig | 6 + + drivers/staging/asus_oled/Makefile | 1 + + drivers/staging/asus_oled/README | 156 + + drivers/staging/asus_oled/TODO | 10 + + drivers/staging/asus_oled/asus_oled.c | 745 ++ + drivers/staging/asus_oled/linux.txt | 33 + + drivers/staging/asus_oled/linux_f.txt | 18 + + drivers/staging/asus_oled/linux_fr.txt | 33 + + drivers/staging/asus_oled/tux.txt | 33 + + drivers/staging/asus_oled/tux_r.txt | 33 + + drivers/staging/asus_oled/tux_r2.txt | 33 + + drivers/staging/asus_oled/zig.txt | 33 + + drivers/staging/at76_usb/Kconfig | 2 +- + drivers/staging/at76_usb/at76_usb.c | 4640 +++--------- + drivers/staging/at76_usb/at76_usb.h | 227 +- + drivers/staging/benet/Kconfig | 7 + + drivers/staging/benet/MAINTAINERS | 6 + + drivers/staging/benet/Makefile | 14 + + drivers/staging/benet/TODO | 6 + + drivers/staging/benet/asyncmesg.h | 82 + + drivers/staging/benet/be_cm.h | 134 + + drivers/staging/benet/be_common.h | 53 + + drivers/staging/benet/be_ethtool.c | 348 + + drivers/staging/benet/be_init.c | 1382 ++++ + drivers/staging/benet/be_int.c | 863 ++ + drivers/staging/benet/be_netif.c | 705 ++ + drivers/staging/benet/benet.h | 429 + + drivers/staging/benet/bestatus.h | 103 + + drivers/staging/benet/cev.h | 243 + + drivers/staging/benet/cq.c | 211 + + drivers/staging/benet/descriptors.h | 71 + + drivers/staging/benet/doorbells.h | 179 + + drivers/staging/benet/ep.h | 66 + + drivers/staging/benet/eq.c | 299 + + drivers/staging/benet/eth.c | 1273 +++ + drivers/staging/benet/etx_context.h | 55 + + drivers/staging/benet/funcobj.c | 565 ++ + drivers/staging/benet/fwcmd_common.h | 222 + + drivers/staging/benet/fwcmd_common_bmap.h | 717 ++ + drivers/staging/benet/fwcmd_eth_bmap.h | 280 + + drivers/staging/benet/fwcmd_hdr_bmap.h | 54 + + drivers/staging/benet/fwcmd_mcc.h | 94 + + drivers/staging/benet/fwcmd_opcodes.h | 244 + + drivers/staging/benet/fwcmd_types_bmap.h | 29 + + drivers/staging/benet/host_struct.h | 182 + + drivers/staging/benet/hwlib.h | 830 ++ + drivers/staging/benet/mpu.c | 1364 +++ + drivers/staging/benet/mpu.h | 74 + + drivers/staging/benet/mpu_context.h | 46 + + drivers/staging/benet/pcicfg.h | 825 ++ + drivers/staging/benet/post_codes.h | 111 + + drivers/staging/benet/regmap.h | 68 + + drivers/staging/comedi/Kconfig | 27 + + drivers/staging/comedi/Makefile | 17 + + drivers/staging/comedi/TODO | 14 + + drivers/staging/comedi/comedi.h | 916 +++ + drivers/staging/comedi/comedi_compat32.c | 597 ++ + drivers/staging/comedi/comedi_compat32.h | 58 + + drivers/staging/comedi/comedi_fops.c | 2244 +++++ + drivers/staging/comedi/comedi_fops.h | 8 + + drivers/staging/comedi/comedi_ksyms.c | 77 + + drivers/staging/comedi/comedi_rt.h | 150 + + drivers/staging/comedi/comedidev.h | 537 ++ + drivers/staging/comedi/comedilib.h | 192 + + drivers/staging/comedi/drivers.c | 846 ++ + drivers/staging/comedi/drivers/Makefile | 21 + + drivers/staging/comedi/drivers/comedi_bond.c | 535 ++ + drivers/staging/comedi/drivers/comedi_fc.c | 118 + + drivers/staging/comedi/drivers/comedi_fc.h | 76 + + drivers/staging/comedi/drivers/comedi_parport.c | 390 + + drivers/staging/comedi/drivers/comedi_pci.h | 60 + + drivers/staging/comedi/drivers/comedi_test.c | 527 ++ + drivers/staging/comedi/drivers/dt9812.c | 1162 +++ + drivers/staging/comedi/drivers/icp_multi.c | 1085 +++ + drivers/staging/comedi/drivers/icp_multi.h | 278 + + drivers/staging/comedi/drivers/me4000.c | 2362 ++++++ + drivers/staging/comedi/drivers/me4000.h | 446 + + drivers/staging/comedi/drivers/me_daq.c | 845 ++ + drivers/staging/comedi/drivers/mite.c | 809 ++ + drivers/staging/comedi/drivers/mite.h | 453 + + drivers/staging/comedi/drivers/plx9080.h | 429 + + drivers/staging/comedi/drivers/rtd520.c | 2283 ++++++ + drivers/staging/comedi/drivers/rtd520.h | 412 + + drivers/staging/comedi/drivers/s626.c | 3254 ++++++++ + drivers/staging/comedi/drivers/s626.h | 802 ++ + drivers/staging/comedi/drivers/usbdux.c | 2932 +++++++ + drivers/staging/comedi/drivers/usbduxfast.c | 1778 ++++ + drivers/staging/comedi/interrupt.h | 60 + + drivers/staging/comedi/kcomedilib/Makefile | 8 + + drivers/staging/comedi/kcomedilib/data.c | 89 + + drivers/staging/comedi/kcomedilib/dio.c | 95 + + drivers/staging/comedi/kcomedilib/get.c | 294 + + .../staging/comedi/kcomedilib/kcomedilib_main.c | 567 ++ + drivers/staging/comedi/kcomedilib/ksyms.c | 144 + + drivers/staging/comedi/pci_ids.h | 31 + + drivers/staging/comedi/proc.c | 102 + + drivers/staging/comedi/range.c | 161 + + drivers/staging/comedi/rt.c | 412 + + drivers/staging/comedi/rt_pend_tq.c | 113 + + drivers/staging/comedi/rt_pend_tq.h | 10 + + drivers/staging/comedi/wrapper.h | 25 + + drivers/staging/echo/TODO | 2 - + drivers/staging/echo/echo.h | 4 +- + drivers/staging/echo/fir.h | 44 +- + drivers/staging/echo/mmx.h | 8 +- + drivers/staging/epl/Benchmark.h | 437 + + drivers/staging/epl/Debug.h | 734 ++ + drivers/staging/epl/Edrv8139.c | 1252 +++ + drivers/staging/epl/EdrvFec.h | 114 + + drivers/staging/epl/EdrvFec5282.h | 340 + + drivers/staging/epl/EdrvSim.h | 89 + + drivers/staging/epl/Epl.h | 273 + + drivers/staging/epl/EplAmi.h | 362 + + drivers/staging/epl/EplApiGeneric.c | 2060 +++++ + drivers/staging/epl/EplApiLinux.h | 141 + + drivers/staging/epl/EplApiLinuxKernel.c | 1260 +++ + drivers/staging/epl/EplApiProcessImage.c | 347 + + drivers/staging/epl/EplCfg.h | 196 + + drivers/staging/epl/EplDef.h | 355 + + drivers/staging/epl/EplDll.h | 205 + + drivers/staging/epl/EplDllCal.h | 123 + + drivers/staging/epl/EplDllk.c | 4054 +++++++++ + drivers/staging/epl/EplDllkCal.c | 1260 +++ + drivers/staging/epl/EplDlluCal.c | 529 ++ + drivers/staging/epl/EplErrDef.h | 294 + + drivers/staging/epl/EplErrorHandlerk.c | 810 ++ + drivers/staging/epl/EplEvent.h | 279 + + drivers/staging/epl/EplEventk.c | 853 ++ + drivers/staging/epl/EplEventu.c | 814 ++ + drivers/staging/epl/EplFrame.h | 344 + + drivers/staging/epl/EplIdentu.c | 488 ++ + drivers/staging/epl/EplInc.h | 385 + + drivers/staging/epl/EplInstDef.h | 377 + + drivers/staging/epl/EplLed.h | 92 + + drivers/staging/epl/EplNmt.h | 230 + + drivers/staging/epl/EplNmtCnu.c | 704 ++ + drivers/staging/epl/EplNmtMnu.c | 2835 +++++++ + drivers/staging/epl/EplNmtk.c | 1842 +++++ + drivers/staging/epl/EplNmtkCal.c | 149 + + drivers/staging/epl/EplNmtu.c | 708 ++ + drivers/staging/epl/EplNmtuCal.c | 158 + + drivers/staging/epl/EplObd.c | 3262 ++++++++ + drivers/staging/epl/EplObd.h | 464 ++ + drivers/staging/epl/EplObdMacro.h | 354 + + drivers/staging/epl/EplObdkCal.c | 147 + + drivers/staging/epl/EplObdu.c | 517 ++ + drivers/staging/epl/EplObduCal.c | 558 ++ + drivers/staging/epl/EplObjDef.h | 208 + + drivers/staging/epl/EplPdo.h | 117 + + drivers/staging/epl/EplPdok.c | 694 ++ + drivers/staging/epl/EplPdokCal.c | 266 + + drivers/staging/epl/EplPdou.c | 565 ++ + drivers/staging/epl/EplSdo.h | 245 + + drivers/staging/epl/EplSdoAc.h | 111 + + drivers/staging/epl/EplSdoAsndu.c | 483 ++ + drivers/staging/epl/EplSdoAsySequ.c | 2522 ++++++ + drivers/staging/epl/EplSdoComu.c | 3346 ++++++++ + drivers/staging/epl/EplSdoUdpu.c | 790 ++ + drivers/staging/epl/EplStatusu.c | 380 + + drivers/staging/epl/EplTarget.h | 233 + + drivers/staging/epl/EplTimer.h | 117 + + drivers/staging/epl/EplTimeruLinuxKernel.c | 446 + + drivers/staging/epl/EplTimeruNull.c | 312 + + drivers/staging/epl/EplTimeruWin32.c | 513 ++ + drivers/staging/epl/EplVersion.h | 98 + + drivers/staging/epl/Kconfig | 6 + + drivers/staging/epl/Makefile | 41 + + drivers/staging/epl/SharedBuff.c | 1799 ++++ + drivers/staging/epl/SharedBuff.h | 204 + + drivers/staging/epl/ShbIpc-LinuxKernel.c | 966 +++ + drivers/staging/epl/ShbIpc-Win32.c | 1202 +++ + drivers/staging/epl/ShbIpc.h | 125 + + drivers/staging/epl/ShbLinuxKernel.h | 68 + + drivers/staging/epl/SocketLinuxKernel.c | 197 + + drivers/staging/epl/SocketLinuxKernel.h | 105 + + drivers/staging/epl/TimerHighReskX86.c | 522 ++ + drivers/staging/epl/VirtualEthernetLinux.c | 342 + + drivers/staging/epl/amix86.c | 905 ++ + drivers/staging/epl/demo_main.c | 961 +++ + drivers/staging/epl/edrv.h | 167 + + drivers/staging/epl/global.h | 1391 ++++ + drivers/staging/epl/kernel/EplDllk.h | 165 + + drivers/staging/epl/kernel/EplDllkCal.h | 141 + + drivers/staging/epl/kernel/EplErrorHandlerk.h | 100 + + drivers/staging/epl/kernel/EplEventk.h | 108 + + drivers/staging/epl/kernel/EplNmtk.h | 105 + + drivers/staging/epl/kernel/EplNmtkCal.h | 89 + + drivers/staging/epl/kernel/EplObdk.h | 196 + + drivers/staging/epl/kernel/EplObdkCal.h | 89 + + drivers/staging/epl/kernel/EplPdok.h | 110 + + drivers/staging/epl/kernel/EplPdokCal.h | 99 + + drivers/staging/epl/kernel/EplTimerHighResk.h | 109 + + drivers/staging/epl/kernel/EplTimerk.h | 118 + + drivers/staging/epl/kernel/VirtualEthernet.h | 96 + + drivers/staging/epl/proc_fs.c | 409 + + drivers/staging/epl/proc_fs.h | 89 + + drivers/staging/epl/user/EplCfgMau.h | 284 + + drivers/staging/epl/user/EplDllu.h | 108 + + drivers/staging/epl/user/EplDlluCal.h | 117 + + drivers/staging/epl/user/EplEventu.h | 108 + + drivers/staging/epl/user/EplIdentu.h | 108 + + drivers/staging/epl/user/EplLedu.h | 109 + + drivers/staging/epl/user/EplNmtCnu.h | 108 + + drivers/staging/epl/user/EplNmtMnu.h | 131 + + drivers/staging/epl/user/EplNmtu.h | 155 + + drivers/staging/epl/user/EplNmtuCal.h | 91 + + drivers/staging/epl/user/EplObdu.h | 192 + + drivers/staging/epl/user/EplObduCal.h | 148 + + drivers/staging/epl/user/EplPdou.h | 108 + + drivers/staging/epl/user/EplSdoAsndu.h | 107 + + drivers/staging/epl/user/EplSdoAsySequ.h | 111 + + drivers/staging/epl/user/EplSdoComu.h | 126 + + drivers/staging/epl/user/EplSdoUdpu.h | 109 + + drivers/staging/epl/user/EplStatusu.h | 104 + + drivers/staging/epl/user/EplTimeru.h | 107 + + drivers/staging/et131x/et1310_tx.c | 3 - + drivers/staging/et131x/et131x_debug.h | 160 +- + drivers/staging/frontier/Kconfig | 6 + + drivers/staging/frontier/Makefile | 2 + + drivers/staging/frontier/README | 28 + + drivers/staging/frontier/TODO | 9 + + drivers/staging/frontier/alphatrack.c | 853 ++ + drivers/staging/frontier/alphatrack.h | 92 + + drivers/staging/frontier/frontier_compat.h | 63 + + drivers/staging/frontier/surface_sysfs.h | 100 + + drivers/staging/frontier/tranzport.c | 1006 +++ + drivers/staging/go7007/Kconfig | 10 + + drivers/staging/go7007/Makefile | 15 +- + drivers/staging/go7007/go7007-driver.c | 5 +- + drivers/staging/go7007/go7007-fw.c | 30 +- + drivers/staging/go7007/go7007-priv.h | 2 + + drivers/staging/go7007/go7007-usb.c | 95 +- + drivers/staging/go7007/go7007-v4l2.c | 1703 +++-- + drivers/staging/go7007/go7007.txt | 481 ++ + drivers/staging/go7007/s2250-board.c | 630 ++ + drivers/staging/go7007/s2250-loader.c | 188 + + drivers/staging/go7007/saa7134-go7007.c | 52 +- + drivers/staging/go7007/wis-i2c.h | 1 + + drivers/staging/go7007/wis-sony-tuner.c | 2 +- + drivers/staging/me4000/me4000.c | 99 +- + drivers/staging/meilhaus/Kconfig | 127 + + drivers/staging/meilhaus/Makefile | 43 + + drivers/staging/meilhaus/TODO | 10 + + drivers/staging/meilhaus/me0600_device.c | 215 + + drivers/staging/meilhaus/me0600_device.h | 97 + + drivers/staging/meilhaus/me0600_dio.c | 415 + + drivers/staging/meilhaus/me0600_dio.h | 68 + + drivers/staging/meilhaus/me0600_dio_reg.h | 41 + + drivers/staging/meilhaus/me0600_ext_irq.c | 478 ++ + drivers/staging/meilhaus/me0600_ext_irq.h | 58 + + drivers/staging/meilhaus/me0600_ext_irq_reg.h | 18 + + drivers/staging/meilhaus/me0600_optoi.c | 243 + + drivers/staging/meilhaus/me0600_optoi.h | 58 + + drivers/staging/meilhaus/me0600_optoi_reg.h | 35 + + drivers/staging/meilhaus/me0600_relay.c | 359 + + drivers/staging/meilhaus/me0600_relay.h | 63 + + drivers/staging/meilhaus/me0600_relay_reg.h | 36 + + drivers/staging/meilhaus/me0600_ttli.c | 238 + + drivers/staging/meilhaus/me0600_ttli.h | 58 + + drivers/staging/meilhaus/me0600_ttli_reg.h | 35 + + drivers/staging/meilhaus/me0900_device.c | 180 + + drivers/staging/meilhaus/me0900_device.h | 92 + + drivers/staging/meilhaus/me0900_di.c | 246 + + drivers/staging/meilhaus/me0900_di.h | 65 + + drivers/staging/meilhaus/me0900_do.c | 314 + + drivers/staging/meilhaus/me0900_do.h | 68 + + drivers/staging/meilhaus/me0900_reg.h | 40 + + drivers/staging/meilhaus/me1000_device.c | 208 + + drivers/staging/meilhaus/me1000_device.h | 59 + + drivers/staging/meilhaus/me1000_dio.c | 438 + + drivers/staging/meilhaus/me1000_dio.h | 71 + + drivers/staging/meilhaus/me1000_dio_reg.h | 50 + + drivers/staging/meilhaus/me1400_device.c | 256 + + drivers/staging/meilhaus/me1400_device.h | 108 + + drivers/staging/meilhaus/me1400_ext_irq.c | 517 ++ + drivers/staging/meilhaus/me1400_ext_irq.h | 62 + + drivers/staging/meilhaus/me1400_ext_irq_reg.h | 56 + + drivers/staging/meilhaus/me1600_ao.c | 1033 +++ + drivers/staging/meilhaus/me1600_ao.h | 132 + + drivers/staging/meilhaus/me1600_ao_reg.h | 66 + + drivers/staging/meilhaus/me1600_device.c | 261 + + drivers/staging/meilhaus/me1600_device.h | 101 + + drivers/staging/meilhaus/me4600_ai.c | 3434 ++++++++ + drivers/staging/meilhaus/me4600_ai.h | 180 + + drivers/staging/meilhaus/me4600_ai_reg.h | 107 + + drivers/staging/meilhaus/me4600_ao.c | 6011 ++++++++++++++ + drivers/staging/meilhaus/me4600_ao.h | 263 + + drivers/staging/meilhaus/me4600_ao_reg.h | 113 + + drivers/staging/meilhaus/me4600_device.c | 373 + + drivers/staging/meilhaus/me4600_device.h | 151 + + drivers/staging/meilhaus/me4600_di.c | 256 + + drivers/staging/meilhaus/me4600_di.h | 64 + + drivers/staging/meilhaus/me4600_dio.c | 510 ++ + drivers/staging/meilhaus/me4600_dio.h | 69 + + drivers/staging/meilhaus/me4600_dio_reg.h | 63 + + drivers/staging/meilhaus/me4600_do.c | 433 + + drivers/staging/meilhaus/me4600_do.h | 65 + + drivers/staging/meilhaus/me4600_ext_irq.c | 467 ++ + drivers/staging/meilhaus/me4600_ext_irq.h | 78 + + drivers/staging/meilhaus/me4600_ext_irq_reg.h | 41 + + drivers/staging/meilhaus/me4600_reg.h | 46 + + drivers/staging/meilhaus/me6000_ao.c | 3739 +++++++++ + drivers/staging/meilhaus/me6000_ao.h | 200 + + drivers/staging/meilhaus/me6000_ao_reg.h | 177 + + drivers/staging/meilhaus/me6000_device.c | 211 + + drivers/staging/meilhaus/me6000_device.h | 149 + + drivers/staging/meilhaus/me6000_dio.c | 415 + + drivers/staging/meilhaus/me6000_dio.h | 68 + + drivers/staging/meilhaus/me6000_dio_reg.h | 43 + + drivers/staging/meilhaus/me6000_reg.h | 35 + + drivers/staging/meilhaus/me8100_device.c | 187 + + drivers/staging/meilhaus/me8100_device.h | 97 + + drivers/staging/meilhaus/me8100_di.c | 693 ++ + drivers/staging/meilhaus/me8100_di.h | 89 + + drivers/staging/meilhaus/me8100_di_reg.h | 47 + + drivers/staging/meilhaus/me8100_do.c | 391 + + drivers/staging/meilhaus/me8100_do.h | 70 + + drivers/staging/meilhaus/me8100_do_reg.h | 36 + + drivers/staging/meilhaus/me8100_reg.h | 41 + + drivers/staging/meilhaus/me8200_device.c | 194 + + drivers/staging/meilhaus/me8200_device.h | 97 + + drivers/staging/meilhaus/me8200_di.c | 857 ++ + drivers/staging/meilhaus/me8200_di.h | 92 + + drivers/staging/meilhaus/me8200_di_reg.h | 75 + + drivers/staging/meilhaus/me8200_dio.c | 418 + + drivers/staging/meilhaus/me8200_dio.h | 68 + + drivers/staging/meilhaus/me8200_dio_reg.h | 43 + + drivers/staging/meilhaus/me8200_do.c | 600 ++ + drivers/staging/meilhaus/me8200_do.h | 75 + + drivers/staging/meilhaus/me8200_do_reg.h | 40 + + drivers/staging/meilhaus/me8200_reg.h | 46 + + drivers/staging/meilhaus/me8254.c | 1176 +++ + drivers/staging/meilhaus/me8254.h | 80 + + drivers/staging/meilhaus/me8254_reg.h | 172 + + drivers/staging/meilhaus/me8255.c | 462 ++ + drivers/staging/meilhaus/me8255.h | 59 + + drivers/staging/meilhaus/me8255_reg.h | 50 + + drivers/staging/meilhaus/mecirc_buf.h | 131 + + drivers/staging/meilhaus/mecommon.h | 26 + + drivers/staging/meilhaus/medebug.h | 125 + + drivers/staging/meilhaus/medefines.h | 449 + + drivers/staging/meilhaus/medevice.c | 1740 ++++ + drivers/staging/meilhaus/medevice.h | 304 + + drivers/staging/meilhaus/medlist.c | 127 + + drivers/staging/meilhaus/medlist.h | 91 + + drivers/staging/meilhaus/medlock.c | 195 + + drivers/staging/meilhaus/medlock.h | 76 + + drivers/staging/meilhaus/medriver.h | 350 + + drivers/staging/meilhaus/medummy.c | 1266 +++ + drivers/staging/meilhaus/medummy.h | 40 + + drivers/staging/meilhaus/meerror.h | 100 + + drivers/staging/meilhaus/mefirmware.c | 137 + + drivers/staging/meilhaus/mefirmware.h | 57 + + drivers/staging/meilhaus/meids.h | 31 + + drivers/staging/meilhaus/meinternal.h | 363 + + drivers/staging/meilhaus/meioctl.h | 515 ++ + drivers/staging/meilhaus/memain.c | 2022 +++++ + drivers/staging/meilhaus/memain.h | 460 ++ + drivers/staging/meilhaus/meplx_reg.h | 53 + + drivers/staging/meilhaus/meslist.c | 173 + + drivers/staging/meilhaus/meslist.h | 108 + + drivers/staging/meilhaus/meslock.c | 136 + + drivers/staging/meilhaus/meslock.h | 73 + + drivers/staging/meilhaus/mesubdevice.c | 317 + + drivers/staging/meilhaus/mesubdevice.h | 197 + + drivers/staging/meilhaus/metempl_device.c | 137 + + drivers/staging/meilhaus/metempl_device.h | 92 + + drivers/staging/meilhaus/metempl_sub.c | 149 + + drivers/staging/meilhaus/metempl_sub.h | 64 + + drivers/staging/meilhaus/metempl_sub_reg.h | 35 + + drivers/staging/meilhaus/metypes.h | 95 + + drivers/staging/mimio/Kconfig | 10 + + drivers/staging/mimio/Makefile | 1 + + drivers/staging/mimio/mimio.c | 914 +++ + drivers/staging/otus/80211core/amsdu.c | 134 + + drivers/staging/otus/80211core/cagg.c | 3611 ++++++++ + drivers/staging/otus/80211core/cagg.h | 435 + + drivers/staging/otus/80211core/ccmd.c | 1861 +++++ + drivers/staging/otus/80211core/cfunc.c | 1227 +++ + drivers/staging/otus/80211core/cfunc.h | 449 + + drivers/staging/otus/80211core/chb.c | 200 + + drivers/staging/otus/80211core/cic.c | 496 ++ + drivers/staging/otus/80211core/cinit.c | 1911 +++++ + drivers/staging/otus/80211core/cmm.c | 2141 +++++ + drivers/staging/otus/80211core/cmmap.c | 2402 ++++++ + drivers/staging/otus/80211core/cmmsta.c | 5782 +++++++++++++ + drivers/staging/otus/80211core/coid.c | 2695 ++++++ + drivers/staging/otus/80211core/cprecomp.h | 32 + + drivers/staging/otus/80211core/cpsmgr.c | 731 ++ + drivers/staging/otus/80211core/cscanmgr.c | 535 ++ + drivers/staging/otus/80211core/ctkip.c | 598 ++ + drivers/staging/otus/80211core/ctxrx.c | 4096 +++++++++ + drivers/staging/otus/80211core/cwep.c | 299 + + drivers/staging/otus/80211core/cwm.c | 131 + + drivers/staging/otus/80211core/cwm.h | 45 + + drivers/staging/otus/80211core/freqctrl.c | 259 + + drivers/staging/otus/80211core/ledmgr.c | 557 ++ + drivers/staging/otus/80211core/performance.c | 431 + + drivers/staging/otus/80211core/performance.h | 97 + + drivers/staging/otus/80211core/pub_usb.h | 102 + + drivers/staging/otus/80211core/pub_zfi.h | 821 ++ + drivers/staging/otus/80211core/pub_zfw.h | 93 + + drivers/staging/otus/80211core/queue.c | 303 + + drivers/staging/otus/80211core/queue.h | 37 + + drivers/staging/otus/80211core/ratectrl.c | 874 ++ + drivers/staging/otus/80211core/ratectrl.h | 37 + + drivers/staging/otus/80211core/struct.h | 1315 +++ + drivers/staging/otus/80211core/wlan.h | 595 ++ + drivers/staging/otus/Kconfig | 32 + + drivers/staging/otus/Makefile | 67 + + drivers/staging/otus/TODO | 9 + + drivers/staging/otus/apdbg.c | 457 + + drivers/staging/otus/athr_common.h | 141 + + drivers/staging/otus/hal/hpDKfwu.c | 832 ++ + drivers/staging/otus/hal/hpani.c | 732 ++ + drivers/staging/otus/hal/hpani.h | 420 + + drivers/staging/otus/hal/hpfw2.c | 1018 +++ + drivers/staging/otus/hal/hpfwbu.c | 5269 ++++++++++++ + drivers/staging/otus/hal/hpfwspiu.c | 655 ++ + drivers/staging/otus/hal/hpfwu.c | 1017 +++ + drivers/staging/otus/hal/hpfwu.c.drv_ba_resend | 742 ++ + drivers/staging/otus/hal/hpfwu_2k.c | 1016 +++ + drivers/staging/otus/hal/hpfwu_BA.c | 874 ++ + drivers/staging/otus/hal/hpfwu_FB50_mdk.c | 721 ++ + drivers/staging/otus/hal/hpfwu_OTUS_RC.c | 715 ++ + drivers/staging/otus/hal/hpfwu_txstream.c | 1017 +++ + drivers/staging/otus/hal/hpfwuinit.c | 240 + + drivers/staging/otus/hal/hpmain.c | 4643 +++++++++++ + drivers/staging/otus/hal/hpreg.c | 2481 ++++++ + drivers/staging/otus/hal/hpreg.h | 524 ++ + drivers/staging/otus/hal/hprw.c | 1557 ++++ + drivers/staging/otus/hal/hpusb.c | 1584 ++++ + drivers/staging/otus/hal/hpusb.h | 437 + + drivers/staging/otus/hal/otus.ini | 414 + + drivers/staging/otus/ioctl.c | 2913 +++++++ + drivers/staging/otus/oal_dt.h | 60 + + drivers/staging/otus/oal_marc.h | 135 + + drivers/staging/otus/usbdrv.c | 1148 +++ + drivers/staging/otus/usbdrv.h | 252 + + drivers/staging/otus/wrap_buf.c | 114 + + drivers/staging/otus/wrap_dbg.c | 101 + + drivers/staging/otus/wrap_ev.c | 283 + + drivers/staging/otus/wrap_mem.c | 101 + + drivers/staging/otus/wrap_mis.c | 109 + + drivers/staging/otus/wrap_pkt.c | 173 + + drivers/staging/otus/wrap_sec.c | 127 + + drivers/staging/otus/wrap_usb.c | 191 + + drivers/staging/otus/wwrap.c | 1134 +++ + drivers/staging/otus/zdcompat.h | 62 + + drivers/staging/otus/zdusb.c | 239 + + drivers/staging/otus/zdusb.h | 43 + + drivers/staging/panel/Kconfig | 278 + + drivers/staging/panel/Makefile | 1 + + drivers/staging/panel/TODO | 9 + + drivers/staging/panel/lcd-panel-cgram.txt | 24 + + drivers/staging/panel/panel.c | 2193 +++++ + drivers/staging/poch/README | 9 +- + drivers/staging/poch/poch.c | 104 +- + drivers/staging/rspiusb/Kconfig | 6 + + drivers/staging/rspiusb/Makefile | 1 + + drivers/staging/rspiusb/TODO | 22 + + drivers/staging/rspiusb/rspiusb.c | 887 ++ + drivers/staging/rspiusb/rspiusb.h | 25 + + drivers/staging/rt2860/2860_main_dev.c | 1377 ++++ + drivers/staging/rt2860/Kconfig | 5 + + drivers/staging/rt2860/Makefile | 43 + + drivers/staging/rt2860/TODO | 17 + + drivers/staging/rt2860/aironet.h | 210 + + drivers/staging/rt2860/ap.h | 557 ++ + drivers/staging/rt2860/chlist.h | 1296 +++ + drivers/staging/rt2860/common/2860_rtmp_init.c | 922 +++ + drivers/staging/rt2860/common/action.c | 1031 +++ + drivers/staging/rt2860/common/action.h | 68 + + drivers/staging/rt2860/common/ba_action.c | 1802 ++++ + drivers/staging/rt2860/common/cmm_data.c | 3466 ++++++++ + drivers/staging/rt2860/common/cmm_data_2860.c | 1240 +++ + drivers/staging/rt2860/common/cmm_info.c | 3417 ++++++++ + drivers/staging/rt2860/common/cmm_sanity.c | 1633 ++++ + drivers/staging/rt2860/common/cmm_sync.c | 702 ++ + drivers/staging/rt2860/common/cmm_wpa.c | 1606 ++++ + drivers/staging/rt2860/common/dfs.c | 453 + + drivers/staging/rt2860/common/eeprom.c | 244 + + drivers/staging/rt2860/common/firmware.h | 558 ++ + drivers/staging/rt2860/common/md5.c | 1427 ++++ + drivers/staging/rt2860/common/mlme.c | 8667 ++++++++++++++++++++ + drivers/staging/rt2860/common/netif_block.c | 144 + + drivers/staging/rt2860/common/netif_block.h | 58 + + drivers/staging/rt2860/common/rtmp_init.c | 3744 +++++++++ + drivers/staging/rt2860/common/rtmp_tkip.c | 1607 ++++ + drivers/staging/rt2860/common/rtmp_wep.c | 499 ++ + drivers/staging/rt2860/common/spectrum.c | 1877 +++++ + drivers/staging/rt2860/config.mk | 245 + + drivers/staging/rt2860/dfs.h | 100 + + drivers/staging/rt2860/leap.h | 215 + + drivers/staging/rt2860/link_list.h | 134 + + drivers/staging/rt2860/md4.h | 42 + + drivers/staging/rt2860/md5.h | 107 + + drivers/staging/rt2860/mlme.h | 1447 ++++ + drivers/staging/rt2860/oid.h | 995 +++ + drivers/staging/rt2860/rt2860.h | 349 + + drivers/staging/rt2860/rt28xx.h | 2714 ++++++ + drivers/staging/rt2860/rt_ate.c | 6025 ++++++++++++++ + drivers/staging/rt2860/rt_ate.h | 353 + + drivers/staging/rt2860/rt_config.h | 101 + + drivers/staging/rt2860/rt_linux.c | 1054 +++ + drivers/staging/rt2860/rt_linux.h | 926 +++ + drivers/staging/rt2860/rt_main_dev.c | 1686 ++++ + drivers/staging/rt2860/rt_profile.c | 1981 +++++ + drivers/staging/rt2860/rtmp.h | 7177 ++++++++++++++++ + drivers/staging/rt2860/rtmp_ckipmic.h | 113 + + drivers/staging/rt2860/rtmp_def.h | 1588 ++++ + drivers/staging/rt2860/rtmp_type.h | 94 + + drivers/staging/rt2860/spectrum.h | 322 + + drivers/staging/rt2860/spectrum_def.h | 95 + + drivers/staging/rt2860/sta/aironet.c | 1312 +++ + drivers/staging/rt2860/sta/assoc.c | 1826 +++++ + drivers/staging/rt2860/sta/auth.c | 474 ++ + drivers/staging/rt2860/sta/auth_rsp.c | 167 + + drivers/staging/rt2860/sta/connect.c | 2751 +++++++ + drivers/staging/rt2860/sta/dls.c | 2201 +++++ + drivers/staging/rt2860/sta/rtmp_data.c | 2614 ++++++ + drivers/staging/rt2860/sta/sanity.c | 420 + + drivers/staging/rt2860/sta/sync.c | 1959 +++++ + drivers/staging/rt2860/sta/wpa.c | 2086 +++++ + drivers/staging/rt2860/sta_ioctl.c | 6944 ++++++++++++++++ + drivers/staging/rt2860/wpa.h | 356 + + drivers/staging/rt2870/2870_main_dev.c | 1612 ++++ + drivers/staging/rt2870/Kconfig | 6 + + drivers/staging/rt2870/Makefile | 47 + + drivers/staging/rt2870/TODO | 10 + + drivers/staging/rt2870/aironet.h | 210 + + drivers/staging/rt2870/ap.h | 562 ++ + drivers/staging/rt2870/chlist.h | 1296 +++ + drivers/staging/rt2870/common/2870_rtmp_init.c | 1778 ++++ + drivers/staging/rt2870/common/action.c | 1046 +++ + drivers/staging/rt2870/common/action.h | 68 + + drivers/staging/rt2870/common/ba_action.c | 1798 ++++ + drivers/staging/rt2870/common/cmm_data.c | 2734 ++++++ + drivers/staging/rt2870/common/cmm_data_2870.c | 963 +++ + drivers/staging/rt2870/common/cmm_info.c | 3712 +++++++++ + drivers/staging/rt2870/common/cmm_sanity.c | 1663 ++++ + drivers/staging/rt2870/common/cmm_sync.c | 711 ++ + drivers/staging/rt2870/common/cmm_wpa.c | 1654 ++++ + drivers/staging/rt2870/common/dfs.c | 453 + + drivers/staging/rt2870/common/eeprom.c | 254 + + drivers/staging/rt2870/common/firmware.h | 558 ++ + drivers/staging/rt2870/common/md5.c | 1427 ++++ + drivers/staging/rt2870/common/mlme.c | 8609 +++++++++++++++++++ + drivers/staging/rt2870/common/netif_block.c | 144 + + drivers/staging/rt2870/common/rtmp_init.c | 4132 ++++++++++ + drivers/staging/rt2870/common/rtmp_tkip.c | 1613 ++++ + drivers/staging/rt2870/common/rtmp_wep.c | 508 ++ + drivers/staging/rt2870/common/rtusb_bulk.c | 1981 +++++ + drivers/staging/rt2870/common/rtusb_data.c | 229 + + drivers/staging/rt2870/common/rtusb_io.c | 2006 +++++ + drivers/staging/rt2870/common/spectrum.c | 1876 +++++ + drivers/staging/rt2870/dfs.h | 100 + + drivers/staging/rt2870/leap.h | 215 + + drivers/staging/rt2870/link_list.h | 134 + + drivers/staging/rt2870/md4.h | 42 + + drivers/staging/rt2870/md5.h | 107 + + drivers/staging/rt2870/mlme.h | 1471 ++++ + drivers/staging/rt2870/netif_block.h | 58 + + drivers/staging/rt2870/oid.h | 1091 +++ + drivers/staging/rt2870/rt2870.h | 761 ++ + drivers/staging/rt2870/rt28xx.h | 2689 ++++++ + drivers/staging/rt2870/rt_ate.c | 6452 +++++++++++++++ + drivers/staging/rt2870/rt_ate.h | 315 + + drivers/staging/rt2870/rt_config.h | 104 + + drivers/staging/rt2870/rt_linux.c | 1095 +++ + drivers/staging/rt2870/rt_linux.h | 908 ++ + drivers/staging/rt2870/rt_main_dev.c | 1863 +++++ + drivers/staging/rt2870/rt_profile.c | 2020 +++++ + drivers/staging/rt2870/rtmp.h | 7586 +++++++++++++++++ + drivers/staging/rt2870/rtmp_ckipmic.h | 113 + + drivers/staging/rt2870/rtmp_def.h | 1622 ++++ + drivers/staging/rt2870/rtmp_type.h | 94 + + drivers/staging/rt2870/spectrum.h | 322 + + drivers/staging/rt2870/spectrum_def.h | 95 + + drivers/staging/rt2870/sta/aironet.c | 1312 +++ + drivers/staging/rt2870/sta/assoc.c | 2039 +++++ + drivers/staging/rt2870/sta/auth.c | 474 ++ + drivers/staging/rt2870/sta/auth_rsp.c | 166 + + drivers/staging/rt2870/sta/connect.c | 2822 +++++++ + drivers/staging/rt2870/sta/dls.c | 2210 +++++ + drivers/staging/rt2870/sta/rtmp_data.c | 2619 ++++++ + drivers/staging/rt2870/sta/sanity.c | 420 + + drivers/staging/rt2870/sta/sync.c | 1753 ++++ + drivers/staging/rt2870/sta/wpa.c | 2107 +++++ + drivers/staging/rt2870/sta_ioctl.c | 7068 ++++++++++++++++ + drivers/staging/rt2870/sta_ioctl.c.patch | 18 + + drivers/staging/rt2870/tmp60 | 7037 ++++++++++++++++ + drivers/staging/rt2870/tmp61 | 7037 ++++++++++++++++ + drivers/staging/rt2870/wpa.h | 357 + + drivers/staging/rtl8187se/Kconfig | 5 + + drivers/staging/rtl8187se/Makefile | 55 + + drivers/staging/rtl8187se/dot11d.h | 101 + + drivers/staging/rtl8187se/ieee80211.h | 1755 ++++ + drivers/staging/rtl8187se/ieee80211/dot11d.c | 246 + + drivers/staging/rtl8187se/ieee80211/dot11d.h | 102 + + drivers/staging/rtl8187se/ieee80211/ieee80211.h | 1755 ++++ + .../staging/rtl8187se/ieee80211/ieee80211_crypt.c | 265 + + .../staging/rtl8187se/ieee80211/ieee80211_crypt.h | 86 + + .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 533 ++ + .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 1001 +++ + .../rtl8187se/ieee80211/ieee80211_crypt_wep.c | 394 + + .../staging/rtl8187se/ieee80211/ieee80211_module.c | 301 + + drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 1971 +++++ + .../rtl8187se/ieee80211/ieee80211_softmac.c | 4029 +++++++++ + .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 602 ++ + drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 828 ++ + drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 884 ++ + drivers/staging/rtl8187se/ieee80211/internal.h | 115 + + drivers/staging/rtl8187se/ieee80211/rtl_crypto.h | 399 + + drivers/staging/rtl8187se/ieee80211_crypt.h | 86 + + drivers/staging/rtl8187se/r8180.h | 761 ++ + drivers/staging/rtl8187se/r8180_93cx6.c | 146 + + drivers/staging/rtl8187se/r8180_93cx6.h | 59 + + drivers/staging/rtl8187se/r8180_core.c | 6828 +++++++++++++++ + drivers/staging/rtl8187se/r8180_dm.c | 1725 ++++ + drivers/staging/rtl8187se/r8180_dm.h | 41 + + drivers/staging/rtl8187se/r8180_gct.c | 296 + + drivers/staging/rtl8187se/r8180_gct.h | 25 + + drivers/staging/rtl8187se/r8180_hw.h | 956 +++ + drivers/staging/rtl8187se/r8180_max2820.c | 240 + + drivers/staging/rtl8187se/r8180_max2820.h | 21 + + drivers/staging/rtl8187se/r8180_pm.c | 90 + + drivers/staging/rtl8187se/r8180_pm.h | 28 + + drivers/staging/rtl8187se/r8180_rtl8225.c | 933 +++ + drivers/staging/rtl8187se/r8180_rtl8225.h | 44 + + drivers/staging/rtl8187se/r8180_rtl8225z2.c | 1587 ++++ + drivers/staging/rtl8187se/r8180_rtl8255.c | 1838 +++++ + drivers/staging/rtl8187se/r8180_rtl8255.h | 19 + + drivers/staging/rtl8187se/r8180_sa2400.c | 233 + + drivers/staging/rtl8187se/r8180_sa2400.h | 26 + + drivers/staging/rtl8187se/r8180_wx.c | 1644 ++++ + drivers/staging/rtl8187se/r8180_wx.h | 21 + + drivers/staging/rtl8187se/r8185b_init.c | 3342 ++++++++ + drivers/staging/slicoss/slic.h | 34 + + drivers/staging/slicoss/slicoss.c | 84 +- + drivers/staging/sxg/README | 2 - + drivers/staging/sxg/sxg.c | 316 +- + drivers/staging/sxg/sxg.h | 121 +- + drivers/staging/sxg/sxg_os.h | 24 +- + drivers/staging/sxg/sxgdbg.h | 15 +- + drivers/staging/sxg/sxghif.h | 139 +- + drivers/staging/sxg/sxghw.h | 40 +- + drivers/staging/sxg/sxgphycode.h | 2 +- + drivers/staging/usbip/stub.h | 2 +- + drivers/staging/usbip/stub_dev.c | 2 +- + drivers/staging/usbip/stub_main.c | 21 +- + drivers/staging/usbip/stub_rx.c | 9 +- + drivers/staging/usbip/stub_tx.c | 1 - + drivers/staging/usbip/vhci_hcd.c | 2 +- + drivers/staging/usbip/vhci_sysfs.c | 2 +- + drivers/staging/winbond/Kconfig | 12 +- + drivers/staging/winbond/Makefile | 17 +- + drivers/staging/winbond/adapter.h | 23 - + drivers/staging/winbond/bss_f.h | 80 +- + drivers/staging/winbond/bssdscpt.h | 20 +- + drivers/staging/winbond/common.h | 27 + + drivers/staging/winbond/core.h | 42 + + drivers/staging/winbond/ds_tkip.h | 12 +- + drivers/staging/winbond/gl_80211.h | 3 +- + drivers/staging/winbond/linux/common.h | 128 - + drivers/staging/winbond/linux/sysdef.h | 73 - + drivers/staging/winbond/linux/wb35rx_f.h | 17 - + drivers/staging/winbond/linux/wb35tx_f.h | 20 - + drivers/staging/winbond/linux/wbusb.c | 391 - + drivers/staging/winbond/linux/wbusb_f.h | 34 - + drivers/staging/winbond/localpara.h | 11 +- + drivers/staging/winbond/mac_structures.h | 7 +- + drivers/staging/winbond/mds.c | 831 +- + drivers/staging/winbond/mds_f.h | 42 +- + drivers/staging/winbond/mds_s.h | 42 +- + drivers/staging/winbond/mlme_mib.h | 20 +- + drivers/staging/winbond/mlme_s.h | 11 +- + drivers/staging/winbond/mlmetxrx.c | 113 +- + drivers/staging/winbond/mlmetxrx_f.h | 25 +- + drivers/staging/winbond/mto.c | 991 +--- + drivers/staging/winbond/mto.h | 27 +- + drivers/staging/winbond/mto_f.h | 12 +- + drivers/staging/winbond/os_common.h | 2 +- + drivers/staging/winbond/phy_calibration.c | 40 +- + drivers/staging/winbond/phy_calibration.h | 6 + + drivers/staging/winbond/reg.c | 349 +- + drivers/staging/winbond/rxisr.c | 30 - + drivers/staging/winbond/scan_s.h | 22 +- + drivers/staging/winbond/sme_api.c | 14 - + drivers/staging/winbond/sme_api.h | 7 +- + drivers/staging/winbond/sme_s.h | 16 +- + drivers/staging/winbond/sysdef.h | 40 + + drivers/staging/winbond/{linux => }/wb35reg.c | 531 +- + drivers/staging/winbond/{linux => }/wb35reg_f.h | 9 +- + drivers/staging/winbond/{linux => }/wb35reg_s.h | 46 +- + drivers/staging/winbond/{linux => }/wb35rx.c | 421 +- + drivers/staging/winbond/wb35rx_f.h | 15 + + drivers/staging/winbond/{linux => }/wb35rx_s.h | 2 +- + drivers/staging/winbond/{linux => }/wb35tx.c | 248 +- + drivers/staging/winbond/wb35tx_f.h | 21 + + drivers/staging/winbond/{linux => }/wb35tx_s.h | 14 +- + drivers/staging/winbond/wbhal.c | 830 +-- + drivers/staging/winbond/wbhal_f.h | 49 +- + drivers/staging/winbond/wbhal_s.h | 33 +- + drivers/staging/winbond/wblinux.c | 275 - + drivers/staging/winbond/wblinux_f.h | 21 +- + drivers/staging/winbond/wblinux_s.h | 45 - + drivers/staging/winbond/wbusb.c | 438 + + drivers/staging/winbond/{linux => }/wbusb_s.h | 17 +- + drivers/staging/wlan-ng/Kconfig | 6 +- + drivers/staging/wlan-ng/Makefile | 3 +- + drivers/staging/wlan-ng/README | 1 - + drivers/staging/wlan-ng/hfa384x.c | 4018 --------- + drivers/staging/wlan-ng/hfa384x.h | 2491 +++---- + drivers/staging/wlan-ng/hfa384x_usb.c | 655 +-- + drivers/staging/wlan-ng/p80211conv.c | 43 +- + drivers/staging/wlan-ng/p80211conv.h | 76 +- + drivers/staging/wlan-ng/p80211hdr.h | 90 +- + drivers/staging/wlan-ng/p80211ioctl.h | 6 +- + drivers/staging/wlan-ng/p80211meta.h | 46 +- + drivers/staging/wlan-ng/p80211metadef.h | 1785 +---- + drivers/staging/wlan-ng/p80211metamib.h | 2 +- + drivers/staging/wlan-ng/p80211metamsg.h | 2 +- + drivers/staging/wlan-ng/p80211metastruct.h | 463 +- + drivers/staging/wlan-ng/p80211mgmt.h | 194 +- + drivers/staging/wlan-ng/p80211mod.c | 216 - + drivers/staging/wlan-ng/p80211msg.h | 14 +- + drivers/staging/wlan-ng/p80211netdev.c | 357 +- + drivers/staging/wlan-ng/p80211netdev.h | 180 +- + drivers/staging/wlan-ng/p80211req.c | 39 +- + drivers/staging/wlan-ng/p80211req.h | 2 +- + drivers/staging/wlan-ng/p80211types.h | 208 +- + drivers/staging/wlan-ng/p80211wep.c | 21 +- + drivers/staging/wlan-ng/p80211wext.c | 353 +- + drivers/staging/wlan-ng/prism2_cs.c | 1487 ---- + drivers/staging/wlan-ng/prism2_pci.c | 332 - + drivers/staging/wlan-ng/prism2_plx.c | 472 -- + drivers/staging/wlan-ng/prism2mgmt.c | 1673 +---- + drivers/staging/wlan-ng/prism2mgmt.h | 59 +- + drivers/staging/wlan-ng/prism2mib.c | 2790 +------ + drivers/staging/wlan-ng/prism2sta.c | 338 +- + .../staging/wlan-ng/{prism2_usb.c => prism2usb.c} | 77 +- + drivers/staging/wlan-ng/version.h | 64 - + drivers/staging/wlan-ng/wlan_compat.h | 570 +-- + 779 files changed, 472695 insertions(+), 26479 deletions(-) + create mode 100644 drivers/staging/agnx/Kconfig + create mode 100644 drivers/staging/agnx/Makefile + create mode 100644 drivers/staging/agnx/TODO + create mode 100644 drivers/staging/agnx/agnx.h + create mode 100644 drivers/staging/agnx/debug.h + create mode 100644 drivers/staging/agnx/pci.c + create mode 100644 drivers/staging/agnx/phy.c + create mode 100644 drivers/staging/agnx/phy.h + create mode 100644 drivers/staging/agnx/rf.c + create mode 100644 drivers/staging/agnx/sta.c + create mode 100644 drivers/staging/agnx/sta.h + create mode 100644 drivers/staging/agnx/table.c + create mode 100644 drivers/staging/agnx/table.h + create mode 100644 drivers/staging/agnx/xmit.c + create mode 100644 drivers/staging/agnx/xmit.h + create mode 100644 drivers/staging/altpciechdma/Kconfig + create mode 100644 drivers/staging/altpciechdma/Makefile + create mode 100644 drivers/staging/altpciechdma/TODO + create mode 100644 drivers/staging/altpciechdma/altpciechdma.c + create mode 100644 drivers/staging/android/Kconfig + create mode 100644 drivers/staging/android/Makefile + create mode 100644 drivers/staging/android/TODO + create mode 100644 drivers/staging/android/binder.c + create mode 100644 drivers/staging/android/binder.h + create mode 100644 drivers/staging/android/logger.c + create mode 100644 drivers/staging/android/logger.h + create mode 100644 drivers/staging/android/lowmemorykiller.c + create mode 100644 drivers/staging/android/ram_console.c + create mode 100644 drivers/staging/android/timed_gpio.c + create mode 100644 drivers/staging/android/timed_gpio.h + create mode 100644 drivers/staging/asus_oled/Kconfig + create mode 100644 drivers/staging/asus_oled/Makefile + create mode 100644 drivers/staging/asus_oled/README + create mode 100644 drivers/staging/asus_oled/TODO + create mode 100644 drivers/staging/asus_oled/asus_oled.c + create mode 100644 drivers/staging/asus_oled/linux.txt + create mode 100644 drivers/staging/asus_oled/linux_f.txt + create mode 100644 drivers/staging/asus_oled/linux_fr.txt + create mode 100644 drivers/staging/asus_oled/tux.txt + create mode 100644 drivers/staging/asus_oled/tux_r.txt + create mode 100644 drivers/staging/asus_oled/tux_r2.txt + create mode 100644 drivers/staging/asus_oled/zig.txt + create mode 100644 drivers/staging/benet/Kconfig + create mode 100644 drivers/staging/benet/MAINTAINERS + create mode 100644 drivers/staging/benet/Makefile + create mode 100644 drivers/staging/benet/TODO + create mode 100644 drivers/staging/benet/asyncmesg.h + create mode 100644 drivers/staging/benet/be_cm.h + create mode 100644 drivers/staging/benet/be_common.h + create mode 100644 drivers/staging/benet/be_ethtool.c + create mode 100644 drivers/staging/benet/be_init.c + create mode 100644 drivers/staging/benet/be_int.c + create mode 100644 drivers/staging/benet/be_netif.c + create mode 100644 drivers/staging/benet/benet.h + create mode 100644 drivers/staging/benet/bestatus.h + create mode 100644 drivers/staging/benet/cev.h + create mode 100644 drivers/staging/benet/cq.c + create mode 100644 drivers/staging/benet/descriptors.h + create mode 100644 drivers/staging/benet/doorbells.h + create mode 100644 drivers/staging/benet/ep.h + create mode 100644 drivers/staging/benet/eq.c + create mode 100644 drivers/staging/benet/eth.c + create mode 100644 drivers/staging/benet/etx_context.h + create mode 100644 drivers/staging/benet/funcobj.c + create mode 100644 drivers/staging/benet/fwcmd_common.h + create mode 100644 drivers/staging/benet/fwcmd_common_bmap.h + create mode 100644 drivers/staging/benet/fwcmd_eth_bmap.h + create mode 100644 drivers/staging/benet/fwcmd_hdr_bmap.h + create mode 100644 drivers/staging/benet/fwcmd_mcc.h + create mode 100644 drivers/staging/benet/fwcmd_opcodes.h + create mode 100644 drivers/staging/benet/fwcmd_types_bmap.h + create mode 100644 drivers/staging/benet/host_struct.h + create mode 100644 drivers/staging/benet/hwlib.h + create mode 100644 drivers/staging/benet/mpu.c + create mode 100644 drivers/staging/benet/mpu.h + create mode 100644 drivers/staging/benet/mpu_context.h + create mode 100644 drivers/staging/benet/pcicfg.h + create mode 100644 drivers/staging/benet/post_codes.h + create mode 100644 drivers/staging/benet/regmap.h + create mode 100644 drivers/staging/comedi/Kconfig + create mode 100644 drivers/staging/comedi/Makefile + create mode 100644 drivers/staging/comedi/TODO + create mode 100644 drivers/staging/comedi/comedi.h + create mode 100644 drivers/staging/comedi/comedi_compat32.c + create mode 100644 drivers/staging/comedi/comedi_compat32.h + create mode 100644 drivers/staging/comedi/comedi_fops.c + create mode 100644 drivers/staging/comedi/comedi_fops.h + create mode 100644 drivers/staging/comedi/comedi_ksyms.c + create mode 100644 drivers/staging/comedi/comedi_rt.h + create mode 100644 drivers/staging/comedi/comedidev.h + create mode 100644 drivers/staging/comedi/comedilib.h + create mode 100644 drivers/staging/comedi/drivers.c + create mode 100644 drivers/staging/comedi/drivers/Makefile + create mode 100644 drivers/staging/comedi/drivers/comedi_bond.c + create mode 100644 drivers/staging/comedi/drivers/comedi_fc.c + create mode 100644 drivers/staging/comedi/drivers/comedi_fc.h + create mode 100644 drivers/staging/comedi/drivers/comedi_parport.c + create mode 100644 drivers/staging/comedi/drivers/comedi_pci.h + create mode 100644 drivers/staging/comedi/drivers/comedi_test.c + create mode 100644 drivers/staging/comedi/drivers/dt9812.c + create mode 100644 drivers/staging/comedi/drivers/icp_multi.c + create mode 100644 drivers/staging/comedi/drivers/icp_multi.h + create mode 100644 drivers/staging/comedi/drivers/me4000.c + create mode 100644 drivers/staging/comedi/drivers/me4000.h + create mode 100644 drivers/staging/comedi/drivers/me_daq.c + create mode 100644 drivers/staging/comedi/drivers/mite.c + create mode 100644 drivers/staging/comedi/drivers/mite.h + create mode 100644 drivers/staging/comedi/drivers/plx9080.h + create mode 100644 drivers/staging/comedi/drivers/rtd520.c + create mode 100644 drivers/staging/comedi/drivers/rtd520.h + create mode 100644 drivers/staging/comedi/drivers/s626.c + create mode 100644 drivers/staging/comedi/drivers/s626.h + create mode 100644 drivers/staging/comedi/drivers/usbdux.c + create mode 100644 drivers/staging/comedi/drivers/usbduxfast.c + create mode 100644 drivers/staging/comedi/interrupt.h + create mode 100644 drivers/staging/comedi/kcomedilib/Makefile + create mode 100644 drivers/staging/comedi/kcomedilib/data.c + create mode 100644 drivers/staging/comedi/kcomedilib/dio.c + create mode 100644 drivers/staging/comedi/kcomedilib/get.c + create mode 100644 drivers/staging/comedi/kcomedilib/kcomedilib_main.c + create mode 100644 drivers/staging/comedi/kcomedilib/ksyms.c + create mode 100644 drivers/staging/comedi/pci_ids.h + create mode 100644 drivers/staging/comedi/proc.c + create mode 100644 drivers/staging/comedi/range.c + create mode 100644 drivers/staging/comedi/rt.c + create mode 100644 drivers/staging/comedi/rt_pend_tq.c + create mode 100644 drivers/staging/comedi/rt_pend_tq.h + create mode 100644 drivers/staging/comedi/wrapper.h + create mode 100644 drivers/staging/epl/Benchmark.h + create mode 100644 drivers/staging/epl/Debug.h + create mode 100644 drivers/staging/epl/Edrv8139.c + create mode 100644 drivers/staging/epl/EdrvFec.h + create mode 100644 drivers/staging/epl/EdrvFec5282.h + create mode 100644 drivers/staging/epl/EdrvSim.h + create mode 100644 drivers/staging/epl/Epl.h + create mode 100644 drivers/staging/epl/EplAmi.h + create mode 100644 drivers/staging/epl/EplApiGeneric.c + create mode 100644 drivers/staging/epl/EplApiLinux.h + create mode 100644 drivers/staging/epl/EplApiLinuxKernel.c + create mode 100644 drivers/staging/epl/EplApiProcessImage.c + create mode 100644 drivers/staging/epl/EplCfg.h + create mode 100644 drivers/staging/epl/EplDef.h + create mode 100644 drivers/staging/epl/EplDll.h + create mode 100644 drivers/staging/epl/EplDllCal.h + create mode 100644 drivers/staging/epl/EplDllk.c + create mode 100644 drivers/staging/epl/EplDllkCal.c + create mode 100644 drivers/staging/epl/EplDlluCal.c + create mode 100644 drivers/staging/epl/EplErrDef.h + create mode 100644 drivers/staging/epl/EplErrorHandlerk.c + create mode 100644 drivers/staging/epl/EplEvent.h + create mode 100644 drivers/staging/epl/EplEventk.c + create mode 100644 drivers/staging/epl/EplEventu.c + create mode 100644 drivers/staging/epl/EplFrame.h + create mode 100644 drivers/staging/epl/EplIdentu.c + create mode 100644 drivers/staging/epl/EplInc.h + create mode 100644 drivers/staging/epl/EplInstDef.h + create mode 100644 drivers/staging/epl/EplLed.h + create mode 100644 drivers/staging/epl/EplNmt.h + create mode 100644 drivers/staging/epl/EplNmtCnu.c + create mode 100644 drivers/staging/epl/EplNmtMnu.c + create mode 100644 drivers/staging/epl/EplNmtk.c + create mode 100644 drivers/staging/epl/EplNmtkCal.c + create mode 100644 drivers/staging/epl/EplNmtu.c + create mode 100644 drivers/staging/epl/EplNmtuCal.c + create mode 100644 drivers/staging/epl/EplObd.c + create mode 100644 drivers/staging/epl/EplObd.h + create mode 100644 drivers/staging/epl/EplObdMacro.h + create mode 100644 drivers/staging/epl/EplObdkCal.c + create mode 100644 drivers/staging/epl/EplObdu.c + create mode 100644 drivers/staging/epl/EplObduCal.c + create mode 100644 drivers/staging/epl/EplObjDef.h + create mode 100644 drivers/staging/epl/EplPdo.h + create mode 100644 drivers/staging/epl/EplPdok.c + create mode 100644 drivers/staging/epl/EplPdokCal.c + create mode 100644 drivers/staging/epl/EplPdou.c + create mode 100644 drivers/staging/epl/EplSdo.h + create mode 100644 drivers/staging/epl/EplSdoAc.h + create mode 100644 drivers/staging/epl/EplSdoAsndu.c + create mode 100644 drivers/staging/epl/EplSdoAsySequ.c + create mode 100644 drivers/staging/epl/EplSdoComu.c + create mode 100644 drivers/staging/epl/EplSdoUdpu.c + create mode 100644 drivers/staging/epl/EplStatusu.c + create mode 100644 drivers/staging/epl/EplTarget.h + create mode 100644 drivers/staging/epl/EplTimer.h + create mode 100644 drivers/staging/epl/EplTimeruLinuxKernel.c + create mode 100644 drivers/staging/epl/EplTimeruNull.c + create mode 100644 drivers/staging/epl/EplTimeruWin32.c + create mode 100644 drivers/staging/epl/EplVersion.h + create mode 100644 drivers/staging/epl/Kconfig + create mode 100644 drivers/staging/epl/Makefile + create mode 100644 drivers/staging/epl/SharedBuff.c + create mode 100644 drivers/staging/epl/SharedBuff.h + create mode 100644 drivers/staging/epl/ShbIpc-LinuxKernel.c + create mode 100644 drivers/staging/epl/ShbIpc-Win32.c + create mode 100644 drivers/staging/epl/ShbIpc.h + create mode 100644 drivers/staging/epl/ShbLinuxKernel.h + create mode 100644 drivers/staging/epl/SocketLinuxKernel.c + create mode 100644 drivers/staging/epl/SocketLinuxKernel.h + create mode 100644 drivers/staging/epl/TimerHighReskX86.c + create mode 100644 drivers/staging/epl/VirtualEthernetLinux.c + create mode 100644 drivers/staging/epl/amix86.c + create mode 100644 drivers/staging/epl/demo_main.c + create mode 100644 drivers/staging/epl/edrv.h + create mode 100644 drivers/staging/epl/global.h + create mode 100644 drivers/staging/epl/kernel/EplDllk.h + create mode 100644 drivers/staging/epl/kernel/EplDllkCal.h + create mode 100644 drivers/staging/epl/kernel/EplErrorHandlerk.h + create mode 100644 drivers/staging/epl/kernel/EplEventk.h + create mode 100644 drivers/staging/epl/kernel/EplNmtk.h + create mode 100644 drivers/staging/epl/kernel/EplNmtkCal.h + create mode 100644 drivers/staging/epl/kernel/EplObdk.h + create mode 100644 drivers/staging/epl/kernel/EplObdkCal.h + create mode 100644 drivers/staging/epl/kernel/EplPdok.h + create mode 100644 drivers/staging/epl/kernel/EplPdokCal.h + create mode 100644 drivers/staging/epl/kernel/EplTimerHighResk.h + create mode 100644 drivers/staging/epl/kernel/EplTimerk.h + create mode 100644 drivers/staging/epl/kernel/VirtualEthernet.h + create mode 100644 drivers/staging/epl/proc_fs.c + create mode 100644 drivers/staging/epl/proc_fs.h + create mode 100644 drivers/staging/epl/user/EplCfgMau.h + create mode 100644 drivers/staging/epl/user/EplDllu.h + create mode 100644 drivers/staging/epl/user/EplDlluCal.h + create mode 100644 drivers/staging/epl/user/EplEventu.h + create mode 100644 drivers/staging/epl/user/EplIdentu.h + create mode 100644 drivers/staging/epl/user/EplLedu.h + create mode 100644 drivers/staging/epl/user/EplNmtCnu.h + create mode 100644 drivers/staging/epl/user/EplNmtMnu.h + create mode 100644 drivers/staging/epl/user/EplNmtu.h + create mode 100644 drivers/staging/epl/user/EplNmtuCal.h + create mode 100644 drivers/staging/epl/user/EplObdu.h + create mode 100644 drivers/staging/epl/user/EplObduCal.h + create mode 100644 drivers/staging/epl/user/EplPdou.h + create mode 100644 drivers/staging/epl/user/EplSdoAsndu.h + create mode 100644 drivers/staging/epl/user/EplSdoAsySequ.h + create mode 100644 drivers/staging/epl/user/EplSdoComu.h + create mode 100644 drivers/staging/epl/user/EplSdoUdpu.h + create mode 100644 drivers/staging/epl/user/EplStatusu.h + create mode 100644 drivers/staging/epl/user/EplTimeru.h + create mode 100644 drivers/staging/frontier/Kconfig + create mode 100644 drivers/staging/frontier/Makefile + create mode 100644 drivers/staging/frontier/README + create mode 100644 drivers/staging/frontier/TODO + create mode 100644 drivers/staging/frontier/alphatrack.c + create mode 100644 drivers/staging/frontier/alphatrack.h + create mode 100644 drivers/staging/frontier/frontier_compat.h + create mode 100644 drivers/staging/frontier/surface_sysfs.h + create mode 100644 drivers/staging/frontier/tranzport.c + create mode 100644 drivers/staging/go7007/go7007.txt + create mode 100644 drivers/staging/go7007/s2250-board.c + create mode 100644 drivers/staging/go7007/s2250-loader.c + create mode 100644 drivers/staging/meilhaus/Kconfig + create mode 100644 drivers/staging/meilhaus/Makefile + create mode 100644 drivers/staging/meilhaus/TODO + create mode 100644 drivers/staging/meilhaus/me0600_device.c + create mode 100644 drivers/staging/meilhaus/me0600_device.h + create mode 100644 drivers/staging/meilhaus/me0600_dio.c + create mode 100644 drivers/staging/meilhaus/me0600_dio.h + create mode 100644 drivers/staging/meilhaus/me0600_dio_reg.h + create mode 100644 drivers/staging/meilhaus/me0600_ext_irq.c + create mode 100644 drivers/staging/meilhaus/me0600_ext_irq.h + create mode 100644 drivers/staging/meilhaus/me0600_ext_irq_reg.h + create mode 100644 drivers/staging/meilhaus/me0600_optoi.c + create mode 100644 drivers/staging/meilhaus/me0600_optoi.h + create mode 100644 drivers/staging/meilhaus/me0600_optoi_reg.h + create mode 100644 drivers/staging/meilhaus/me0600_relay.c + create mode 100644 drivers/staging/meilhaus/me0600_relay.h + create mode 100644 drivers/staging/meilhaus/me0600_relay_reg.h + create mode 100644 drivers/staging/meilhaus/me0600_ttli.c + create mode 100644 drivers/staging/meilhaus/me0600_ttli.h + create mode 100644 drivers/staging/meilhaus/me0600_ttli_reg.h + create mode 100644 drivers/staging/meilhaus/me0900_device.c + create mode 100644 drivers/staging/meilhaus/me0900_device.h + create mode 100644 drivers/staging/meilhaus/me0900_di.c + create mode 100644 drivers/staging/meilhaus/me0900_di.h + create mode 100644 drivers/staging/meilhaus/me0900_do.c + create mode 100644 drivers/staging/meilhaus/me0900_do.h + create mode 100644 drivers/staging/meilhaus/me0900_reg.h + create mode 100644 drivers/staging/meilhaus/me1000_device.c + create mode 100644 drivers/staging/meilhaus/me1000_device.h + create mode 100644 drivers/staging/meilhaus/me1000_dio.c + create mode 100644 drivers/staging/meilhaus/me1000_dio.h + create mode 100644 drivers/staging/meilhaus/me1000_dio_reg.h + create mode 100644 drivers/staging/meilhaus/me1400_device.c + create mode 100644 drivers/staging/meilhaus/me1400_device.h + create mode 100644 drivers/staging/meilhaus/me1400_ext_irq.c + create mode 100644 drivers/staging/meilhaus/me1400_ext_irq.h + create mode 100644 drivers/staging/meilhaus/me1400_ext_irq_reg.h + create mode 100644 drivers/staging/meilhaus/me1600_ao.c + create mode 100644 drivers/staging/meilhaus/me1600_ao.h + create mode 100644 drivers/staging/meilhaus/me1600_ao_reg.h + create mode 100644 drivers/staging/meilhaus/me1600_device.c + create mode 100644 drivers/staging/meilhaus/me1600_device.h + create mode 100644 drivers/staging/meilhaus/me4600_ai.c + create mode 100644 drivers/staging/meilhaus/me4600_ai.h + create mode 100644 drivers/staging/meilhaus/me4600_ai_reg.h + create mode 100644 drivers/staging/meilhaus/me4600_ao.c + create mode 100644 drivers/staging/meilhaus/me4600_ao.h + create mode 100644 drivers/staging/meilhaus/me4600_ao_reg.h + create mode 100644 drivers/staging/meilhaus/me4600_device.c + create mode 100644 drivers/staging/meilhaus/me4600_device.h + create mode 100644 drivers/staging/meilhaus/me4600_di.c + create mode 100644 drivers/staging/meilhaus/me4600_di.h + create mode 100644 drivers/staging/meilhaus/me4600_dio.c + create mode 100644 drivers/staging/meilhaus/me4600_dio.h + create mode 100644 drivers/staging/meilhaus/me4600_dio_reg.h + create mode 100644 drivers/staging/meilhaus/me4600_do.c + create mode 100644 drivers/staging/meilhaus/me4600_do.h + create mode 100644 drivers/staging/meilhaus/me4600_ext_irq.c + create mode 100644 drivers/staging/meilhaus/me4600_ext_irq.h + create mode 100644 drivers/staging/meilhaus/me4600_ext_irq_reg.h + create mode 100644 drivers/staging/meilhaus/me4600_reg.h + create mode 100644 drivers/staging/meilhaus/me6000_ao.c + create mode 100644 drivers/staging/meilhaus/me6000_ao.h + create mode 100644 drivers/staging/meilhaus/me6000_ao_reg.h + create mode 100644 drivers/staging/meilhaus/me6000_device.c + create mode 100644 drivers/staging/meilhaus/me6000_device.h + create mode 100644 drivers/staging/meilhaus/me6000_dio.c + create mode 100644 drivers/staging/meilhaus/me6000_dio.h + create mode 100644 drivers/staging/meilhaus/me6000_dio_reg.h + create mode 100644 drivers/staging/meilhaus/me6000_reg.h + create mode 100644 drivers/staging/meilhaus/me8100_device.c + create mode 100644 drivers/staging/meilhaus/me8100_device.h + create mode 100644 drivers/staging/meilhaus/me8100_di.c + create mode 100644 drivers/staging/meilhaus/me8100_di.h + create mode 100644 drivers/staging/meilhaus/me8100_di_reg.h + create mode 100644 drivers/staging/meilhaus/me8100_do.c + create mode 100644 drivers/staging/meilhaus/me8100_do.h + create mode 100644 drivers/staging/meilhaus/me8100_do_reg.h + create mode 100644 drivers/staging/meilhaus/me8100_reg.h + create mode 100644 drivers/staging/meilhaus/me8200_device.c + create mode 100644 drivers/staging/meilhaus/me8200_device.h + create mode 100644 drivers/staging/meilhaus/me8200_di.c + create mode 100644 drivers/staging/meilhaus/me8200_di.h + create mode 100644 drivers/staging/meilhaus/me8200_di_reg.h + create mode 100644 drivers/staging/meilhaus/me8200_dio.c + create mode 100644 drivers/staging/meilhaus/me8200_dio.h + create mode 100644 drivers/staging/meilhaus/me8200_dio_reg.h + create mode 100644 drivers/staging/meilhaus/me8200_do.c + create mode 100644 drivers/staging/meilhaus/me8200_do.h + create mode 100644 drivers/staging/meilhaus/me8200_do_reg.h + create mode 100644 drivers/staging/meilhaus/me8200_reg.h + create mode 100644 drivers/staging/meilhaus/me8254.c + create mode 100644 drivers/staging/meilhaus/me8254.h + create mode 100644 drivers/staging/meilhaus/me8254_reg.h + create mode 100644 drivers/staging/meilhaus/me8255.c + create mode 100644 drivers/staging/meilhaus/me8255.h + create mode 100644 drivers/staging/meilhaus/me8255_reg.h + create mode 100644 drivers/staging/meilhaus/mecirc_buf.h + create mode 100644 drivers/staging/meilhaus/mecommon.h + create mode 100644 drivers/staging/meilhaus/medebug.h + create mode 100644 drivers/staging/meilhaus/medefines.h + create mode 100644 drivers/staging/meilhaus/medevice.c + create mode 100644 drivers/staging/meilhaus/medevice.h + create mode 100644 drivers/staging/meilhaus/medlist.c + create mode 100644 drivers/staging/meilhaus/medlist.h + create mode 100644 drivers/staging/meilhaus/medlock.c + create mode 100644 drivers/staging/meilhaus/medlock.h + create mode 100644 drivers/staging/meilhaus/medriver.h + create mode 100644 drivers/staging/meilhaus/medummy.c + create mode 100644 drivers/staging/meilhaus/medummy.h + create mode 100644 drivers/staging/meilhaus/meerror.h + create mode 100644 drivers/staging/meilhaus/mefirmware.c + create mode 100644 drivers/staging/meilhaus/mefirmware.h + create mode 100644 drivers/staging/meilhaus/meids.h + create mode 100644 drivers/staging/meilhaus/meinternal.h + create mode 100644 drivers/staging/meilhaus/meioctl.h + create mode 100644 drivers/staging/meilhaus/memain.c + create mode 100644 drivers/staging/meilhaus/memain.h + create mode 100644 drivers/staging/meilhaus/meplx_reg.h + create mode 100644 drivers/staging/meilhaus/meslist.c + create mode 100644 drivers/staging/meilhaus/meslist.h + create mode 100644 drivers/staging/meilhaus/meslock.c + create mode 100644 drivers/staging/meilhaus/meslock.h + create mode 100644 drivers/staging/meilhaus/mesubdevice.c + create mode 100644 drivers/staging/meilhaus/mesubdevice.h + create mode 100644 drivers/staging/meilhaus/metempl_device.c + create mode 100644 drivers/staging/meilhaus/metempl_device.h + create mode 100644 drivers/staging/meilhaus/metempl_sub.c + create mode 100644 drivers/staging/meilhaus/metempl_sub.h + create mode 100644 drivers/staging/meilhaus/metempl_sub_reg.h + create mode 100644 drivers/staging/meilhaus/metypes.h + create mode 100644 drivers/staging/mimio/Kconfig + create mode 100644 drivers/staging/mimio/Makefile + create mode 100644 drivers/staging/mimio/mimio.c + create mode 100644 drivers/staging/otus/80211core/amsdu.c + create mode 100644 drivers/staging/otus/80211core/cagg.c + create mode 100644 drivers/staging/otus/80211core/cagg.h + create mode 100644 drivers/staging/otus/80211core/ccmd.c + create mode 100644 drivers/staging/otus/80211core/cfunc.c + create mode 100644 drivers/staging/otus/80211core/cfunc.h + create mode 100644 drivers/staging/otus/80211core/chb.c + create mode 100644 drivers/staging/otus/80211core/cic.c + create mode 100644 drivers/staging/otus/80211core/cinit.c + create mode 100644 drivers/staging/otus/80211core/cmm.c + create mode 100644 drivers/staging/otus/80211core/cmmap.c + create mode 100644 drivers/staging/otus/80211core/cmmsta.c + create mode 100644 drivers/staging/otus/80211core/coid.c + create mode 100644 drivers/staging/otus/80211core/cprecomp.h + create mode 100644 drivers/staging/otus/80211core/cpsmgr.c + create mode 100644 drivers/staging/otus/80211core/cscanmgr.c + create mode 100644 drivers/staging/otus/80211core/ctkip.c + create mode 100644 drivers/staging/otus/80211core/ctxrx.c + create mode 100644 drivers/staging/otus/80211core/cwep.c + create mode 100644 drivers/staging/otus/80211core/cwm.c + create mode 100644 drivers/staging/otus/80211core/cwm.h + create mode 100644 drivers/staging/otus/80211core/freqctrl.c + create mode 100644 drivers/staging/otus/80211core/ledmgr.c + create mode 100644 drivers/staging/otus/80211core/performance.c + create mode 100644 drivers/staging/otus/80211core/performance.h + create mode 100644 drivers/staging/otus/80211core/pub_usb.h + create mode 100644 drivers/staging/otus/80211core/pub_zfi.h + create mode 100644 drivers/staging/otus/80211core/pub_zfw.h + create mode 100644 drivers/staging/otus/80211core/queue.c + create mode 100644 drivers/staging/otus/80211core/queue.h + create mode 100644 drivers/staging/otus/80211core/ratectrl.c + create mode 100644 drivers/staging/otus/80211core/ratectrl.h + create mode 100644 drivers/staging/otus/80211core/struct.h + create mode 100644 drivers/staging/otus/80211core/wlan.h + create mode 100644 drivers/staging/otus/Kconfig + create mode 100644 drivers/staging/otus/Makefile + create mode 100644 drivers/staging/otus/TODO + create mode 100644 drivers/staging/otus/apdbg.c + create mode 100644 drivers/staging/otus/athr_common.h + create mode 100644 drivers/staging/otus/hal/hpDKfwu.c + create mode 100644 drivers/staging/otus/hal/hpani.c + create mode 100644 drivers/staging/otus/hal/hpani.h + create mode 100644 drivers/staging/otus/hal/hpfw2.c + create mode 100644 drivers/staging/otus/hal/hpfwbu.c + create mode 100644 drivers/staging/otus/hal/hpfwspiu.c + create mode 100644 drivers/staging/otus/hal/hpfwu.c + create mode 100644 drivers/staging/otus/hal/hpfwu.c.drv_ba_resend + create mode 100644 drivers/staging/otus/hal/hpfwu_2k.c + create mode 100644 drivers/staging/otus/hal/hpfwu_BA.c + create mode 100644 drivers/staging/otus/hal/hpfwu_FB50_mdk.c + create mode 100644 drivers/staging/otus/hal/hpfwu_OTUS_RC.c + create mode 100644 drivers/staging/otus/hal/hpfwu_txstream.c + create mode 100644 drivers/staging/otus/hal/hpfwuinit.c + create mode 100644 drivers/staging/otus/hal/hpmain.c + create mode 100644 drivers/staging/otus/hal/hpreg.c + create mode 100644 drivers/staging/otus/hal/hpreg.h + create mode 100644 drivers/staging/otus/hal/hprw.c + create mode 100644 drivers/staging/otus/hal/hpusb.c + create mode 100644 drivers/staging/otus/hal/hpusb.h + create mode 100644 drivers/staging/otus/hal/otus.ini + create mode 100644 drivers/staging/otus/ioctl.c + create mode 100644 drivers/staging/otus/oal_dt.h + create mode 100644 drivers/staging/otus/oal_marc.h + create mode 100644 drivers/staging/otus/usbdrv.c + create mode 100644 drivers/staging/otus/usbdrv.h + create mode 100644 drivers/staging/otus/wrap_buf.c + create mode 100644 drivers/staging/otus/wrap_dbg.c + create mode 100644 drivers/staging/otus/wrap_ev.c + create mode 100644 drivers/staging/otus/wrap_mem.c + create mode 100644 drivers/staging/otus/wrap_mis.c + create mode 100644 drivers/staging/otus/wrap_pkt.c + create mode 100644 drivers/staging/otus/wrap_sec.c + create mode 100644 drivers/staging/otus/wrap_usb.c + create mode 100644 drivers/staging/otus/wwrap.c + create mode 100644 drivers/staging/otus/zdcompat.h + create mode 100644 drivers/staging/otus/zdusb.c + create mode 100644 drivers/staging/otus/zdusb.h + create mode 100644 drivers/staging/panel/Kconfig + create mode 100644 drivers/staging/panel/Makefile + create mode 100644 drivers/staging/panel/TODO + create mode 100644 drivers/staging/panel/lcd-panel-cgram.txt + create mode 100644 drivers/staging/panel/panel.c + create mode 100644 drivers/staging/rspiusb/Kconfig + create mode 100644 drivers/staging/rspiusb/Makefile + create mode 100644 drivers/staging/rspiusb/TODO + create mode 100644 drivers/staging/rspiusb/rspiusb.c + create mode 100644 drivers/staging/rspiusb/rspiusb.h + create mode 100644 drivers/staging/rt2860/2860_main_dev.c + create mode 100644 drivers/staging/rt2860/Kconfig + create mode 100644 drivers/staging/rt2860/Makefile + create mode 100644 drivers/staging/rt2860/TODO + create mode 100644 drivers/staging/rt2860/aironet.h + create mode 100644 drivers/staging/rt2860/ap.h + create mode 100644 drivers/staging/rt2860/chlist.h + create mode 100644 drivers/staging/rt2860/common/2860_rtmp_init.c + create mode 100644 drivers/staging/rt2860/common/action.c + create mode 100644 drivers/staging/rt2860/common/action.h + create mode 100644 drivers/staging/rt2860/common/ba_action.c + create mode 100644 drivers/staging/rt2860/common/cmm_data.c + create mode 100644 drivers/staging/rt2860/common/cmm_data_2860.c + create mode 100644 drivers/staging/rt2860/common/cmm_info.c + create mode 100644 drivers/staging/rt2860/common/cmm_sanity.c + create mode 100644 drivers/staging/rt2860/common/cmm_sync.c + create mode 100644 drivers/staging/rt2860/common/cmm_wpa.c + create mode 100644 drivers/staging/rt2860/common/dfs.c + create mode 100644 drivers/staging/rt2860/common/eeprom.c + create mode 100644 drivers/staging/rt2860/common/firmware.h + create mode 100644 drivers/staging/rt2860/common/md5.c + create mode 100644 drivers/staging/rt2860/common/mlme.c + create mode 100644 drivers/staging/rt2860/common/netif_block.c + create mode 100644 drivers/staging/rt2860/common/netif_block.h + create mode 100644 drivers/staging/rt2860/common/rtmp_init.c + create mode 100644 drivers/staging/rt2860/common/rtmp_tkip.c + create mode 100644 drivers/staging/rt2860/common/rtmp_wep.c + create mode 100644 drivers/staging/rt2860/common/spectrum.c + create mode 100644 drivers/staging/rt2860/config.mk + create mode 100644 drivers/staging/rt2860/dfs.h + create mode 100644 drivers/staging/rt2860/leap.h + create mode 100644 drivers/staging/rt2860/link_list.h + create mode 100644 drivers/staging/rt2860/md4.h + create mode 100644 drivers/staging/rt2860/md5.h + create mode 100644 drivers/staging/rt2860/mlme.h + create mode 100644 drivers/staging/rt2860/oid.h + create mode 100644 drivers/staging/rt2860/rt2860.h + create mode 100644 drivers/staging/rt2860/rt28xx.h + create mode 100644 drivers/staging/rt2860/rt_ate.c + create mode 100644 drivers/staging/rt2860/rt_ate.h + create mode 100644 drivers/staging/rt2860/rt_config.h + create mode 100644 drivers/staging/rt2860/rt_linux.c + create mode 100644 drivers/staging/rt2860/rt_linux.h + create mode 100644 drivers/staging/rt2860/rt_main_dev.c + create mode 100644 drivers/staging/rt2860/rt_profile.c + create mode 100644 drivers/staging/rt2860/rtmp.h + create mode 100644 drivers/staging/rt2860/rtmp_ckipmic.h + create mode 100644 drivers/staging/rt2860/rtmp_def.h + create mode 100644 drivers/staging/rt2860/rtmp_type.h + create mode 100644 drivers/staging/rt2860/spectrum.h + create mode 100644 drivers/staging/rt2860/spectrum_def.h + create mode 100644 drivers/staging/rt2860/sta/aironet.c + create mode 100644 drivers/staging/rt2860/sta/assoc.c + create mode 100644 drivers/staging/rt2860/sta/auth.c + create mode 100644 drivers/staging/rt2860/sta/auth_rsp.c + create mode 100644 drivers/staging/rt2860/sta/connect.c + create mode 100644 drivers/staging/rt2860/sta/dls.c + create mode 100644 drivers/staging/rt2860/sta/rtmp_data.c + create mode 100644 drivers/staging/rt2860/sta/sanity.c + create mode 100644 drivers/staging/rt2860/sta/sync.c + create mode 100644 drivers/staging/rt2860/sta/wpa.c + create mode 100644 drivers/staging/rt2860/sta_ioctl.c + create mode 100644 drivers/staging/rt2860/wpa.h + create mode 100644 drivers/staging/rt2870/2870_main_dev.c + create mode 100644 drivers/staging/rt2870/Kconfig + create mode 100644 drivers/staging/rt2870/Makefile + create mode 100644 drivers/staging/rt2870/TODO + create mode 100644 drivers/staging/rt2870/aironet.h + create mode 100644 drivers/staging/rt2870/ap.h + create mode 100644 drivers/staging/rt2870/chlist.h + create mode 100644 drivers/staging/rt2870/common/2870_rtmp_init.c + create mode 100644 drivers/staging/rt2870/common/action.c + create mode 100644 drivers/staging/rt2870/common/action.h + create mode 100644 drivers/staging/rt2870/common/ba_action.c + create mode 100644 drivers/staging/rt2870/common/cmm_data.c + create mode 100644 drivers/staging/rt2870/common/cmm_data_2870.c + create mode 100644 drivers/staging/rt2870/common/cmm_info.c + create mode 100644 drivers/staging/rt2870/common/cmm_sanity.c + create mode 100644 drivers/staging/rt2870/common/cmm_sync.c + create mode 100644 drivers/staging/rt2870/common/cmm_wpa.c + create mode 100644 drivers/staging/rt2870/common/dfs.c + create mode 100644 drivers/staging/rt2870/common/eeprom.c + create mode 100644 drivers/staging/rt2870/common/firmware.h + create mode 100644 drivers/staging/rt2870/common/md5.c + create mode 100644 drivers/staging/rt2870/common/mlme.c + create mode 100644 drivers/staging/rt2870/common/netif_block.c + create mode 100644 drivers/staging/rt2870/common/rtmp_init.c + create mode 100644 drivers/staging/rt2870/common/rtmp_tkip.c + create mode 100644 drivers/staging/rt2870/common/rtmp_wep.c + create mode 100644 drivers/staging/rt2870/common/rtusb_bulk.c + create mode 100644 drivers/staging/rt2870/common/rtusb_data.c + create mode 100644 drivers/staging/rt2870/common/rtusb_io.c + create mode 100644 drivers/staging/rt2870/common/spectrum.c + create mode 100644 drivers/staging/rt2870/dfs.h + create mode 100644 drivers/staging/rt2870/leap.h + create mode 100644 drivers/staging/rt2870/link_list.h + create mode 100644 drivers/staging/rt2870/md4.h + create mode 100644 drivers/staging/rt2870/md5.h + create mode 100644 drivers/staging/rt2870/mlme.h + create mode 100644 drivers/staging/rt2870/netif_block.h + create mode 100644 drivers/staging/rt2870/oid.h + create mode 100644 drivers/staging/rt2870/rt2870.h + create mode 100644 drivers/staging/rt2870/rt28xx.h + create mode 100644 drivers/staging/rt2870/rt_ate.c + create mode 100644 drivers/staging/rt2870/rt_ate.h + create mode 100644 drivers/staging/rt2870/rt_config.h + create mode 100644 drivers/staging/rt2870/rt_linux.c + create mode 100644 drivers/staging/rt2870/rt_linux.h + create mode 100644 drivers/staging/rt2870/rt_main_dev.c + create mode 100644 drivers/staging/rt2870/rt_profile.c + create mode 100644 drivers/staging/rt2870/rtmp.h + create mode 100644 drivers/staging/rt2870/rtmp_ckipmic.h + create mode 100644 drivers/staging/rt2870/rtmp_def.h + create mode 100644 drivers/staging/rt2870/rtmp_type.h + create mode 100644 drivers/staging/rt2870/spectrum.h + create mode 100644 drivers/staging/rt2870/spectrum_def.h + create mode 100644 drivers/staging/rt2870/sta/aironet.c + create mode 100644 drivers/staging/rt2870/sta/assoc.c + create mode 100644 drivers/staging/rt2870/sta/auth.c + create mode 100644 drivers/staging/rt2870/sta/auth_rsp.c + create mode 100644 drivers/staging/rt2870/sta/connect.c + create mode 100644 drivers/staging/rt2870/sta/dls.c + create mode 100644 drivers/staging/rt2870/sta/rtmp_data.c + create mode 100644 drivers/staging/rt2870/sta/sanity.c + create mode 100644 drivers/staging/rt2870/sta/sync.c + create mode 100644 drivers/staging/rt2870/sta/wpa.c + create mode 100644 drivers/staging/rt2870/sta_ioctl.c + create mode 100644 drivers/staging/rt2870/sta_ioctl.c.patch + create mode 100644 drivers/staging/rt2870/tmp60 + create mode 100644 drivers/staging/rt2870/tmp61 + create mode 100644 drivers/staging/rt2870/wpa.h + create mode 100644 drivers/staging/rtl8187se/Kconfig + create mode 100644 drivers/staging/rtl8187se/Makefile + create mode 100644 drivers/staging/rtl8187se/dot11d.h + create mode 100644 drivers/staging/rtl8187se/ieee80211.h + create mode 100644 drivers/staging/rtl8187se/ieee80211/dot11d.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/dot11d.h + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211.h + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.h + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_module.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c + create mode 100644 drivers/staging/rtl8187se/ieee80211/internal.h + create mode 100644 drivers/staging/rtl8187se/ieee80211/rtl_crypto.h + create mode 100644 drivers/staging/rtl8187se/ieee80211_crypt.h + create mode 100644 drivers/staging/rtl8187se/r8180.h + create mode 100644 drivers/staging/rtl8187se/r8180_93cx6.c + create mode 100644 drivers/staging/rtl8187se/r8180_93cx6.h + create mode 100644 drivers/staging/rtl8187se/r8180_core.c + create mode 100644 drivers/staging/rtl8187se/r8180_dm.c + create mode 100644 drivers/staging/rtl8187se/r8180_dm.h + create mode 100644 drivers/staging/rtl8187se/r8180_gct.c + create mode 100644 drivers/staging/rtl8187se/r8180_gct.h + create mode 100644 drivers/staging/rtl8187se/r8180_hw.h + create mode 100644 drivers/staging/rtl8187se/r8180_max2820.c + create mode 100644 drivers/staging/rtl8187se/r8180_max2820.h + create mode 100644 drivers/staging/rtl8187se/r8180_pm.c + create mode 100644 drivers/staging/rtl8187se/r8180_pm.h + create mode 100644 drivers/staging/rtl8187se/r8180_rtl8225.c + create mode 100644 drivers/staging/rtl8187se/r8180_rtl8225.h + create mode 100644 drivers/staging/rtl8187se/r8180_rtl8225z2.c + create mode 100644 drivers/staging/rtl8187se/r8180_rtl8255.c + create mode 100644 drivers/staging/rtl8187se/r8180_rtl8255.h + create mode 100644 drivers/staging/rtl8187se/r8180_sa2400.c + create mode 100644 drivers/staging/rtl8187se/r8180_sa2400.h + create mode 100644 drivers/staging/rtl8187se/r8180_wx.c + create mode 100644 drivers/staging/rtl8187se/r8180_wx.h + create mode 100644 drivers/staging/rtl8187se/r8185b_init.c + delete mode 100644 drivers/staging/winbond/adapter.h + create mode 100644 drivers/staging/winbond/common.h + create mode 100644 drivers/staging/winbond/core.h + delete mode 100644 drivers/staging/winbond/linux/common.h + delete mode 100644 drivers/staging/winbond/linux/sysdef.h + delete mode 100644 drivers/staging/winbond/linux/wb35rx_f.h + delete mode 100644 drivers/staging/winbond/linux/wb35tx_f.h + delete mode 100644 drivers/staging/winbond/linux/wbusb.c + delete mode 100644 drivers/staging/winbond/linux/wbusb_f.h + delete mode 100644 drivers/staging/winbond/rxisr.c + delete mode 100644 drivers/staging/winbond/sme_api.c + create mode 100644 drivers/staging/winbond/sysdef.h + rename drivers/staging/winbond/{linux => }/wb35reg.c (52%) + rename drivers/staging/winbond/{linux => }/wb35reg_f.h (95%) + rename drivers/staging/winbond/{linux => }/wb35reg_s.h (90%) + rename drivers/staging/winbond/{linux => }/wb35rx.c (77%) + create mode 100644 drivers/staging/winbond/wb35rx_f.h + rename drivers/staging/winbond/{linux => }/wb35rx_s.h (96%) + rename drivers/staging/winbond/{linux => }/wb35tx.c (73%) + create mode 100644 drivers/staging/winbond/wb35tx_f.h + rename drivers/staging/winbond/{linux => }/wb35tx_s.h (82%) + delete mode 100644 drivers/staging/winbond/wblinux.c + delete mode 100644 drivers/staging/winbond/wblinux_s.h + create mode 100644 drivers/staging/winbond/wbusb.c + rename drivers/staging/winbond/{linux => }/wbusb_s.h (68%) + delete mode 100644 drivers/staging/wlan-ng/hfa384x.c + delete mode 100644 drivers/staging/wlan-ng/p80211mod.c + delete mode 100644 drivers/staging/wlan-ng/prism2_cs.c + delete mode 100644 drivers/staging/wlan-ng/prism2_pci.c + delete mode 100644 drivers/staging/wlan-ng/prism2_plx.c + rename drivers/staging/wlan-ng/{prism2_usb.c => prism2usb.c} (84%) + delete mode 100644 drivers/staging/wlan-ng/version.h +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. |