Google Git
Sign in
kernel / pub / scm / linux / kernel / git / next / linux-next-history / df17781183c0f3e6dcbfff118b342b7269111868 / . / Next / merge.log
blob: 0b96e7ac7ee71b8ea89b0e0187cd890ffe29af0d [file] [log] [blame]
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 7e27d6e Linux 2.6.35-rc3
Merging origin/master
$ git merge origin/master
Already up-to-date.
Merging fixes/fixes
$ git merge fixes/fixes
Updating 7e27d6e..6c73364
Fast-forward
arch/arm/mach-vexpress/ct-ca9x4.c | 1 +
drivers/acpi/apei/apei-base.c | 1 +
drivers/acpi/atomicio.c | 1 +
drivers/rtc/rtc-davinci.c | 1 +
drivers/staging/tm6000/tm6000-alsa.c | 1 +
drivers/staging/tm6000/tm6000-cards.c | 1 +
drivers/staging/tm6000/tm6000-core.c | 1 +
drivers/staging/tm6000/tm6000-dvb.c | 1 +
fs/ocfs2/reservations.c | 1 -
9 files changed, 8 insertions(+), 1 deletions(-)
Merging arm-current/master
$ git merge arm-current/master
Merge made by recursive.
arch/arm/include/asm/mach/udc_pxa2xx.h | 4 +-
arch/arm/mach-mx2/Kconfig | 10 ++-
arch/arm/mach-mx2/devices.c | 18 +++
arch/arm/mach-mx2/devices.h | 1 +
arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c | 181 +++++++++++++++++++++++---
arch/arm/mach-mx2/mach-cpuimx27.c | 93 +++++++++++++-
arch/arm/mach-mx2/mach-pca100.c | 2 +
arch/arm/mach-mx25/clock.c | 2 +-
arch/arm/mach-mx25/devices.c | 20 +++
arch/arm/mach-mx25/devices.h | 1 +
arch/arm/mach-mx25/mach-mx25pdk.c | 36 +++++
arch/arm/mach-mx3/clock-imx35.c | 2 +-
arch/arm/mach-mx3/mach-mx31lilly.c | 34 ++++--
arch/arm/mach-mx3/mach-pcm037.c | 3 +-
arch/arm/mach-mx3/mach-pcm043.c | 2 +
arch/arm/mach-mx5/board-mx51_babbage.c | 26 ++++
arch/arm/mach-mx5/clock-mx51.c | 11 ++
arch/arm/mach-mx5/devices.c | 58 ++++++++
arch/arm/mach-mx5/devices.h | 3 +
arch/arm/mach-pxa/mioa701.c | 2 +-
arch/arm/mach-pxa/z2.c | 26 ++---
arch/arm/plat-mxc/clock.c | 37 ++++--
arch/arm/plat-mxc/include/mach/iomux-mx25.h | 19 ++-
arch/arm/plat-mxc/include/mach/iomux-mx51.h | 18 ++-
arch/arm/plat-mxc/include/mach/mmc.h | 3 +
arch/arm/plat-mxc/include/mach/mx25.h | 2 +
arch/arm/plat-mxc/include/mach/mxc_nand.h | 4 +
arch/arm/plat-pxa/Makefile | 3 +-
drivers/mmc/host/mxcmmc.c | 16 ++-
drivers/mtd/nand/mxc_nand.c | 33 +----
drivers/power/z2_battery.c | 12 +--
31 files changed, 563 insertions(+), 119 deletions(-)
Merging m68k-current/for-linus
$ git merge m68k-current/for-linus
Already up-to-date.
Merging powerpc-merge/merge
$ git merge powerpc-merge/merge
Removing arch/powerpc/boot/addRamDisk.c
Merge made by recursive.
arch/powerpc/Kconfig.debug | 7 -
arch/powerpc/boot/Makefile | 2 +-
arch/powerpc/boot/addRamDisk.c | 311 ----------------------
arch/powerpc/configs/40x/acadia_defconfig | 3 +-
arch/powerpc/configs/40x/ep405_defconfig | 3 +-
arch/powerpc/configs/40x/hcu4_defconfig | 3 +-
arch/powerpc/configs/40x/kilauea_defconfig | 3 +-
arch/powerpc/configs/40x/makalu_defconfig | 3 +-
arch/powerpc/configs/40x/virtex_defconfig | 3 +-
arch/powerpc/configs/40x/walnut_defconfig | 3 +-
arch/powerpc/configs/44x/arches_defconfig | 3 +-
arch/powerpc/configs/44x/bamboo_defconfig | 3 +-
arch/powerpc/configs/44x/canyonlands_defconfig | 3 +-
arch/powerpc/configs/44x/ebony_defconfig | 3 +-
arch/powerpc/configs/44x/eiger_defconfig | 3 +-
arch/powerpc/configs/44x/katmai_defconfig | 3 +-
arch/powerpc/configs/44x/rainier_defconfig | 3 +-
arch/powerpc/configs/44x/redwood_defconfig | 3 +-
arch/powerpc/configs/44x/sam440ep_defconfig | 3 +-
arch/powerpc/configs/44x/sequoia_defconfig | 3 +-
arch/powerpc/configs/44x/taishan_defconfig | 3 +-
arch/powerpc/configs/44x/virtex5_defconfig | 3 +-
arch/powerpc/configs/52xx/cm5200_defconfig | 3 +-
arch/powerpc/configs/52xx/lite5200b_defconfig | 3 +-
arch/powerpc/configs/52xx/motionpro_defconfig | 3 +-
arch/powerpc/configs/52xx/pcm030_defconfig | 3 +-
arch/powerpc/configs/52xx/tqm5200_defconfig | 3 +-
arch/powerpc/configs/86xx/gef_ppc9a_defconfig | 3 +-
arch/powerpc/configs/86xx/gef_sbc310_defconfig | 3 +-
arch/powerpc/configs/86xx/gef_sbc610_defconfig | 3 +-
arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | 3 +-
arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig | 3 +-
arch/powerpc/configs/86xx/sbc8641d_defconfig | 3 +-
arch/powerpc/configs/adder875_defconfig | 3 +-
arch/powerpc/configs/amigaone_defconfig | 3 +-
arch/powerpc/configs/c2k_defconfig | 3 +-
arch/powerpc/configs/cell_defconfig | 3 +-
arch/powerpc/configs/celleb_defconfig | 3 +-
arch/powerpc/configs/chrp32_defconfig | 3 +-
arch/powerpc/configs/ep8248e_defconfig | 3 +-
arch/powerpc/configs/ep88xc_defconfig | 3 +-
arch/powerpc/configs/g5_defconfig | 3 +-
arch/powerpc/configs/gamecube_defconfig | 3 +-
arch/powerpc/configs/holly_defconfig | 1 -
arch/powerpc/configs/iseries_defconfig | 3 +-
arch/powerpc/configs/linkstation_defconfig | 3 +-
arch/powerpc/configs/maple_defconfig | 3 +-
arch/powerpc/configs/mgcoge_defconfig | 3 +-
arch/powerpc/configs/mgsuvd_defconfig | 3 +-
arch/powerpc/configs/mpc512x_defconfig | 3 +-
arch/powerpc/configs/mpc5200_defconfig | 3 +-
arch/powerpc/configs/mpc7448_hpc2_defconfig | 3 +-
arch/powerpc/configs/pasemi_defconfig | 3 +-
arch/powerpc/configs/pmac32_defconfig | 3 +-
arch/powerpc/configs/ppc40x_defconfig | 3 +-
arch/powerpc/configs/ppc44x_defconfig | 3 +-
arch/powerpc/configs/ppc64_defconfig | 3 +-
arch/powerpc/configs/ppc64e_defconfig | 3 +-
arch/powerpc/configs/pq2fads_defconfig | 3 +-
arch/powerpc/configs/prpmc2800_defconfig | 3 +-
arch/powerpc/configs/pseries_defconfig | 3 +-
arch/powerpc/configs/storcenter_defconfig | 3 +-
arch/powerpc/configs/wii_defconfig | 3 +-
arch/powerpc/include/asm/irq.h | 6 -
arch/powerpc/include/asm/kdump.h | 11 +-
arch/powerpc/kernel/irq.c | 12 -
arch/powerpc/kernel/machine_kexec_64.c | 18 +--
arch/powerpc/kernel/misc_32.S | 2 -
arch/powerpc/kernel/misc_64.S | 2 -
arch/powerpc/kernel/process.c | 5 -
arch/powerpc/kernel/rtas_flash.c | 39 ++--
arch/powerpc/kernel/setup_32.c | 4 -
arch/powerpc/kernel/setup_64.c | 4 -
arch/powerpc/mm/pgtable_32.c | 4 -
arch/powerpc/sysdev/mpic.c | 2 +-
75 files changed, 93 insertions(+), 514 deletions(-)
delete mode 100644 arch/powerpc/boot/addRamDisk.c
Merging sparc-current/master
$ git merge sparc-current/master
Auto-merging arch/sparc/kernel/perf_event.c
Merge made by recursive.
arch/sparc/configs/sparc64_defconfig | 49 ++++++++++++++++++++++++---------
arch/sparc/include/asm/pgtable_32.h | 5 +--
arch/sparc/kernel/perf_event.c | 1 +
arch/sparc/kernel/sun4d_irq.c | 2 +-
arch/sparc/mm/srmmu.c | 2 -
arch/sparc/mm/sun4c.c | 3 --
drivers/serial/suncore.c | 4 ++-
drivers/serial/sunsu.c | 13 ++++++---
8 files changed, 51 insertions(+), 28 deletions(-)
Merging scsi-rc-fixes/master
$ git merge scsi-rc-fixes/master
Merge made by recursive.
drivers/scsi/ipr.c | 37 +++++++++++++++++++++----------------
drivers/scsi/ipr.h | 4 ++++
2 files changed, 25 insertions(+), 16 deletions(-)
Merging net-current/master
$ git merge net-current/master
Auto-merging MAINTAINERS
Auto-merging drivers/serial/serial_cs.c
Merge made by recursive.
MAINTAINERS | 10 +----
drivers/net/Kconfig | 2 +
drivers/net/bnx2.c | 11 ++---
drivers/net/cnic.c | 55 ++++++++++++++++----------
drivers/net/e1000/e1000_main.c | 17 ++++----
drivers/net/ehea/ehea.h | 2 +-
drivers/net/ehea/ehea_main.c | 9 ++--
drivers/net/enic/vnic_dev.c | 2 +-
drivers/net/gianfar.c | 25 ++++++++++--
drivers/net/ixgbe/ixgbe_ethtool.c | 37 ++++--------------
drivers/net/ixgbe/ixgbe_main.c | 4 ++
drivers/net/ixgbe/ixgbe_phy.c | 2 +
drivers/net/lib82596.c | 2 +-
drivers/net/mipsnet.c | 2 +-
drivers/net/netxen/netxen_nic_ctx.c | 3 +-
drivers/net/netxen/netxen_nic_hw.c | 4 --
drivers/net/netxen/netxen_nic_init.c | 13 ++++--
drivers/net/pcmcia/pcnet_cs.c | 1 +
drivers/net/sky2.c | 19 +++++++--
drivers/net/ucc_geth.c | 2 +
drivers/net/usb/hso.c | 1 -
drivers/net/wireless/ath/ath5k/attach.c | 1 +
drivers/net/wireless/hostap/hostap_cs.c | 15 ++++++-
drivers/net/wireless/hostap/hostap_hw.c | 13 ++++++
drivers/net/wireless/hostap/hostap_wlan.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 5 ++
drivers/net/wireless/iwlwifi/iwl-agn.c | 8 +++-
drivers/net/wireless/iwlwifi/iwl-scan.c | 1 +
drivers/net/wireless/iwlwifi/iwl-sta.c | 4 ++
drivers/net/wireless/iwlwifi/iwl3945-base.c | 9 +++-
drivers/net/wireless/libertas_tf/main.c | 2 +-
drivers/net/wireless/p54/p54pci.c | 2 +
drivers/serial/serial_cs.c | 1 +
include/net/snmp.h | 2 +-
net/bridge/br_fdb.c | 6 +--
net/bridge/br_forward.c | 4 +-
net/core/skbuff.c | 2 +-
net/ipv4/ip_output.c | 9 +++-
net/mac80211/work.c | 2 +-
net/netfilter/ipvs/ip_vs_conn.c | 4 ++
net/sched/sch_teql.c | 1 +
41 files changed, 193 insertions(+), 123 deletions(-)
Merging sound-current/for-linus
$ git merge sound-current/for-linus
Merge made by recursive.
sound/pci/asihpi/hpi6205.c | 22 ++++----
sound/pci/hda/patch_realtek.c | 35 ++++++------
sound/soc/davinci/davinci-mcasp.c | 2 -
sound/usb/clock.c | 12 +++--
sound/usb/endpoint.c | 1 +
sound/usb/format.c | 104 ++++++++++++++++++++++++++++++-------
sound/usb/helper.h | 4 ++
sound/usb/mixer.c | 19 +++++--
8 files changed, 140 insertions(+), 59 deletions(-)
Merging pci-current/for-linus
$ git merge pci-current/for-linus
Merge made by recursive.
Documentation/kernel-parameters.txt | 4 +++-
drivers/pci/pcie/pme/pcie_pme.c | 19 +++++++++++++------
2 files changed, 16 insertions(+), 7 deletions(-)
Merging wireless-current/master
$ git merge wireless-current/master
Merge made by recursive.
drivers/net/wireless/ath/ath9k/ath9k.h | 1 +
drivers/net/wireless/ath/ath9k/main.c | 11 ++++++++++-
2 files changed, 11 insertions(+), 1 deletions(-)
Merging kbuild-current/for-linus
$ git merge kbuild-current/for-linus
Auto-merging Makefile
Merge made by recursive.
Makefile | 2 +-
scripts/mod/modpost.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Merging quilt/driver-core.current
$ git merge quilt/driver-core.current
Already up-to-date.
Merging quilt/tty.current
$ git merge quilt/tty.current
Merge made by recursive.
drivers/serial/cpm_uart/cpm_uart_core.c | 143 +++++++++++++++++--------------
1 files changed, 79 insertions(+), 64 deletions(-)
Merging quilt/usb.current
$ git merge quilt/usb.current
Merge made by recursive.
drivers/usb/core/message.c | 7 +++-
drivers/usb/gadget/f_eem.c | 3 +-
drivers/usb/gadget/g_ffs.c | 11 ++++++
drivers/usb/gadget/printer.c | 32 +++++++++---------
drivers/usb/gadget/s3c2410_udc.c | 6 +++-
drivers/usb/gadget/u_serial.c | 16 ++--------
drivers/usb/host/ehci-mxc.c | 13 ++++++--
drivers/usb/host/isp1362-hcd.c | 15 ++++++---
drivers/usb/host/r8a66597-hcd.c | 2 +-
drivers/usb/host/xhci-ring.c | 62 +++++++++++++++++++++++++++---------
drivers/usb/musb/musb_core.c | 3 +-
drivers/usb/otg/ulpi.c | 15 ++++++---
drivers/usb/serial/ftdi_sio.c | 1 -
drivers/usb/serial/ftdi_sio_ids.h | 7 ----
drivers/usb/serial/qcserial.c | 3 ++
15 files changed, 123 insertions(+), 73 deletions(-)
Merging quilt/staging.current
$ git merge quilt/staging.current
Merge made by recursive.
drivers/staging/batman-adv/bat_sysfs.c | 24 +++++-----
drivers/staging/batman-adv/device.c | 2 +-
drivers/staging/comedi/drivers/adl_pci9111.c | 9 +++-
drivers/staging/comedi/drivers/cb_pcidda.c | 3 +-
drivers/staging/hv/channel_mgmt.c | 41 +++++++++++++-----
drivers/staging/hv/hv_utils.c | 28 ++++++++++++
drivers/staging/hv/vmbus.h | 2 +
drivers/staging/hv/vmbus_drv.c | 3 +
drivers/staging/mrst-touchscreen/intel-mid-touch.c | 2 +-
drivers/staging/rt2860/usb_main_dev.c | 1 +
drivers/staging/rtl8187se/r8180_core.c | 2 -
drivers/staging/rtl8192su/r8192U_core.c | 44 ++++++++++---------
drivers/staging/usbip/usbip_common.c | 46 ++++++++++++++------
drivers/staging/wlags49_h2/wl_enc.c | 1 +
drivers/staging/wlags49_h2/wl_sysfs.h | 4 +-
15 files changed, 144 insertions(+), 68 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
Merge made by recursive.
drivers/char/sysrq.c | 8 ++++++--
drivers/input/keyboard/Kconfig | 2 +-
drivers/input/misc/pcf8574_keypad.c | 2 +-
drivers/input/serio/Kconfig | 2 +-
drivers/input/tablet/wacom_wac.c | 9 +++++----
drivers/input/touchscreen/ad7877.c | 7 +++++++
6 files changed, 21 insertions(+), 9 deletions(-)
Merging md-current/for-linus
$ git merge md-current/for-linus
Already up-to-date.
Merging audit-current/for-linus
$ git merge audit-current/for-linus
Already up-to-date.
Merging crypto-current/master
$ git merge crypto-current/master
Merge made by recursive.
crypto/ablkcipher.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Merging ide-curent/master
$ git merge ide-curent/master
Already up-to-date.
Merging dwmw2/master
$ git merge dwmw2/master
Already up-to-date.
Merging gcl-current/merge
$ git merge gcl-current/merge
Auto-merging MAINTAINERS
Merge made by recursive.
MAINTAINERS | 2 ++
arch/powerpc/boot/dts/lite5200.dts | 28 ++++++++++++++++++++++++++--
arch/powerpc/boot/dts/lite5200b.dts | 5 +++++
arch/powerpc/platforms/52xx/mpc52xx_pm.c | 11 ++++++++++-
fs/proc/proc_devtree.c | 3 +++
sound/soc/fsl/mpc5200_dma.h | 2 +-
6 files changed, 47 insertions(+), 4 deletions(-)
Merging arm/devel
$ git merge arm/devel
Removing arch/arm/include/asm/mmzone.h
Removing arch/arm/mm/discontig.c
Merge made by recursive.
arch/arm/Kconfig | 9 +-
arch/arm/common/gic.c | 46 ++
arch/arm/common/sa1111.c | 5 +-
arch/arm/include/asm/lmb.h | 16 +
arch/arm/include/asm/mach/arch.h | 1 +
arch/arm/include/asm/memory.h | 67 +---
arch/arm/include/asm/mmzone.h | 30 -
arch/arm/include/asm/module.h | 31 +-
arch/arm/include/asm/setup.h | 8 +-
arch/arm/kernel/module.c | 68 ++-
arch/arm/kernel/setup.c | 6 +-
arch/arm/mach-at91/at91sam9g45.c | 11 +
arch/arm/mach-at91/board-sam9g20ek-2slot-mmc.c | 45 ++
arch/arm/mach-at91/board-sam9g20ek.c | 45 ++
arch/arm/mach-at91/include/mach/cpu.h | 10 +
arch/arm/mach-clps711x/Kconfig | 1 -
arch/arm/mach-clps711x/clep7312.c | 1 -
arch/arm/mach-clps711x/edb7211-arch.c | 10 +-
arch/arm/mach-clps711x/fortunet.c | 1 -
arch/arm/mach-davinci/include/mach/memory.h | 9 +-
arch/arm/mach-ep93xx/adssphere.c | 24 +-
arch/arm/mach-ep93xx/core.c | 46 ++-
arch/arm/mach-ep93xx/edb93xx.c | 31 +-
arch/arm/mach-ep93xx/gesbc9312.c | 24 +-
arch/arm/mach-ep93xx/include/mach/platform.h | 3 +
arch/arm/mach-ep93xx/micro9.c | 37 +-
arch/arm/mach-ep93xx/simone.c | 24 +-
arch/arm/mach-ep93xx/ts72xx.c | 27 +-
arch/arm/mach-integrator/common.h | 1 +
arch/arm/mach-integrator/core.c | 12 +
arch/arm/mach-integrator/integrator_ap.c | 3 +
arch/arm/mach-integrator/integrator_cp.c | 3 +
arch/arm/mach-iop13xx/include/mach/memory.h | 2 -
arch/arm/mach-ixp4xx/common-pci.c | 4 +-
arch/arm/mach-ixp4xx/include/mach/memory.h | 6 +-
arch/arm/mach-lh7a40x/include/mach/memory.h | 44 --
arch/arm/mach-msm/Makefile | 2 +-
arch/arm/mach-msm/board-trout-gpio.c | 112 ++++
arch/arm/mach-msm/board-trout.c | 1 -
arch/arm/mach-msm/board-trout.h | 157 +++++
arch/arm/mach-msm/include/mach/gpio.h | 7 +
arch/arm/mach-omap1/board-ams-delta.c | 1 +
arch/arm/mach-omap1/board-fsample.c | 1 +
arch/arm/mach-omap1/board-generic.c | 1 +
arch/arm/mach-omap1/board-h2.c | 1 +
arch/arm/mach-omap1/board-h3.c | 1 +
arch/arm/mach-omap1/board-htcherald.c | 1 +
arch/arm/mach-omap1/board-innovator.c | 1 +
arch/arm/mach-omap1/board-nokia770.c | 1 +
arch/arm/mach-omap1/board-osk.c | 1 +
arch/arm/mach-omap1/board-palmte.c | 1 +
arch/arm/mach-omap1/board-palmtt.c | 1 +
arch/arm/mach-omap1/board-palmz71.c | 14 +-
arch/arm/mach-omap1/board-perseus2.c | 1 +
arch/arm/mach-omap1/board-sx1.c | 3 +-
arch/arm/mach-omap1/board-voiceblue.c | 1 +
arch/arm/mach-omap1/io.c | 2 -
arch/arm/mach-omap2/board-2430sdp.c | 1 +
arch/arm/mach-omap2/board-3430sdp.c | 1 +
arch/arm/mach-omap2/board-3630sdp.c | 1 +
arch/arm/mach-omap2/board-4430sdp.c | 1 +
arch/arm/mach-omap2/board-am3517evm.c | 1 +
arch/arm/mach-omap2/board-apollon.c | 1 +
arch/arm/mach-omap2/board-cm-t35.c | 1 +
arch/arm/mach-omap2/board-devkit8000.c | 1 +
arch/arm/mach-omap2/board-generic.c | 1 +
arch/arm/mach-omap2/board-h4.c | 1 +
arch/arm/mach-omap2/board-igep0020.c | 1 +
arch/arm/mach-omap2/board-ldp.c | 1 +
arch/arm/mach-omap2/board-n8x0.c | 3 +
arch/arm/mach-omap2/board-omap3beagle.c | 1 +
arch/arm/mach-omap2/board-omap3evm.c | 1 +
arch/arm/mach-omap2/board-omap3pandora.c | 1 +
arch/arm/mach-omap2/board-omap3touchbook.c | 1 +
arch/arm/mach-omap2/board-overo.c | 1 +
arch/arm/mach-omap2/board-rx51.c | 1 +
arch/arm/mach-omap2/board-zoom2.c | 1 +
arch/arm/mach-omap2/board-zoom3.c | 1 +
arch/arm/mach-omap2/io.c | 3 -
arch/arm/mach-pxa/cm-x2xx-pci.c | 4 +-
arch/arm/mach-pxa/corgi.c | 1 -
arch/arm/mach-pxa/eseries.c | 1 -
arch/arm/mach-pxa/generic.h | 3 +-
arch/arm/mach-pxa/include/mach/memory.h | 7 +-
arch/arm/mach-pxa/palmt5.c | 7 +
arch/arm/mach-pxa/palmtreo.c | 9 +
arch/arm/mach-pxa/poodle.c | 1 -
arch/arm/mach-pxa/spitz.c | 1 -
arch/arm/mach-pxa/tosa.c | 1 -
arch/arm/mach-realview/core.c | 5 +-
arch/arm/mach-realview/include/mach/memory.h | 7 +-
arch/arm/mach-s3c2410/mach-h1940.c | 9 +
arch/arm/mach-s3c2412/mach-smdk2413.c | 1 -
arch/arm/mach-s3c2412/mach-vstms.c | 1 -
arch/arm/mach-s3c2440/mach-rx1950.c | 9 +
arch/arm/mach-s3c2440/mach-rx3715.c | 9 +
arch/arm/mach-sa1100/generic.h | 3 +-
arch/arm/mach-sa1100/include/mach/memory.h | 6 +-
arch/arm/mach-shark/include/mach/memory.h | 7 +-
arch/arm/mach-u300/u300.c | 17 +
arch/arm/mach-ux500/board-mop500.c | 28 +-
arch/arm/mach-ux500/pins-db8500.h | 742 ++++++++++++++++++++++++
arch/arm/mm/Makefile | 1 -
arch/arm/mm/discontig.c | 45 --
arch/arm/mm/init.c | 405 +++++--------
arch/arm/mm/mm.h | 4 +-
arch/arm/mm/mmu.c | 141 ++----
arch/arm/mm/nommu.c | 22 +-
arch/arm/plat-nomadik/gpio.c | 316 +++++++++--
arch/arm/plat-nomadik/include/plat/gpio.h | 15 +
arch/arm/plat-nomadik/include/plat/mtu.h | 6 +
arch/arm/plat-nomadik/include/plat/pincfg.h | 72 +++
arch/arm/plat-nomadik/timer.c | 14 +-
arch/arm/plat-omap/common.c | 8 +
arch/arm/plat-omap/fb.c | 77 ++-
arch/arm/plat-omap/include/plat/common.h | 2 +
arch/arm/plat-omap/include/plat/vram.h | 4 +-
drivers/usb/gadget/at91_udc.c | 139 +++--
drivers/usb/gadget/at91_udc.h | 1 +
drivers/video/omap2/vram.c | 33 +-
include/linux/omapfb.h | 2 +-
121 files changed, 2242 insertions(+), 992 deletions(-)
create mode 100644 arch/arm/include/asm/lmb.h
delete mode 100644 arch/arm/include/asm/mmzone.h
create mode 100644 arch/arm/mach-integrator/common.h
create mode 100644 arch/arm/mach-msm/board-trout-gpio.c
create mode 100644 arch/arm/mach-ux500/pins-db8500.h
delete mode 100644 arch/arm/mm/discontig.c
create mode 100644 arch/arm/plat-nomadik/include/plat/pincfg.h
$ git revert cecaa4c6b8173b02c9f7ecfdbbc81f573a7a9f33
Finished one revert.
[master 55b6e2e] Revert "ARM: 6172/1: module - additional unwind tables for exit/devexit sections"
2 files changed, 0 insertions(+), 10 deletions(-)
$ git revert f0028612a8ffedcdafa8b7ae83ab090d8b0318b4
Finished one revert.
[master 0c47831] Revert "ARM: 6171/1: module - simplify unwind table handling"
2 files changed, 39 insertions(+), 36 deletions(-)
Merging davinci/davinci-next
$ git merge davinci/davinci-next
Merge made by recursive.
arch/arm/configs/tnetv107x_defconfig | 1741 ++++++++++++++++++++++
arch/arm/mach-davinci/Kconfig | 12 +
arch/arm/mach-davinci/Makefile | 3 +
arch/arm/mach-davinci/board-tnetv107x-evm.c | 174 +++
arch/arm/mach-davinci/devices-tnetv107x.c | 318 ++++
arch/arm/mach-davinci/dm365.c | 4 +-
arch/arm/mach-davinci/gpio-tnetv107x.c | 205 +++
arch/arm/mach-davinci/include/mach/debug-macro.S | 50 +-
arch/arm/mach-davinci/include/mach/gpio.h | 22 +-
arch/arm/mach-davinci/include/mach/serial.h | 21 +
arch/arm/mach-davinci/include/mach/tnetv107x.h | 55 +
arch/arm/mach-davinci/include/mach/uncompress.h | 87 +-
arch/arm/mach-davinci/tnetv107x.c | 753 ++++++++++
13 files changed, 3405 insertions(+), 40 deletions(-)
create mode 100644 arch/arm/configs/tnetv107x_defconfig
create mode 100644 arch/arm/mach-davinci/board-tnetv107x-evm.c
create mode 100644 arch/arm/mach-davinci/devices-tnetv107x.c
create mode 100644 arch/arm/mach-davinci/gpio-tnetv107x.c
create mode 100644 arch/arm/mach-davinci/include/mach/tnetv107x.h
create mode 100644 arch/arm/mach-davinci/tnetv107x.c
Merging i.MX/for-next
$ git merge i.MX/for-next
Auto-merging drivers/usb/host/ehci-mxc.c
Merge made by recursive.
arch/arm/mach-mx2/Makefile | 2 +-
arch/arm/mach-mx2/mach-pca100.c | 91 +++-
arch/arm/mach-mx2/pm-imx27.c | 46 ++
arch/arm/mach-mx25/Kconfig | 18 +
arch/arm/mach-mx25/Makefile | 2 +
arch/arm/mach-mx25/clock.c | 47 ++-
arch/arm/mach-mx25/devices.c | 40 ++-
arch/arm/mach-mx25/devices.h | 2 +
arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c | 260 +++++++++
arch/arm/mach-mx25/mach-cpuimx25.c | 172 ++++++
arch/arm/mach-mx25/mach-mx25pdk.c | 1 +
arch/arm/mach-mx3/Kconfig | 22 +
arch/arm/mach-mx3/Makefile | 2 +
arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 263 +++++++++
arch/arm/mach-mx3/mach-cpuimx35.c | 226 ++++++++
arch/arm/mach-mx5/board-mx51_babbage.c | 2 +-
arch/arm/plat-mxc/Kconfig | 1 +
arch/arm/plat-mxc/audmux-v2.c | 15 +-
arch/arm/plat-mxc/ehci.c | 46 ++-
.../plat-mxc/include/mach/board-eukrea_cpuimx25.h | 40 ++
.../plat-mxc/include/mach/board-eukrea_cpuimx35.h | 40 ++
arch/arm/plat-mxc/include/mach/iomux-mx25.h | 4 +
arch/arm/plat-mxc/include/mach/iomux-mx51.h | 557 ++++++++++----------
arch/arm/plat-mxc/include/mach/iomux-v3.h | 15 +
arch/arm/plat-mxc/include/mach/mx25.h | 12 +-
drivers/usb/gadget/fsl_mxc_udc.c | 2 +-
drivers/usb/host/ehci-mxc.c | 2 +-
27 files changed, 1617 insertions(+), 313 deletions(-)
create mode 100644 arch/arm/mach-mx2/pm-imx27.c
create mode 100644 arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c
create mode 100644 arch/arm/mach-mx25/mach-cpuimx25.c
create mode 100644 arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c
create mode 100644 arch/arm/mach-mx3/mach-cpuimx35.c
create mode 100644 arch/arm/plat-mxc/include/mach/board-eukrea_cpuimx25.h
create mode 100644 arch/arm/plat-mxc/include/mach/board-eukrea_cpuimx35.h
Merging msm/for-next
$ git merge msm/for-next
Auto-merging arch/arm/mach-msm/board-trout.c
Merge made by recursive.
arch/arm/mach-msm/Kconfig | 7 +
arch/arm/mach-msm/Makefile | 4 +-
arch/arm/mach-msm/acpuclock-arm11.c | 1 -
arch/arm/mach-msm/board-msm7x30.c | 28 +++-
arch/arm/mach-msm/board-qsd8x50.c | 27 +++-
arch/arm/mach-msm/board-trout-gpio.c | 115 +++++++++++
arch/arm/mach-msm/board-trout-mmc.c | 189 ++++++++++++++++++
arch/arm/mach-msm/board-trout.c | 11 +
arch/arm/mach-msm/clock.c | 1 -
arch/arm/mach-msm/devices-msm7x30.c | 21 ++
arch/arm/mach-msm/devices-qsd8x50.c | 21 ++
arch/arm/mach-msm/devices.h | 33 +++
arch/arm/mach-msm/gpio_hw-7x30.h | 100 ++++++++++
arch/arm/mach-msm/gpio_hw-7xxx.h | 84 ++++++++
arch/arm/mach-msm/gpio_hw-8x50.h | 100 ++++++++++
arch/arm/mach-msm/gpio_hw.h | 35 ++++
arch/arm/mach-msm/include/mach/gpio.h | 2 +
arch/arm/mach-msm/msm7200a-gpio.c | 353 +++++++++++++++++++++++++++++++++
arch/arm/mach-msm/msm7200a-gpio.h | 87 ++++++++
drivers/mmc/host/msm_sdcc.c | 38 ++--
drivers/video/msm/mddi.c | 2 -
drivers/video/msm/mdp.c | 1 -
22 files changed, 1232 insertions(+), 28 deletions(-)
create mode 100644 arch/arm/mach-msm/board-trout-mmc.c
create mode 100644 arch/arm/mach-msm/gpio_hw-7x30.h
create mode 100644 arch/arm/mach-msm/gpio_hw-7xxx.h
create mode 100644 arch/arm/mach-msm/gpio_hw-8x50.h
create mode 100644 arch/arm/mach-msm/gpio_hw.h
create mode 100644 arch/arm/mach-msm/msm7200a-gpio.c
create mode 100644 arch/arm/mach-msm/msm7200a-gpio.h
Merging omap/for-next
$ git merge omap/for-next
Auto-merging arch/arm/mach-omap2/board-overo.c
Merge made by recursive.
arch/arm/mach-omap2/Makefile | 5 ++-
arch/arm/mach-omap2/board-omap3stalker.c | 4 +--
arch/arm/mach-omap2/board-overo.c | 42 ++++++++++++++++++++++++-
arch/arm/mach-omap2/clock44xx_data.c | 2 +
arch/arm/mach-omap2/omap-iommu.c | 2 +-
arch/arm/mach-omap2/pm34xx.c | 4 +-
arch/arm/mach-omap2/usb-ehci.c | 2 +
arch/arm/plat-omap/dmtimer.c | 6 ++--
arch/arm/plat-omap/gpio.c | 1 +
arch/arm/plat-omap/include/plat/uncompress.h | 6 ++++
arch/arm/plat-omap/iovmm.c | 4 ++-
11 files changed, 65 insertions(+), 13 deletions(-)
Merging pxa/for-next
$ git merge pxa/for-next
Already up-to-date.
Merging samsung/next-samsung
$ git merge samsung/next-samsung
Already up-to-date.
Merging s5p/for-next
$ git merge s5p/for-next
Merge made by recursive.
arch/arm/mach-s5p6442/clock.c | 2 +-
arch/arm/mach-s5pv210/gpiolib.c | 14 ++++++++++++++
arch/arm/mach-s5pv210/include/mach/gpio.h | 12 +++++++++---
3 files changed, 24 insertions(+), 4 deletions(-)
Merging tegra/for-next
$ git merge tegra/for-next
Auto-merging MAINTAINERS
Auto-merging arch/arm/Kconfig
Merge made by recursive.
MAINTAINERS | 9 +
arch/arm/Kconfig | 25 +-
arch/arm/Makefile | 1 +
arch/arm/configs/tegra_defconfig | 1095 +++++++++++++++++++
arch/arm/mach-tegra/Kconfig | 50 +
arch/arm/mach-tegra/Makefile | 14 +
arch/arm/mach-tegra/Makefile.boot | 3 +
arch/arm/mach-tegra/board-harmony-pinmux.c | 144 +++
arch/arm/mach-tegra/board-harmony.c | 127 +++
arch/arm/mach-tegra/board-harmony.h | 22 +
arch/arm/mach-tegra/board.h | 32 +
arch/arm/mach-tegra/clock.c | 488 +++++++++
arch/arm/mach-tegra/clock.h | 147 +++
arch/arm/mach-tegra/common.c | 61 ++
arch/arm/mach-tegra/gpio-names.h | 247 +++++
arch/arm/mach-tegra/gpio.c | 348 ++++++
arch/arm/mach-tegra/headsmp.S | 61 ++
arch/arm/mach-tegra/hotplug.c | 140 +++
arch/arm/mach-tegra/include/mach/barriers.h | 30 +
arch/arm/mach-tegra/include/mach/clk.h | 26 +
arch/arm/mach-tegra/include/mach/clkdev.h | 32 +
arch/arm/mach-tegra/include/mach/debug-macro.S | 46 +
arch/arm/mach-tegra/include/mach/entry-macro.S | 118 ++
arch/arm/mach-tegra/include/mach/gpio.h | 53 +
arch/arm/mach-tegra/include/mach/hardware.h | 24 +
arch/arm/mach-tegra/include/mach/io.h | 79 ++
arch/arm/mach-tegra/include/mach/iomap.h | 203 ++++
arch/arm/mach-tegra/include/mach/irqs.h | 173 +++
arch/arm/mach-tegra/include/mach/memory.h | 28 +
arch/arm/mach-tegra/include/mach/pinmux.h | 348 ++++++
arch/arm/mach-tegra/include/mach/smp.h | 30 +
arch/arm/mach-tegra/include/mach/system.h | 39 +
arch/arm/mach-tegra/include/mach/timex.h | 26 +
arch/arm/mach-tegra/include/mach/uncompress.h | 78 ++
arch/arm/mach-tegra/include/mach/vmalloc.h | 28 +
arch/arm/mach-tegra/io.c | 78 ++
arch/arm/mach-tegra/irq.c | 34 +
arch/arm/mach-tegra/localtimer.c | 25 +
arch/arm/mach-tegra/pinmux.c | 945 ++++++++++++++++
arch/arm/mach-tegra/platsmp.c | 156 +++
arch/arm/mach-tegra/tegra2_clocks.c | 1359 ++++++++++++++++++++++++
arch/arm/mach-tegra/timer.c | 187 ++++
arch/arm/mm/Kconfig | 3 +-
43 files changed, 7157 insertions(+), 5 deletions(-)
create mode 100644 arch/arm/configs/tegra_defconfig
create mode 100644 arch/arm/mach-tegra/Kconfig
create mode 100644 arch/arm/mach-tegra/Makefile
create mode 100644 arch/arm/mach-tegra/Makefile.boot
create mode 100644 arch/arm/mach-tegra/board-harmony-pinmux.c
create mode 100644 arch/arm/mach-tegra/board-harmony.c
create mode 100644 arch/arm/mach-tegra/board-harmony.h
create mode 100644 arch/arm/mach-tegra/board.h
create mode 100644 arch/arm/mach-tegra/clock.c
create mode 100644 arch/arm/mach-tegra/clock.h
create mode 100644 arch/arm/mach-tegra/common.c
create mode 100644 arch/arm/mach-tegra/gpio-names.h
create mode 100644 arch/arm/mach-tegra/gpio.c
create mode 100644 arch/arm/mach-tegra/headsmp.S
create mode 100644 arch/arm/mach-tegra/hotplug.c
create mode 100644 arch/arm/mach-tegra/include/mach/barriers.h
create mode 100644 arch/arm/mach-tegra/include/mach/clk.h
create mode 100644 arch/arm/mach-tegra/include/mach/clkdev.h
create mode 100644 arch/arm/mach-tegra/include/mach/debug-macro.S
create mode 100644 arch/arm/mach-tegra/include/mach/entry-macro.S
create mode 100644 arch/arm/mach-tegra/include/mach/gpio.h
create mode 100644 arch/arm/mach-tegra/include/mach/hardware.h
create mode 100644 arch/arm/mach-tegra/include/mach/io.h
create mode 100644 arch/arm/mach-tegra/include/mach/iomap.h
create mode 100644 arch/arm/mach-tegra/include/mach/irqs.h
create mode 100644 arch/arm/mach-tegra/include/mach/memory.h
create mode 100644 arch/arm/mach-tegra/include/mach/pinmux.h
create mode 100644 arch/arm/mach-tegra/include/mach/smp.h
create mode 100644 arch/arm/mach-tegra/include/mach/system.h
create mode 100644 arch/arm/mach-tegra/include/mach/timex.h
create mode 100644 arch/arm/mach-tegra/include/mach/uncompress.h
create mode 100644 arch/arm/mach-tegra/include/mach/vmalloc.h
create mode 100644 arch/arm/mach-tegra/io.c
create mode 100644 arch/arm/mach-tegra/irq.c
create mode 100644 arch/arm/mach-tegra/localtimer.c
create mode 100644 arch/arm/mach-tegra/pinmux.c
create mode 100644 arch/arm/mach-tegra/platsmp.c
create mode 100644 arch/arm/mach-tegra/tegra2_clocks.c
create mode 100644 arch/arm/mach-tegra/timer.c
Merging avr32/avr32-arch
$ git merge avr32/avr32-arch
Already up-to-date.
Merging blackfin/for-linus
$ git merge blackfin/for-linus
Merge made by recursive.
arch/blackfin/include/asm/elf.h | 1 +
.../mach-bf527/include/mach/defBF52x_base.h | 81 --------------------
.../mach-bf548/include/mach/defBF54x_base.h | 60 ---------------
3 files changed, 1 insertions(+), 141 deletions(-)
Merging cris/for-next
$ git merge cris/for-next
Already up-to-date.
Merging ia64/test
$ git merge ia64/test
Already up-to-date.
Merging m68k/for-next
$ git merge m68k/for-next
Merge made by recursive.
arch/m68k/mac/config.c | 9 +++++++++
arch/m68k/mac/misc.c | 6 +++---
arch/m68k/sun3/leds.c | 4 ++--
drivers/zorro/proc.c | 17 +++++++++--------
4 files changed, 23 insertions(+), 13 deletions(-)
Merging m68knommu/for-next
$ git merge m68knommu/for-next
Merge made by recursive.
arch/m68k/include/asm/ide.h | 13 +++++++++++--
drivers/serial/68328serial.c | 8 --------
2 files changed, 11 insertions(+), 10 deletions(-)
Merging microblaze/next
$ git merge microblaze/next
Merge made by recursive.
arch/microblaze/Kconfig | 30 +++
arch/microblaze/include/asm/cacheflush.h | 18 +-
arch/microblaze/include/asm/elf.h | 2 +-
arch/microblaze/include/asm/exceptions.h | 5 +
arch/microblaze/include/asm/page.h | 12 +-
arch/microblaze/include/asm/setup.h | 2 -
arch/microblaze/include/asm/system.h | 1 -
arch/microblaze/include/asm/uaccess.h | 4 +-
arch/microblaze/include/asm/unwind.h | 29 +++
arch/microblaze/kernel/Makefile | 2 +-
arch/microblaze/kernel/cpu/mb.c | 1 +
arch/microblaze/kernel/entry-nommu.S | 28 +++
arch/microblaze/kernel/entry.S | 41 +++-
arch/microblaze/kernel/head.S | 4 +-
arch/microblaze/kernel/hw_exception_handler.S | 4 +-
arch/microblaze/kernel/irq.c | 2 +
arch/microblaze/kernel/misc.S | 2 +-
arch/microblaze/kernel/process.c | 7 +-
arch/microblaze/kernel/ptrace.c | 17 ++-
arch/microblaze/kernel/stacktrace.c | 44 +---
arch/microblaze/kernel/timer.c | 24 ++-
arch/microblaze/kernel/traps.c | 91 +++----
arch/microblaze/kernel/unwind.c | 318 +++++++++++++++++++++++++
arch/microblaze/kernel/vmlinux.lds.S | 12 +-
arch/microblaze/mm/fault.c | 1 -
arch/microblaze/mm/init.c | 7 +-
include/asm-generic/atomic.h | 12 +-
lib/Kconfig.debug | 6 +-
28 files changed, 581 insertions(+), 145 deletions(-)
create mode 100644 arch/microblaze/include/asm/unwind.h
create mode 100644 arch/microblaze/kernel/unwind.c
Merging mips/mips-for-linux-next
$ git merge mips/mips-for-linux-next
Removing arch/mips/nxp/pnx833x/stb22x/Makefile
Removing arch/mips/nxp/pnx8550/jbs/Makefile
Removing arch/mips/nxp/pnx8550/stb810/Makefile
Merge made by recursive.
arch/mips/Kbuild | 15 +
arch/mips/Kbuild.platforms | 31 ++
arch/mips/Makefile | 519 +-------------------
arch/mips/alchemy/Platform | 109 ++++
arch/mips/alchemy/common/Makefile | 2 -
arch/mips/alchemy/devboards/Makefile | 2 -
arch/mips/alchemy/devboards/pb1200/Makefile | 2 -
arch/mips/alchemy/mtx-1/Makefile | 5 +-
arch/mips/alchemy/xxs1500/Makefile | 4 +-
arch/mips/ar7/Makefile | 1 -
arch/mips/ar7/Platform | 6 +
arch/mips/bcm47xx/Platform | 7 +
arch/mips/bcm63xx/Makefile | 2 -
arch/mips/bcm63xx/Platform | 7 +
arch/mips/boot/Makefile | 49 +-
arch/mips/boot/compressed/Makefile | 54 ++-
arch/mips/cavium-octeon/Makefile | 3 +-
arch/mips/cavium-octeon/Platform | 11 +
arch/mips/cobalt/Makefile | 2 -
arch/mips/cobalt/Platform | 6 +
arch/mips/dec/Makefile | 2 -
arch/mips/dec/Platform | 8 +
arch/mips/dec/promcon.c | 3 +-
arch/mips/emma/Makefile | 6 +
arch/mips/emma/Platform | 4 +
arch/mips/include/asm/mach-powertv/asic_reg_map.h | 2 +-
arch/mips/include/asm/mach-powertv/dma-coherence.h | 8 +-
arch/mips/include/asm/mach-powertv/ioremap.h | 165 +++++--
arch/mips/jazz/Makefile | 2 -
arch/mips/jazz/Platform | 6 +
arch/mips/kernel/Makefile | 2 -
arch/mips/lasat/Makefile | 2 -
arch/mips/lasat/Platform | 7 +
arch/mips/loongson/Platform | 32 ++
arch/mips/loongson/common/cs5536/Makefile | 2 -
arch/mips/loongson/fuloong-2e/Makefile | 2 -
arch/mips/math-emu/Makefile | 1 -
arch/mips/math-emu/dp_modf.c | 2 +-
arch/mips/math-emu/dp_tint.c | 3 +-
arch/mips/math-emu/dp_tlong.c | 3 +-
arch/mips/math-emu/sp_modf.c | 2 +-
arch/mips/math-emu/sp_tint.c | 3 +-
arch/mips/math-emu/sp_tlong.c | 3 +-
arch/mips/mipssim/Makefile | 2 -
arch/mips/mipssim/Platform | 6 +
arch/mips/mm/Makefile | 2 -
arch/mips/mm/fault.c | 1 -
arch/mips/mti-malta/Makefile | 2 -
arch/mips/mti-malta/Platform | 7 +
arch/mips/nxp/pnx833x/stb22x/Makefile | 3 -
arch/mips/nxp/pnx8550/jbs/Makefile | 4 -
arch/mips/nxp/pnx8550/stb810/Makefile | 4 -
arch/mips/pci/ops-titan-ht.c | 4 +-
arch/mips/pmc-sierra/Platform | 14 +
arch/mips/pmc-sierra/yosemite/ht-irq.c | 13 +-
arch/mips/pnx833x/Makefile | 3 +
arch/mips/pnx833x/Platform | 5 +
arch/mips/{nxp => }/pnx833x/common/Makefile | 2 -
arch/mips/{nxp => }/pnx833x/common/interrupts.c | 0
arch/mips/{nxp => }/pnx833x/common/platform.c | 0
arch/mips/{nxp => }/pnx833x/common/prom.c | 0
arch/mips/{nxp => }/pnx833x/common/reset.c | 0
arch/mips/{nxp => }/pnx833x/common/setup.c | 0
arch/mips/pnx833x/stb22x/Makefile | 1 +
arch/mips/{nxp => }/pnx833x/stb22x/board.c | 0
arch/mips/pnx8550/Makefile | 3 +
arch/mips/pnx8550/Platform | 7 +
arch/mips/{nxp => }/pnx8550/common/Makefile | 2 -
arch/mips/{nxp => }/pnx8550/common/int.c | 0
arch/mips/{nxp => }/pnx8550/common/pci.c | 0
arch/mips/{nxp => }/pnx8550/common/platform.c | 0
arch/mips/{nxp => }/pnx8550/common/proc.c | 0
arch/mips/{nxp => }/pnx8550/common/prom.c | 0
arch/mips/{nxp => }/pnx8550/common/reset.c | 0
arch/mips/{nxp => }/pnx8550/common/setup.c | 0
arch/mips/{nxp => }/pnx8550/common/time.c | 0
arch/mips/pnx8550/jbs/Makefile | 4 +
arch/mips/{nxp => }/pnx8550/jbs/board_setup.c | 0
arch/mips/{nxp => }/pnx8550/jbs/init.c | 0
arch/mips/{nxp => }/pnx8550/jbs/irqmap.c | 0
arch/mips/pnx8550/stb810/Makefile | 4 +
arch/mips/{nxp => }/pnx8550/stb810/board_setup.c | 0
arch/mips/{nxp => }/pnx8550/stb810/irqmap.c | 0
arch/mips/{nxp => }/pnx8550/stb810/prom_init.c | 0
arch/mips/powertv/Makefile | 5 +-
arch/mips/powertv/Platform | 7 +
arch/mips/powertv/asic/asic-calliope.c | 2 +-
arch/mips/powertv/asic/asic-cronus.c | 4 +-
arch/mips/powertv/asic/asic-zeus.c | 2 +-
arch/mips/powertv/asic/asic_devices.c | 24 +-
arch/mips/powertv/ioremap.c | 136 +++++
arch/mips/powertv/memory.c | 342 ++++++++++----
arch/mips/rb532/Makefile | 2 -
arch/mips/rb532/Platform | 7 +
arch/mips/sgi-ip22/Makefile | 2 -
arch/mips/sgi-ip22/Platform | 34 ++
arch/mips/sgi-ip27/Makefile | 2 -
arch/mips/sgi-ip27/Platform | 19 +
arch/mips/sgi-ip27/ip27-klconfig.c | 8 +-
arch/mips/sgi-ip32/Makefile | 2 -
arch/mips/sgi-ip32/Platform | 11 +
arch/mips/sibyte/Makefile | 27 +
arch/mips/sibyte/Platform | 43 ++
arch/mips/sibyte/bcm1480/Makefile | 2 -
arch/mips/sibyte/common/Makefile | 2 -
arch/mips/sibyte/sb1250/Makefile | 2 -
arch/mips/sni/Makefile | 2 -
arch/mips/sni/Platform | 11 +
arch/mips/txx9/Makefile | 17 +
arch/mips/txx9/Platform | 10 +
arch/mips/txx9/generic/Makefile | 2 -
arch/mips/txx9/jmr3927/Makefile | 2 -
arch/mips/txx9/rbtx4927/Makefile | 2 -
arch/mips/txx9/rbtx4938/Makefile | 2 -
arch/mips/txx9/rbtx4939/Makefile | 2 -
arch/mips/vr41xx/Platform | 32 ++
arch/mips/vr41xx/common/Makefile | 2 -
arch/mips/{gt64120 => }/wrppmc/Makefile | 4 +-
arch/mips/wrppmc/Platform | 7 +
arch/mips/{gt64120 => }/wrppmc/irq.c | 0
arch/mips/{gt64120 => }/wrppmc/pci.c | 0
arch/mips/{gt64120 => }/wrppmc/reset.c | 0
arch/mips/{gt64120 => }/wrppmc/serial.c | 0
arch/mips/{gt64120 => }/wrppmc/setup.c | 0
arch/mips/{gt64120 => }/wrppmc/time.c | 0
kernel/printk.c | 30 +-
126 files changed, 1189 insertions(+), 821 deletions(-)
create mode 100644 arch/mips/Kbuild
create mode 100644 arch/mips/Kbuild.platforms
create mode 100644 arch/mips/alchemy/Platform
create mode 100644 arch/mips/ar7/Platform
create mode 100644 arch/mips/bcm47xx/Platform
create mode 100644 arch/mips/bcm63xx/Platform
create mode 100644 arch/mips/cavium-octeon/Platform
create mode 100644 arch/mips/cobalt/Platform
create mode 100644 arch/mips/dec/Platform
create mode 100644 arch/mips/emma/Makefile
create mode 100644 arch/mips/emma/Platform
create mode 100644 arch/mips/jazz/Platform
create mode 100644 arch/mips/lasat/Platform
create mode 100644 arch/mips/loongson/Platform
create mode 100644 arch/mips/mipssim/Platform
create mode 100644 arch/mips/mti-malta/Platform
delete mode 100644 arch/mips/nxp/pnx833x/stb22x/Makefile
delete mode 100644 arch/mips/nxp/pnx8550/jbs/Makefile
delete mode 100644 arch/mips/nxp/pnx8550/stb810/Makefile
create mode 100644 arch/mips/pmc-sierra/Platform
create mode 100644 arch/mips/pnx833x/Makefile
create mode 100644 arch/mips/pnx833x/Platform
rename arch/mips/{nxp => }/pnx833x/common/Makefile (69%)
rename arch/mips/{nxp => }/pnx833x/common/interrupts.c (100%)
rename arch/mips/{nxp => }/pnx833x/common/platform.c (100%)
rename arch/mips/{nxp => }/pnx833x/common/prom.c (100%)
rename arch/mips/{nxp => }/pnx833x/common/reset.c (100%)
rename arch/mips/{nxp => }/pnx833x/common/setup.c (100%)
create mode 100644 arch/mips/pnx833x/stb22x/Makefile
rename arch/mips/{nxp => }/pnx833x/stb22x/board.c (100%)
create mode 100644 arch/mips/pnx8550/Makefile
create mode 100644 arch/mips/pnx8550/Platform
rename arch/mips/{nxp => }/pnx8550/common/Makefile (97%)
rename arch/mips/{nxp => }/pnx8550/common/int.c (100%)
rename arch/mips/{nxp => }/pnx8550/common/pci.c (100%)
rename arch/mips/{nxp => }/pnx8550/common/platform.c (100%)
rename arch/mips/{nxp => }/pnx8550/common/proc.c (100%)
rename arch/mips/{nxp => }/pnx8550/common/prom.c (100%)
rename arch/mips/{nxp => }/pnx8550/common/reset.c (100%)
rename arch/mips/{nxp => }/pnx8550/common/setup.c (100%)
rename arch/mips/{nxp => }/pnx8550/common/time.c (100%)
create mode 100644 arch/mips/pnx8550/jbs/Makefile
rename arch/mips/{nxp => }/pnx8550/jbs/board_setup.c (100%)
rename arch/mips/{nxp => }/pnx8550/jbs/init.c (100%)
rename arch/mips/{nxp => }/pnx8550/jbs/irqmap.c (100%)
create mode 100644 arch/mips/pnx8550/stb810/Makefile
rename arch/mips/{nxp => }/pnx8550/stb810/board_setup.c (100%)
rename arch/mips/{nxp => }/pnx8550/stb810/irqmap.c (100%)
rename arch/mips/{nxp => }/pnx8550/stb810/prom_init.c (100%)
create mode 100644 arch/mips/powertv/Platform
create mode 100644 arch/mips/powertv/ioremap.c
create mode 100644 arch/mips/rb532/Platform
create mode 100644 arch/mips/sgi-ip22/Platform
create mode 100644 arch/mips/sgi-ip27/Platform
create mode 100644 arch/mips/sgi-ip32/Platform
create mode 100644 arch/mips/sibyte/Makefile
create mode 100644 arch/mips/sibyte/Platform
create mode 100644 arch/mips/sni/Platform
create mode 100644 arch/mips/txx9/Makefile
create mode 100644 arch/mips/txx9/Platform
create mode 100644 arch/mips/vr41xx/Platform
rename arch/mips/{gt64120 => }/wrppmc/Makefile (80%)
create mode 100644 arch/mips/wrppmc/Platform
rename arch/mips/{gt64120 => }/wrppmc/irq.c (100%)
rename arch/mips/{gt64120 => }/wrppmc/pci.c (100%)
rename arch/mips/{gt64120 => }/wrppmc/reset.c (100%)
rename arch/mips/{gt64120 => }/wrppmc/serial.c (100%)
rename arch/mips/{gt64120 => }/wrppmc/setup.c (100%)
rename arch/mips/{gt64120 => }/wrppmc/time.c (100%)
Merging parisc/next
$ git merge parisc/next
Already up-to-date.
Merging powerpc/next
$ git merge powerpc/next
Already up-to-date.
Merging 4xx/next
$ git merge 4xx/next
Already up-to-date.
Merging 52xx-and-virtex/next
$ git merge 52xx-and-virtex/next
Resolved 'drivers/serial/mpc52xx_uart.c' using previous resolution.
Auto-merging drivers/serial/mpc52xx_uart.c
CONFLICT (content): Merge conflict in drivers/serial/mpc52xx_uart.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 869cbcb] Merge remote branch '52xx-and-virtex/next'
$ git diff -M --stat --summary HEAD^..
arch/powerpc/platforms/512x/Kconfig | 13 +--
drivers/serial/mpc52xx_uart.c | 145 ++++++++++++++++++++++++++++-------
2 files changed, 120 insertions(+), 38 deletions(-)
Merging galak/next
$ git merge galak/next
Already up-to-date.
Merging s390/features
$ git merge s390/features
Merge made by recursive.
arch/s390/include/asm/ccwdev.h | 2 +
arch/s390/mm/cmm.c | 11 +++++++-
drivers/s390/block/dasd_devmap.c | 4 ++-
drivers/s390/cio/ccwreq.c | 2 +
drivers/s390/cio/chsc.c | 49 ++++++++++++++++++++++++++++++++++++++
drivers/s390/cio/chsc.h | 2 +
drivers/s390/cio/device.c | 47 +++++++++++++++++++++++++++++++++---
drivers/s390/net/smsgiucv_app.c | 7 +++++
fs/partitions/ibm.c | 14 +++++++++-
9 files changed, 129 insertions(+), 9 deletions(-)
Merging sh/master
$ git merge sh/master
Merge made by recursive.
arch/sh/Kconfig | 1 +
arch/sh/boards/Kconfig | 11 +
arch/sh/boards/Makefile | 1 +
arch/sh/boards/board-sh2007.c | 133 +++
arch/sh/boards/mach-ecovec24/setup.c | 1 -
arch/sh/configs/sh2007_defconfig | 1357 +++++++++++++++++++++++++++++
arch/sh/drivers/pci/pci.c | 2 -
arch/sh/include/asm/Kbuild | 2 +
arch/sh/include/asm/elf.h | 27 +-
arch/sh/include/asm/kprobes.h | 1 -
arch/sh/include/asm/processor_32.h | 3 -
arch/sh/include/asm/processor_64.h | 3 -
arch/sh/include/asm/ptrace.h | 169 ++--
arch/sh/include/asm/ptrace_32.h | 83 ++
arch/sh/include/asm/ptrace_64.h | 20 +
arch/sh/include/mach-common/mach/sh2007.h | 117 +++
arch/sh/kernel/Makefile | 2 +-
arch/sh/kernel/kprobes.c | 100 ++--
arch/sh/kernel/ptrace.c | 33 +
arch/sh/kernel/ptrace_32.c | 27 +
arch/sh/kernel/ptrace_64.c | 79 ++
arch/sh/mm/pmb.c | 2 +-
arch/sh/tools/mach-types | 1 +
drivers/serial/sh-sci.h | 17 +-
24 files changed, 2021 insertions(+), 171 deletions(-)
create mode 100644 arch/sh/boards/board-sh2007.c
create mode 100644 arch/sh/configs/sh2007_defconfig
create mode 100644 arch/sh/include/asm/ptrace_32.h
create mode 100644 arch/sh/include/asm/ptrace_64.h
create mode 100644 arch/sh/include/mach-common/mach/sh2007.h
create mode 100644 arch/sh/kernel/ptrace.c
Merging genesis/master
$ git merge genesis/master
Resolved 'include/linux/serial_sci.h' using previous resolution.
Auto-merging MAINTAINERS
Auto-merging drivers/i2c/busses/Kconfig
Auto-merging drivers/serial/sh-sci.h
Auto-merging drivers/video/Kconfig
Auto-merging include/linux/serial_sci.h
CONFLICT (content): Merge conflict in include/linux/serial_sci.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 660f1d1] Merge remote branch 'genesis/master'
$ git diff -M --stat --summary HEAD^..
MAINTAINERS | 3 +-
arch/arm/configs/ap4evb_defconfig | 604 +++++++++++++++++++++++--
arch/arm/configs/g3evm_defconfig | 73 +++-
arch/arm/configs/g4evm_defconfig | 72 +++-
arch/arm/mach-shmobile/Kconfig | 13 +
arch/arm/mach-shmobile/Makefile | 6 +-
arch/arm/mach-shmobile/board-ap4evb.c | 499 ++++++++++++++++++++-
arch/arm/mach-shmobile/board-g3evm.c | 58 ++-
arch/arm/mach-shmobile/board-g4evm.c | 153 ++++++-
arch/arm/mach-shmobile/clock-sh7367.c | 357 +++++++++++++--
arch/arm/mach-shmobile/clock-sh7372.c | 399 ++++++++++++++++
arch/arm/mach-shmobile/clock-sh7377.c | 369 +++++++++++++++
arch/arm/mach-shmobile/clock.c | 44 ++
arch/arm/mach-shmobile/include/mach/common.h | 10 +
arch/arm/mach-shmobile/include/mach/irqs.h | 6 +
arch/arm/mach-shmobile/include/mach/memory.h | 3 +
arch/arm/mach-shmobile/include/mach/sh7372.h | 24 +
arch/arm/mach-shmobile/include/mach/vmalloc.h | 3 +-
arch/arm/mach-shmobile/intc-sh7367.c | 178 +++++++-
arch/arm/mach-shmobile/intc-sh7372.c | 232 +++++++++-
arch/arm/mach-shmobile/intc-sh7377.c | 300 ++++++++++++-
arch/arm/mach-shmobile/setup-sh7367.c | 30 +-
arch/arm/mach-shmobile/setup-sh7372.c | 391 +++++++++++++++-
arch/arm/mach-shmobile/setup-sh7377.c | 34 +-
drivers/dma/Kconfig | 2 +-
drivers/dma/shdma.c | 8 +-
drivers/i2c/busses/Kconfig | 2 +-
drivers/i2c/busses/i2c-sh_mobile.c | 121 ++++--
drivers/serial/sh-sci.c | 42 ++-
drivers/serial/sh-sci.h | 29 +-
drivers/sh/Makefile | 5 +-
drivers/video/Kconfig | 8 +
drivers/video/Makefile | 1 +
drivers/video/sh_mipi_dsi.c | 505 +++++++++++++++++++++
include/linux/serial_core.h | 3 +
include/video/mipi_display.h | 130 ++++++
include/video/sh_mipi_dsi.h | 35 ++
include/video/sh_mobile_lcdc.h | 39 +-
38 files changed, 4518 insertions(+), 273 deletions(-)
create mode 100644 arch/arm/mach-shmobile/clock-sh7372.c
create mode 100644 arch/arm/mach-shmobile/clock-sh7377.c
create mode 100644 arch/arm/mach-shmobile/clock.c
create mode 100644 drivers/video/sh_mipi_dsi.c
create mode 100644 include/video/mipi_display.h
create mode 100644 include/video/sh_mipi_dsi.h
Merging sparc/master
$ git merge sparc/master
Already up-to-date.
Merging tile/master
$ git merge tile/master
Auto-merging MAINTAINERS
Merge made by recursive.
MAINTAINERS | 6 +
arch/tile/Kbuild | 3 +
arch/tile/Kconfig | 352 +
arch/tile/Kconfig.debug | 43 +
arch/tile/Makefile | 52 +
arch/tile/configs/tile_defconfig | 1289 +++
arch/tile/include/arch/abi.h | 93 +
arch/tile/include/arch/chip.h | 23 +
arch/tile/include/arch/chip_tile64.h | 252 +
arch/tile/include/arch/chip_tilepro.h | 252 +
arch/tile/include/arch/interrupts.h | 19 +
arch/tile/include/arch/interrupts_32.h | 304 +
arch/tile/include/arch/sim_def.h | 512 +
arch/tile/include/arch/spr_def.h | 19 +
arch/tile/include/arch/spr_def_32.h | 162 +
arch/tile/include/asm/Kbuild | 3 +
arch/tile/include/asm/asm-offsets.h | 1 +
arch/tile/include/asm/atomic.h | 159 +
arch/tile/include/asm/atomic_32.h | 353 +
arch/tile/include/asm/auxvec.h | 20 +
arch/tile/include/asm/backtrace.h | 193 +
arch/tile/include/asm/bitops.h | 126 +
arch/tile/include/asm/bitops_32.h | 132 +
arch/tile/include/asm/bitsperlong.h | 26 +
arch/tile/include/asm/bug.h | 1 +
arch/tile/include/asm/bugs.h | 1 +
arch/tile/include/asm/byteorder.h | 1 +
arch/tile/include/asm/cache.h | 50 +
arch/tile/include/asm/cacheflush.h | 145 +
arch/tile/include/asm/checksum.h | 24 +
arch/tile/include/asm/compat.h | 308 +
arch/tile/include/asm/cputime.h | 1 +
arch/tile/include/asm/current.h | 31 +
arch/tile/include/asm/delay.h | 34 +
arch/tile/include/asm/device.h | 1 +
arch/tile/include/asm/div64.h | 1 +
arch/tile/include/asm/dma-mapping.h | 102 +
arch/tile/include/asm/dma.h | 25 +
arch/tile/include/asm/elf.h | 169 +
arch/tile/include/asm/emergency-restart.h | 1 +
arch/tile/include/asm/errno.h | 1 +
arch/tile/include/asm/fcntl.h | 1 +
arch/tile/include/asm/fixmap.h | 124 +
arch/tile/include/asm/ftrace.h | 20 +
arch/tile/include/asm/futex.h | 136 +
arch/tile/include/asm/hardirq.h | 47 +
arch/tile/include/asm/highmem.h | 73 +
arch/tile/include/asm/homecache.h | 125 +
arch/tile/include/asm/hugetlb.h | 109 +
arch/tile/include/asm/hv_driver.h | 60 +
arch/tile/include/asm/hw_irq.h | 18 +
arch/tile/include/asm/ide.h | 25 +
arch/tile/include/asm/io.h | 279 +
arch/tile/include/asm/ioctl.h | 1 +
arch/tile/include/asm/ioctls.h | 1 +
arch/tile/include/asm/ipc.h | 1 +
arch/tile/include/asm/ipcbuf.h | 1 +
arch/tile/include/asm/irq.h | 37 +
arch/tile/include/asm/irq_regs.h | 1 +
arch/tile/include/asm/irqflags.h | 267 +
arch/tile/include/asm/kdebug.h | 1 +
arch/tile/include/asm/kexec.h | 53 +
arch/tile/include/asm/kmap_types.h | 43 +
arch/tile/include/asm/linkage.h | 51 +
arch/tile/include/asm/local.h | 1 +
arch/tile/include/asm/memprof.h | 33 +
arch/tile/include/asm/mman.h | 40 +
arch/tile/include/asm/mmu.h | 31 +
arch/tile/include/asm/mmu_context.h | 131 +
arch/tile/include/asm/mmzone.h | 81 +
arch/tile/include/asm/module.h | 1 +
arch/tile/include/asm/msgbuf.h | 1 +
arch/tile/include/asm/mutex.h | 1 +
arch/tile/include/asm/opcode-tile.h | 30 +
arch/tile/include/asm/opcode-tile_32.h | 1597 ++++
arch/tile/include/asm/opcode-tile_64.h | 1597 ++++
arch/tile/include/asm/opcode_constants.h | 26 +
arch/tile/include/asm/opcode_constants_32.h | 480 +
arch/tile/include/asm/opcode_constants_64.h | 480 +
arch/tile/include/asm/page.h | 334 +
arch/tile/include/asm/param.h | 1 +
arch/tile/include/asm/pci-bridge.h | 117 +
arch/tile/include/asm/pci.h | 128 +
arch/tile/include/asm/percpu.h | 24 +
arch/tile/include/asm/pgalloc.h | 119 +
arch/tile/include/asm/pgtable.h | 475 +
arch/tile/include/asm/pgtable_32.h | 117 +
arch/tile/include/asm/poll.h | 1 +
arch/tile/include/asm/posix_types.h | 1 +
arch/tile/include/asm/processor.h | 339 +
arch/tile/include/asm/ptrace.h | 163 +
arch/tile/include/asm/resource.h | 1 +
arch/tile/include/asm/scatterlist.h | 22 +
arch/tile/include/asm/sections.h | 37 +
arch/tile/include/asm/sembuf.h | 1 +
arch/tile/include/asm/setup.h | 32 +
arch/tile/include/asm/shmbuf.h | 1 +
arch/tile/include/asm/shmparam.h | 1 +
arch/tile/include/asm/sigcontext.h | 27 +
arch/tile/include/asm/sigframe.h | 33 +
arch/tile/include/asm/siginfo.h | 30 +
arch/tile/include/asm/signal.h | 31 +
arch/tile/include/asm/smp.h | 126 +
arch/tile/include/asm/socket.h | 1 +
arch/tile/include/asm/sockios.h | 1 +
arch/tile/include/asm/spinlock.h | 24 +
arch/tile/include/asm/spinlock_32.h | 200 +
arch/tile/include/asm/spinlock_types.h | 60 +
arch/tile/include/asm/stack.h | 68 +
arch/tile/include/asm/stat.h | 1 +
arch/tile/include/asm/statfs.h | 1 +
arch/tile/include/asm/string.h | 32 +
arch/tile/include/asm/swab.h | 29 +
arch/tile/include/asm/syscall.h | 79 +
arch/tile/include/asm/syscalls.h | 40 +
arch/tile/include/asm/system.h | 220 +
arch/tile/include/asm/termbits.h | 1 +
arch/tile/include/asm/termios.h | 1 +
arch/tile/include/asm/thread_info.h | 165 +
arch/tile/include/asm/timex.h | 47 +
arch/tile/include/asm/tlb.h | 25 +
arch/tile/include/asm/tlbflush.h | 128 +
arch/tile/include/asm/topology.h | 85 +
arch/tile/include/asm/traps.h | 36 +
arch/tile/include/asm/types.h | 1 +
arch/tile/include/asm/uaccess.h | 578 ++
arch/tile/include/asm/ucontext.h | 1 +
arch/tile/include/asm/unaligned.h | 24 +
arch/tile/include/asm/unistd.h | 47 +
arch/tile/include/asm/user.h | 21 +
arch/tile/include/asm/xor.h | 1 +
arch/tile/include/hv/drv_pcie_rc_intf.h | 38 +
arch/tile/include/hv/hypervisor.h | 2366 +++++
arch/tile/include/hv/syscall_public.h | 42 +
arch/tile/kernel/Makefile | 16 +
arch/tile/kernel/asm-offsets.c | 76 +
arch/tile/kernel/backtrace.c | 634 ++
arch/tile/kernel/compat.c | 183 +
arch/tile/kernel/compat_signal.c | 433 +
arch/tile/kernel/early_printk.c | 109 +
arch/tile/kernel/entry.S | 141 +
arch/tile/kernel/head_32.S | 180 +
arch/tile/kernel/hvglue.lds | 56 +
arch/tile/kernel/init_task.c | 59 +
arch/tile/kernel/intvec_32.S | 2006 ++++
arch/tile/kernel/irq.c | 227 +
arch/tile/kernel/machine_kexec.c | 291 +
arch/tile/kernel/messaging.c | 115 +
arch/tile/kernel/module.c | 257 +
arch/tile/kernel/pci-dma.c | 251 +
arch/tile/kernel/proc.c | 91 +
arch/tile/kernel/process.c | 647 ++
arch/tile/kernel/ptrace.c | 203 +
arch/tile/kernel/reboot.c | 52 +
arch/tile/kernel/regs_32.S | 145 +
arch/tile/kernel/relocate_kernel.S | 280 +
arch/tile/kernel/setup.c | 1497 +++
arch/tile/kernel/signal.c | 359 +
arch/tile/kernel/single_step.c | 656 ++
arch/tile/kernel/smp.c | 202 +
arch/tile/kernel/smpboot.c | 293 +
arch/tile/kernel/stack.c | 485 +
arch/tile/kernel/sys.c | 122 +
arch/tile/kernel/tile-desc_32.c |13826 +++++++++++++++++++++++++++
arch/tile/kernel/time.c | 220 +
arch/tile/kernel/tlb.c | 97 +
arch/tile/kernel/traps.c | 237 +
arch/tile/kernel/vmlinux.lds.S | 98 +
arch/tile/lib/Makefile | 16 +
arch/tile/lib/__invalidate_icache.S | 106 +
arch/tile/lib/atomic_32.c | 347 +
arch/tile/lib/atomic_asm_32.S | 197 +
arch/tile/lib/checksum.c | 102 +
arch/tile/lib/cpumask.c | 51 +
arch/tile/lib/delay.c | 34 +
arch/tile/lib/exports.c | 78 +
arch/tile/lib/mb_incoherent.S | 34 +
arch/tile/lib/memchr_32.c | 68 +
arch/tile/lib/memcpy_32.S | 628 ++
arch/tile/lib/memcpy_tile64.c | 271 +
arch/tile/lib/memmove_32.c | 63 +
arch/tile/lib/memset_32.c | 274 +
arch/tile/lib/spinlock_32.c | 221 +
arch/tile/lib/spinlock_common.h | 64 +
arch/tile/lib/strchr_32.c | 66 +
arch/tile/lib/strlen_32.c | 36 +
arch/tile/lib/uaccess.c | 31 +
arch/tile/lib/usercopy_32.S | 223 +
arch/tile/mm/Makefile | 9 +
arch/tile/mm/elf.c | 164 +
arch/tile/mm/extable.c | 30 +
arch/tile/mm/fault.c | 905 ++
arch/tile/mm/highmem.c | 328 +
arch/tile/mm/homecache.c | 445 +
arch/tile/mm/hugetlbpage.c | 343 +
arch/tile/mm/init.c | 1082 +++
arch/tile/mm/migrate.h | 50 +
arch/tile/mm/migrate_32.S | 211 +
arch/tile/mm/mmap.c | 75 +
arch/tile/mm/pgtable.c | 566 ++
drivers/char/Makefile | 1 +
drivers/char/hvc_tile.c | 67 +
include/asm-generic/unistd.h | 26 +-
203 files changed, 49568 insertions(+), 6 deletions(-)
create mode 100644 arch/tile/Kbuild
create mode 100644 arch/tile/Kconfig
create mode 100644 arch/tile/Kconfig.debug
create mode 100644 arch/tile/Makefile
create mode 100644 arch/tile/configs/tile_defconfig
create mode 100644 arch/tile/include/arch/abi.h
create mode 100644 arch/tile/include/arch/chip.h
create mode 100644 arch/tile/include/arch/chip_tile64.h
create mode 100644 arch/tile/include/arch/chip_tilepro.h
create mode 100644 arch/tile/include/arch/interrupts.h
create mode 100644 arch/tile/include/arch/interrupts_32.h
create mode 100644 arch/tile/include/arch/sim_def.h
create mode 100644 arch/tile/include/arch/spr_def.h
create mode 100644 arch/tile/include/arch/spr_def_32.h
create mode 100644 arch/tile/include/asm/Kbuild
create mode 100644 arch/tile/include/asm/asm-offsets.h
create mode 100644 arch/tile/include/asm/atomic.h
create mode 100644 arch/tile/include/asm/atomic_32.h
create mode 100644 arch/tile/include/asm/auxvec.h
create mode 100644 arch/tile/include/asm/backtrace.h
create mode 100644 arch/tile/include/asm/bitops.h
create mode 100644 arch/tile/include/asm/bitops_32.h
create mode 100644 arch/tile/include/asm/bitsperlong.h
create mode 100644 arch/tile/include/asm/bug.h
create mode 100644 arch/tile/include/asm/bugs.h
create mode 100644 arch/tile/include/asm/byteorder.h
create mode 100644 arch/tile/include/asm/cache.h
create mode 100644 arch/tile/include/asm/cacheflush.h
create mode 100644 arch/tile/include/asm/checksum.h
create mode 100644 arch/tile/include/asm/compat.h
create mode 100644 arch/tile/include/asm/cputime.h
create mode 100644 arch/tile/include/asm/current.h
create mode 100644 arch/tile/include/asm/delay.h
create mode 100644 arch/tile/include/asm/device.h
create mode 100644 arch/tile/include/asm/div64.h
create mode 100644 arch/tile/include/asm/dma-mapping.h
create mode 100644 arch/tile/include/asm/dma.h
create mode 100644 arch/tile/include/asm/elf.h
create mode 100644 arch/tile/include/asm/emergency-restart.h
create mode 100644 arch/tile/include/asm/errno.h
create mode 100644 arch/tile/include/asm/fcntl.h
create mode 100644 arch/tile/include/asm/fixmap.h
create mode 100644 arch/tile/include/asm/ftrace.h
create mode 100644 arch/tile/include/asm/futex.h
create mode 100644 arch/tile/include/asm/hardirq.h
create mode 100644 arch/tile/include/asm/highmem.h
create mode 100644 arch/tile/include/asm/homecache.h
create mode 100644 arch/tile/include/asm/hugetlb.h
create mode 100644 arch/tile/include/asm/hv_driver.h
create mode 100644 arch/tile/include/asm/hw_irq.h
create mode 100644 arch/tile/include/asm/ide.h
create mode 100644 arch/tile/include/asm/io.h
create mode 100644 arch/tile/include/asm/ioctl.h
create mode 100644 arch/tile/include/asm/ioctls.h
create mode 100644 arch/tile/include/asm/ipc.h
create mode 100644 arch/tile/include/asm/ipcbuf.h
create mode 100644 arch/tile/include/asm/irq.h
create mode 100644 arch/tile/include/asm/irq_regs.h
create mode 100644 arch/tile/include/asm/irqflags.h
create mode 100644 arch/tile/include/asm/kdebug.h
create mode 100644 arch/tile/include/asm/kexec.h
create mode 100644 arch/tile/include/asm/kmap_types.h
create mode 100644 arch/tile/include/asm/linkage.h
create mode 100644 arch/tile/include/asm/local.h
create mode 100644 arch/tile/include/asm/memprof.h
create mode 100644 arch/tile/include/asm/mman.h
create mode 100644 arch/tile/include/asm/mmu.h
create mode 100644 arch/tile/include/asm/mmu_context.h
create mode 100644 arch/tile/include/asm/mmzone.h
create mode 100644 arch/tile/include/asm/module.h
create mode 100644 arch/tile/include/asm/msgbuf.h
create mode 100644 arch/tile/include/asm/mutex.h
create mode 100644 arch/tile/include/asm/opcode-tile.h
create mode 100644 arch/tile/include/asm/opcode-tile_32.h
create mode 100644 arch/tile/include/asm/opcode-tile_64.h
create mode 100644 arch/tile/include/asm/opcode_constants.h
create mode 100644 arch/tile/include/asm/opcode_constants_32.h
create mode 100644 arch/tile/include/asm/opcode_constants_64.h
create mode 100644 arch/tile/include/asm/page.h
create mode 100644 arch/tile/include/asm/param.h
create mode 100644 arch/tile/include/asm/pci-bridge.h
create mode 100644 arch/tile/include/asm/pci.h
create mode 100644 arch/tile/include/asm/percpu.h
create mode 100644 arch/tile/include/asm/pgalloc.h
create mode 100644 arch/tile/include/asm/pgtable.h
create mode 100644 arch/tile/include/asm/pgtable_32.h
create mode 100644 arch/tile/include/asm/poll.h
create mode 100644 arch/tile/include/asm/posix_types.h
create mode 100644 arch/tile/include/asm/processor.h
create mode 100644 arch/tile/include/asm/ptrace.h
create mode 100644 arch/tile/include/asm/resource.h
create mode 100644 arch/tile/include/asm/scatterlist.h
create mode 100644 arch/tile/include/asm/sections.h
create mode 100644 arch/tile/include/asm/sembuf.h
create mode 100644 arch/tile/include/asm/setup.h
create mode 100644 arch/tile/include/asm/shmbuf.h
create mode 100644 arch/tile/include/asm/shmparam.h
create mode 100644 arch/tile/include/asm/sigcontext.h
create mode 100644 arch/tile/include/asm/sigframe.h
create mode 100644 arch/tile/include/asm/siginfo.h
create mode 100644 arch/tile/include/asm/signal.h
create mode 100644 arch/tile/include/asm/smp.h
create mode 100644 arch/tile/include/asm/socket.h
create mode 100644 arch/tile/include/asm/sockios.h
create mode 100644 arch/tile/include/asm/spinlock.h
create mode 100644 arch/tile/include/asm/spinlock_32.h
create mode 100644 arch/tile/include/asm/spinlock_types.h
create mode 100644 arch/tile/include/asm/stack.h
create mode 100644 arch/tile/include/asm/stat.h
create mode 100644 arch/tile/include/asm/statfs.h
create mode 100644 arch/tile/include/asm/string.h
create mode 100644 arch/tile/include/asm/swab.h
create mode 100644 arch/tile/include/asm/syscall.h
create mode 100644 arch/tile/include/asm/syscalls.h
create mode 100644 arch/tile/include/asm/system.h
create mode 100644 arch/tile/include/asm/termbits.h
create mode 100644 arch/tile/include/asm/termios.h
create mode 100644 arch/tile/include/asm/thread_info.h
create mode 100644 arch/tile/include/asm/timex.h
create mode 100644 arch/tile/include/asm/tlb.h
create mode 100644 arch/tile/include/asm/tlbflush.h
create mode 100644 arch/tile/include/asm/topology.h
create mode 100644 arch/tile/include/asm/traps.h
create mode 100644 arch/tile/include/asm/types.h
create mode 100644 arch/tile/include/asm/uaccess.h
create mode 100644 arch/tile/include/asm/ucontext.h
create mode 100644 arch/tile/include/asm/unaligned.h
create mode 100644 arch/tile/include/asm/unistd.h
create mode 100644 arch/tile/include/asm/user.h
create mode 100644 arch/tile/include/asm/xor.h
create mode 100644 arch/tile/include/hv/drv_pcie_rc_intf.h
create mode 100644 arch/tile/include/hv/hypervisor.h
create mode 100644 arch/tile/include/hv/syscall_public.h
create mode 100644 arch/tile/kernel/Makefile
create mode 100644 arch/tile/kernel/asm-offsets.c
create mode 100644 arch/tile/kernel/backtrace.c
create mode 100644 arch/tile/kernel/compat.c
create mode 100644 arch/tile/kernel/compat_signal.c
create mode 100644 arch/tile/kernel/early_printk.c
create mode 100644 arch/tile/kernel/entry.S
create mode 100644 arch/tile/kernel/head_32.S
create mode 100644 arch/tile/kernel/hvglue.lds
create mode 100644 arch/tile/kernel/init_task.c
create mode 100644 arch/tile/kernel/intvec_32.S
create mode 100644 arch/tile/kernel/irq.c
create mode 100644 arch/tile/kernel/machine_kexec.c
create mode 100644 arch/tile/kernel/messaging.c
create mode 100644 arch/tile/kernel/module.c
create mode 100644 arch/tile/kernel/pci-dma.c
create mode 100644 arch/tile/kernel/proc.c
create mode 100644 arch/tile/kernel/process.c
create mode 100644 arch/tile/kernel/ptrace.c
create mode 100644 arch/tile/kernel/reboot.c
create mode 100644 arch/tile/kernel/regs_32.S
create mode 100644 arch/tile/kernel/relocate_kernel.S
create mode 100644 arch/tile/kernel/setup.c
create mode 100644 arch/tile/kernel/signal.c
create mode 100644 arch/tile/kernel/single_step.c
create mode 100644 arch/tile/kernel/smp.c
create mode 100644 arch/tile/kernel/smpboot.c
create mode 100644 arch/tile/kernel/stack.c
create mode 100644 arch/tile/kernel/sys.c
create mode 100644 arch/tile/kernel/tile-desc_32.c
create mode 100644 arch/tile/kernel/time.c
create mode 100644 arch/tile/kernel/tlb.c
create mode 100644 arch/tile/kernel/traps.c
create mode 100644 arch/tile/kernel/vmlinux.lds.S
create mode 100644 arch/tile/lib/Makefile
create mode 100644 arch/tile/lib/__invalidate_icache.S
create mode 100644 arch/tile/lib/atomic_32.c
create mode 100644 arch/tile/lib/atomic_asm_32.S
create mode 100644 arch/tile/lib/checksum.c
create mode 100644 arch/tile/lib/cpumask.c
create mode 100644 arch/tile/lib/delay.c
create mode 100644 arch/tile/lib/exports.c
create mode 100644 arch/tile/lib/mb_incoherent.S
create mode 100644 arch/tile/lib/memchr_32.c
create mode 100644 arch/tile/lib/memcpy_32.S
create mode 100644 arch/tile/lib/memcpy_tile64.c
create mode 100644 arch/tile/lib/memmove_32.c
create mode 100644 arch/tile/lib/memset_32.c
create mode 100644 arch/tile/lib/spinlock_32.c
create mode 100644 arch/tile/lib/spinlock_common.h
create mode 100644 arch/tile/lib/strchr_32.c
create mode 100644 arch/tile/lib/strlen_32.c
create mode 100644 arch/tile/lib/uaccess.c
create mode 100644 arch/tile/lib/usercopy_32.S
create mode 100644 arch/tile/mm/Makefile
create mode 100644 arch/tile/mm/elf.c
create mode 100644 arch/tile/mm/extable.c
create mode 100644 arch/tile/mm/fault.c
create mode 100644 arch/tile/mm/highmem.c
create mode 100644 arch/tile/mm/homecache.c
create mode 100644 arch/tile/mm/hugetlbpage.c
create mode 100644 arch/tile/mm/init.c
create mode 100644 arch/tile/mm/migrate.h
create mode 100644 arch/tile/mm/migrate_32.S
create mode 100644 arch/tile/mm/mmap.c
create mode 100644 arch/tile/mm/pgtable.c
create mode 100644 drivers/char/hvc_tile.c
Merging xtensa/master
$ git merge xtensa/master
Auto-merging arch/xtensa/kernel/time.c
Merge made by recursive.
arch/xtensa/Kconfig | 17 +-
arch/xtensa/Makefile | 7 +-
arch/xtensa/boot/Makefile | 1 +
arch/xtensa/configs/iss_defconfig | 1 +
arch/xtensa/include/asm/cacheflush.h | 1 +
arch/xtensa/include/asm/coprocessor.h | 9 +-
arch/xtensa/include/asm/elf.h | 1 +
arch/xtensa/include/asm/io.h | 40 ++--
arch/xtensa/include/asm/irq.h | 7 +-
arch/xtensa/include/asm/pgalloc.h | 1 +
arch/xtensa/include/asm/processor.h | 1 -
arch/xtensa/include/asm/ptrace.h | 2 +
arch/xtensa/include/asm/serial.h | 12 +-
arch/xtensa/kernel/Makefile | 8 +-
arch/xtensa/kernel/asm-offsets.c | 1 +
arch/xtensa/kernel/entry.S | 1 +
arch/xtensa/kernel/head.S | 4 +-
arch/xtensa/kernel/time.c | 2 +-
arch/xtensa/platforms/iss/network.c | 22 +-
arch/xtensa/platforms/xtavnet/Makefile | 10 +
.../platforms/xtavnet/include/platform/hardware.h | 85 ++++++
.../platforms/xtavnet/include/platform/lcd.h | 22 ++
.../platforms/xtavnet/include/platform/serial.h | 1 +
arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++
arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++
25 files changed, 554 insertions(+), 50 deletions(-)
create mode 100644 arch/xtensa/platforms/xtavnet/Makefile
create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h
create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h
create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h
create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c
create mode 100644 arch/xtensa/platforms/xtavnet/setup.c
Merging ceph/for-next
$ git merge ceph/for-next
Auto-merging fs/ceph/caps.c
Auto-merging fs/ceph/inode.c
Merge made by recursive.
fs/ceph/addr.c | 2 +-
fs/ceph/caps.c | 40 +++++++++++++++++++++++++++++-----------
fs/ceph/ceph_fs.c | 50 ++++++++++++++++++++++++--------------------------
fs/ceph/ceph_fs.h | 3 ++-
fs/ceph/file.c | 24 ++++++++++++++++--------
fs/ceph/inode.c | 5 +++--
fs/ceph/ioctl.c | 24 ++++++++++++++++++++++++
fs/ceph/ioctl.h | 2 ++
8 files changed, 101 insertions(+), 49 deletions(-)
Merging cifs/master
$ git merge cifs/master
Auto-merging MAINTAINERS
Merge made by recursive.
MAINTAINERS | 2 +-
fs/cifs/cifsfs.c | 16 +++++++--
fs/cifs/cifsproto.h | 1 -
fs/cifs/dir.c | 76 ++++++++++++++++++++++----------------
fs/cifs/file.c | 100 ++++++++++++++++++---------------------------------
fs/cifs/inode.c | 4 ++
fs/cifs/sess.c | 10 +-----
7 files changed, 98 insertions(+), 111 deletions(-)
Merging configfs/linux-next
$ git merge configfs/linux-next
Already up-to-date.
Merging ecryptfs/next
$ git merge ecryptfs/next
Resolved 'fs/ecryptfs/main.c' using previous resolution.
Auto-merging fs/ecryptfs/main.c
CONFLICT (content): Merge conflict in fs/ecryptfs/main.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 12115e2] Merge remote branch 'ecryptfs/next'
$ git diff -M --stat --summary HEAD^..
Merging ext3/for_next
$ git merge ext3/for_next
Auto-merging fs/xfs/linux-2.6/xfs_quotaops.c
Merge made by recursive.
fs/ext2/acl.c | 1 +
fs/ext3/acl.c | 1 +
fs/ext3/inode.c | 16 +---------------
fs/ext3/namei.c | 3 +--
fs/ext3/resize.c | 2 --
fs/ext3/super.c | 17 ++++-------------
fs/gfs2/quota.c | 10 +++++-----
fs/jbd/journal.c | 7 -------
fs/jbd/recovery.c | 11 ++---------
fs/quota/dquot.c | 38 +++++++++++++++++++++++++++++---------
fs/xfs/linux-2.6/xfs_quotaops.c | 10 +++++-----
fs/xfs/quota/xfs_qm_syscalls.c | 32 ++++++++++++++++----------------
include/linux/dqblk_xfs.h | 24 ++++++++++++------------
include/linux/ext3_fs.h | 1 -
include/linux/quotaops.h | 10 ----------
15 files changed, 77 insertions(+), 106 deletions(-)
Merging ext4/next
$ git merge ext4/next
Already up-to-date.
Merging fatfs/master
$ git merge fatfs/master
Already up-to-date.
Merging fuse/for-next
$ git merge fuse/for-next
Already up-to-date.
Merging gfs2/master
$ git merge gfs2/master
Merge made by recursive.
fs/gfs2/aops.c | 5 +---
fs/gfs2/incore.h | 1 +
fs/gfs2/ops_fstype.c | 27 ++++++++++++++++++++++-
fs/gfs2/sys.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++--
4 files changed, 81 insertions(+), 9 deletions(-)
Merging jfs/next
$ git merge jfs/next
Already up-to-date.
Merging logfs/master
$ git merge logfs/master
Resolved 'fs/logfs/logfs.h' using previous resolution.
Auto-merging fs/logfs/dir.c
Auto-merging fs/logfs/file.c
Auto-merging fs/logfs/logfs.h
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 9be9706] Merge remote branch 'logfs/master'
$ git diff -M --stat --summary HEAD^..
fs/logfs/dir.c | 2 +-
fs/logfs/file.c | 6 +++---
fs/logfs/logfs.h | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
Merging nfs/linux-next
$ git merge nfs/linux-next
Merge made by recursive.
fs/nfs/callback_proc.c | 13 +--
fs/nfs/client.c | 143 ++++++++----------
fs/nfs/delegation.c | 6 +-
fs/nfs/delegation.h | 4 +-
fs/nfs/getroot.c | 2 +-
fs/nfs/nfs4_fs.h | 39 +++++-
fs/nfs/nfs4proc.c | 349 ++++++++++++++++++++++++---------------------
fs/nfs/nfs4renewd.c | 4 +-
fs/nfs/nfs4state.c | 21 ++--
fs/nfs/nfs4xdr.c | 14 +-
fs/nfs/read.c | 2 +-
fs/nfs/super.c | 22 +++-
fs/nfs/unlink.c | 2 +-
fs/nfs/write.c | 4 +-
include/linux/nfs_fs_sb.h | 7 +-
include/linux/nfs_xdr.h | 6 +-
net/sunrpc/xprtsock.c | 38 +++--
17 files changed, 358 insertions(+), 318 deletions(-)
Merging nfsd/nfsd-next
$ git merge nfsd/nfsd-next
Auto-merging fs/nfsd/nfs4state.c
Merge made by recursive.
fs/nfsd/nfs4callback.c | 34 ++++++++++++++--------------------
fs/nfsd/nfs4state.c | 16 ++++++++++++----
2 files changed, 26 insertions(+), 24 deletions(-)
Merging nilfs2/for-next
$ git merge nilfs2/for-next
Merge made by recursive.
fs/nilfs2/nilfs.h | 11 ++
fs/nilfs2/recovery.c | 346 +++++++++++++++++++++++++++----------------------
fs/nilfs2/segbuf.h | 24 ++--
fs/nilfs2/segment.c | 17 ++-
fs/nilfs2/segment.h | 10 +-
fs/nilfs2/super.c | 187 ++++++++++++++++++---------
fs/nilfs2/the_nilfs.c | 32 +++--
fs/nilfs2/the_nilfs.h | 21 +--
8 files changed, 385 insertions(+), 263 deletions(-)
Merging ocfs2/linux-next
$ git merge ocfs2/linux-next
Merge made by recursive.
fs/ocfs2/dlm/dlmdomain.c | 1 +
fs/ocfs2/journal.c | 6 +++---
fs/ocfs2/localalloc.c | 7 +++++++
3 files changed, 11 insertions(+), 3 deletions(-)
Merging squashfs/master
$ git merge squashfs/master
Already up-to-date.
Merging udf/for_next
$ git merge udf/for_next
Auto-merging fs/udf/file.c
Merge made by recursive.
fs/udf/file.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
Merging v9fs/for-next
$ git merge v9fs/for-next
Merge made by recursive.
fs/9p/fid.c | 3 +-
fs/9p/v9fs.c | 2 +-
fs/9p/v9fs_vfs.h | 1 +
fs/9p/vfs_dir.c | 134 +++++++++++++++++++++++++----
fs/9p/vfs_file.c | 13 ++--
fs/9p/vfs_inode.c | 215 +++++++++++++++++++++++++++++++++++++++++----
fs/9p/vfs_super.c | 43 +++++----
include/linux/virtio_9p.h | 1 +
include/net/9p/9p.h | 65 ++++++++++++++
include/net/9p/client.h | 21 +++++
net/9p/client.c | 131 +++++++++++++++++++++++++++-
net/9p/protocol.c | 66 ++++++++++++++
12 files changed, 633 insertions(+), 62 deletions(-)
Merging ubifs/linux-next
$ git merge ubifs/linux-next
Merge made by recursive.
fs/ubifs/lpt.c | 14 +++++++-------
fs/ubifs/lpt_commit.c | 2 +-
fs/ubifs/super.c | 2 ++
3 files changed, 10 insertions(+), 8 deletions(-)
Merging xfs/master
$ git merge xfs/master
Already up-to-date.
Merging vfs/for-next
$ git merge vfs/for-next
Auto-merging fs/9p/vfs_inode.c
Auto-merging fs/block_dev.c
Auto-merging fs/btrfs/inode.c
Auto-merging fs/cifs/inode.c
Auto-merging fs/ext3/inode.c
Auto-merging fs/gfs2/aops.c
Auto-merging fs/logfs/file.c
Auto-merging fs/nilfs2/recovery.c
Auto-merging fs/udf/file.c
Auto-merging fs/xfs/linux-2.6/xfs_aops.c
Merge made by recursive.
Documentation/filesystems/porting | 18 +++
arch/powerpc/platforms/cell/spufs/inode.c | 4 +-
arch/um/include/shared/os.h | 3 +
arch/um/kernel/ksyms.c | 3 +
arch/um/os-Linux/file.c | 15 +++
arch/um/os-Linux/user_syms.c | 4 +
drivers/staging/pohmelfs/inode.c | 14 ++-
fs/9p/vfs_inode.c | 15 ++-
fs/adfs/inode.c | 16 ++-
fs/affs/file.c | 11 ++-
fs/affs/inode.c | 13 ++-
fs/attr.c | 88 ++++++--------
fs/bfs/file.c | 14 ++-
fs/block_dev.c | 10 +-
fs/btrfs/inode.c | 12 +-
fs/buffer.c | 180 ++++++-----------------------
fs/cifs/inode.c | 74 ++++++++-----
fs/direct-io.c | 74 +++---------
fs/ecryptfs/inode.c | 18 +++-
fs/exofs/exofs.h | 1 -
fs/exofs/file.c | 1 -
fs/exofs/inode.c | 121 ++++++++-----------
fs/ext2/dir.c | 23 ++--
fs/ext2/ext2.h | 3 -
fs/ext2/inode.c | 37 ++-----
fs/ext3/inode.c | 26 ++++-
fs/ext4/inode.c | 42 +++++---
fs/fat/fat.h | 1 -
fs/fat/file.c | 49 +++-----
fs/fat/inode.c | 6 +-
fs/fuse/dir.c | 17 +--
fs/gfs2/aops.c | 10 +-
fs/gfs2/inode.c | 25 +++-
fs/gfs2/ops_inode.c | 18 ++-
fs/gfs2/xattr.c | 24 +++-
fs/hfs/inode.c | 40 ++++++-
fs/hfsplus/inode.c | 50 ++++++++-
fs/hostfs/hostfs_kern.c | 18 +++-
fs/hostfs/hostfs_user.c | 6 +-
fs/hpfs/file.c | 11 ++-
fs/hpfs/inode.c | 12 ++-
fs/hppfs/hppfs.c | 1 +
fs/hugetlbfs/inode.c | 17 ++--
fs/jffs2/dir.c | 16 +--
fs/jffs2/fs.c | 4 +-
fs/jfs/file.c | 14 ++-
fs/jfs/inode.c | 28 ++++-
fs/libfs.c | 70 +++---------
fs/logfs/file.c | 18 ++-
fs/minix/dir.c | 21 +---
fs/minix/file.c | 22 ++++
fs/minix/inode.c | 20 ++-
fs/minix/minix.h | 4 +-
fs/ncpfs/inode.c | 24 ++--
fs/nilfs2/dir.c | 25 +---
fs/nilfs2/inode.c | 50 +++++++--
fs/nilfs2/recovery.c | 11 +-
fs/ntfs/inode.c | 3 -
fs/ocfs2/aops.c | 9 +-
fs/ocfs2/dlmfs/dlmfs.c | 8 +-
fs/ocfs2/file.c | 22 +++-
fs/omfs/file.c | 36 ++++++-
fs/proc/base.c | 16 ++-
fs/proc/generic.c | 18 ++-
fs/proc/proc_sysctl.c | 15 ++-
fs/qnx4/inode.c | 11 ++-
fs/ramfs/file-nommu.c | 7 +-
fs/reiserfs/inode.c | 119 +++++++++++--------
fs/smbfs/inode.c | 4 +-
fs/sysfs/inode.c | 2 +-
fs/sysv/dir.c | 21 +---
fs/sysv/file.c | 22 ++++
fs/sysv/itree.c | 19 ++-
fs/sysv/sysv.h | 4 +-
fs/ubifs/file.c | 23 ++---
fs/ubifs/ubifs.h | 2 +-
fs/udf/file.c | 22 ++++
fs/udf/inode.c | 13 ++-
fs/ufs/dir.c | 13 +--
fs/ufs/inode.c | 20 ++-
fs/ufs/truncate.c | 16 +--
fs/ufs/util.h | 4 +-
fs/xfs/linux-2.6/xfs_aops.c | 21 +++-
include/linux/buffer_head.h | 19 +---
include/linux/fs.h | 59 +++------
include/linux/mm.h | 1 +
mm/shmem.c | 15 ++-
mm/truncate.c | 38 +++++--
88 files changed, 1146 insertions(+), 928 deletions(-)
$ git am -3 ../patches/0001-v9fs-fixup-for-inode_setattr-being-removed.patch
Applying: v9fs: fixup for inode_setattr being removed
$ git reset HEAD^
Unstaged changes after reset:
M fs/9p/vfs_inode.c
$ git add .
$ git commit -v -a --amend
[master f1f280b] Merge remote branch 'vfs/for-next'
Merging pci/linux-next
$ git merge pci/linux-next
Merge made by recursive.
Documentation/kernel-parameters.txt | 2 ++
arch/x86/include/asm/pci_x86.h | 1 +
arch/x86/pci/common.c | 20 ++++++++++++++++++++
arch/x86/pci/legacy.c | 2 +-
drivers/acpi/pci_root.c | 9 +++++++++
drivers/net/e1000e/netdev.c | 16 ++++------------
drivers/net/r8169.c | 16 ++++------------
drivers/pci/bus.c | 4 +++-
drivers/pci/hotplug/pciehp_pci.c | 2 +-
drivers/pci/hotplug/shpchp_hpc.c | 2 +-
drivers/pci/hotplug/shpchp_pci.c | 19 ++++---------------
drivers/pci/msi.c | 2 +-
drivers/pci/pci-driver.c | 32 +++++++++++++++++++++++++++++---
drivers/pci/pcie/aer/aerdrv_core.c | 17 +++++++++--------
drivers/pci/pcie/aspm.c | 16 ++++++++++++++--
drivers/pci/quirks.c | 24 +++++++++++++++++++++---
drivers/pci/setup-bus.c | 12 +++++++-----
17 files changed, 131 insertions(+), 65 deletions(-)
Merging hid/for-next
$ git merge hid/for-next
Merge made by recursive.
.../ABI/testing/sysfs-driver-hid-roccat-kone | 13 ---
drivers/hid/Kconfig | 1 +
drivers/hid/hid-core.c | 21 ++++-
drivers/hid/hid-debug.c | 2 +-
drivers/hid/hid-ids.h | 18 ++++
drivers/hid/hid-magicmouse.c | 13 ++-
drivers/hid/hid-ntrig.c | 36 +++++++
drivers/hid/hid-roccat-kone.c | 25 +----
drivers/hid/hid-roccat-kone.h | 2 -
drivers/hid/hid-roccat.c | 9 +-
drivers/hid/hid-roccat.h | 2 +-
drivers/hid/hidraw.c | 107 ++++++++++++++++++--
drivers/hid/usbhid/hid-core.c | 30 ++++++-
include/linux/hid.h | 3 +
include/linux/hidraw.h | 3 +
15 files changed, 229 insertions(+), 56 deletions(-)
Merging quilt/i2c
$ git merge quilt/i2c
Merge made by recursive.
Documentation/i2c/instantiating-devices | 2 +-
drivers/i2c/i2c-core.c | 88 +++++++++++++++++++----------
drivers/i2c/i2c-dev.c | 26 ++------
drivers/macintosh/therm_windtunnel.c | 4 +-
drivers/media/video/bt8xx/bttv-i2c.c | 2 +-
drivers/media/video/cx18/cx18-i2c.c | 3 +-
drivers/media/video/cx23885/cx23885-i2c.c | 15 +----
drivers/media/video/cx88/cx88-i2c.c | 19 +-----
drivers/media/video/em28xx/em28xx-cards.c | 2 +-
drivers/media/video/ivtv/ivtv-i2c.c | 9 ++-
drivers/media/video/v4l2-common.c | 3 +-
drivers/usb/host/ohci-pnx4008.c | 2 +-
drivers/video/matrox/i2c-matroxfb.c | 2 +-
include/linux/i2c.h | 30 ++++------
14 files changed, 99 insertions(+), 108 deletions(-)
Merging bjdooks-i2c/next-i2c
$ git merge bjdooks-i2c/next-i2c
Resolved 'arch/arm/plat-omap/i2c.c' using previous resolution.
Resolved 'drivers/i2c/busses/i2c-cpm.c' using previous resolution.
Resolved 'drivers/i2c/busses/i2c-mpc.c' using previous resolution.
Auto-merging MAINTAINERS
Auto-merging arch/arm/plat-omap/i2c.c
CONFLICT (content): Merge conflict in arch/arm/plat-omap/i2c.c
Auto-merging drivers/i2c/busses/i2c-cpm.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-cpm.c
Auto-merging drivers/i2c/busses/i2c-ibm_iic.c
Auto-merging drivers/i2c/busses/i2c-mpc.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
Auto-merging drivers/i2c/busses/i2c-pxa.c
Auto-merging drivers/i2c/busses/i2c-s3c2410.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 562318a] Merge remote branch 'bjdooks-i2c/next-i2c'
$ git diff -M --stat --summary HEAD^..
Merging quilt/jdelvare-hwmon
$ git merge quilt/jdelvare-hwmon
Merge made by recursive.
Documentation/hwmon/ltc4245 | 24 ++++++-
drivers/hwmon/asc7621.c | 9 +--
drivers/hwmon/emc1403.c | 33 ++++++++
drivers/hwmon/i5k_amb.c | 6 ++
drivers/hwmon/it87.c | 46 +++++++++++-
drivers/hwmon/k10temp.c | 14 +++-
drivers/hwmon/k8temp.c | 12 ++-
drivers/hwmon/lm75.c | 39 ++++++++++
drivers/hwmon/lm75.h | 1 +
drivers/hwmon/ltc4245.c | 177 ++++++++++++++++++++++++++++++++++++++++---
include/linux/i2c/ltc4245.h | 21 +++++
11 files changed, 355 insertions(+), 27 deletions(-)
create mode 100644 include/linux/i2c/ltc4245.h
Merging quilt/kernel-doc
$ git merge quilt/kernel-doc
Auto-merging fs/aio.c
Merge made by recursive.
Documentation/kbuild/makefiles.txt | 100 +++++++++++++++++------------------
Documentation/vm/page-types.c | 2 +-
fs/aio.c | 21 ++++----
3 files changed, 61 insertions(+), 62 deletions(-)
Merging v4l-dvb/master
$ git merge v4l-dvb/master
Already up-to-date.
Merging kbuild/for-next
$ git merge kbuild/for-next
Auto-merging MAINTAINERS
Auto-merging Makefile
Merge made by recursive.
Documentation/coccinelle.txt | 258 +++++++++++++++++++
MAINTAINERS | 10 +
Makefile | 86 +------
scripts/Makefile.build | 26 +-
scripts/Makefile.help | 3 +
scripts/checkkconfigsymbols.sh | 2 +-
scripts/coccicheck | 54 ++++
scripts/coccinelle/alloc/drop_kmalloc_cast.cocci | 67 +++++
scripts/coccinelle/alloc/kzalloc-simple.cocci | 82 ++++++
scripts/coccinelle/deref_null.cocci | 293 ++++++++++++++++++++++
scripts/coccinelle/err_cast.cocci | 56 ++++
scripts/coccinelle/resource_size.cocci | 93 +++++++
scripts/decodecode | 10 +-
scripts/kconfig/.gitignore | 1 +
scripts/kconfig/Makefile | 10 +
scripts/kconfig/conf.c | 57 ++++-
scripts/kconfig/expr.c | 2 +-
scripts/kconfig/gconf.c | 7 +-
scripts/kconfig/lxdialog/checklist.c | 10 +-
scripts/kconfig/mconf.c | 2 +-
scripts/kconfig/menu.c | 20 ++-
scripts/kconfig/qconf.cc | 106 ++++----
scripts/kconfig/qconf.h | 17 +-
scripts/package/Makefile | 2 +-
scripts/package/builddeb | 5 +-
scripts/setlocalversion | 179 ++++++++++----
26 files changed, 1234 insertions(+), 224 deletions(-)
create mode 100644 Documentation/coccinelle.txt
create mode 100644 scripts/Makefile.help
create mode 100755 scripts/coccicheck
create mode 100644 scripts/coccinelle/alloc/drop_kmalloc_cast.cocci
create mode 100644 scripts/coccinelle/alloc/kzalloc-simple.cocci
create mode 100644 scripts/coccinelle/deref_null.cocci
create mode 100644 scripts/coccinelle/err_cast.cocci
create mode 100644 scripts/coccinelle/resource_size.cocci
Merging kconfig/for-next
$ git merge kconfig/for-next
Already uptodate!
Merge made by recursive.
Merging ide/master
$ git merge ide/master
Merge made by recursive.
drivers/ide/ide-taskfile.c | 10 +++-------
drivers/ide/tx4938ide.c | 2 +-
drivers/ide/tx4939ide.c | 2 +-
3 files changed, 5 insertions(+), 9 deletions(-)
Merging libata/NEXT
$ git merge libata/NEXT
Already up-to-date.
Merging infiniband/for-next
$ git merge infiniband/for-next
Already up-to-date.
Merging acpi/test
$ git merge acpi/test
Merge made by recursive.
arch/x86/kernel/e820.c | 2 +-
drivers/acpi/acpi_pad.c | 36 +++++++---
drivers/acpi/acpica/acconfig.h | 4 +
drivers/acpi/acpica/acevents.h | 4 -
drivers/acpi/acpica/acglobal.h | 8 ++
drivers/acpi/acpica/achware.h | 6 ++-
drivers/acpi/acpica/aclocal.h | 5 +-
drivers/acpi/acpica/acnamesp.h | 7 --
drivers/acpi/acpica/acobject.h | 16 ++--
drivers/acpi/acpica/acpredef.h | 13 ++--
drivers/acpi/acpica/acstruct.h | 32 ++++----
drivers/acpi/acpica/dsinit.c | 14 ++--
drivers/acpi/acpica/dsmethod.c | 20 +++++-
drivers/acpi/acpica/dsmthdat.c | 16 ++---
drivers/acpi/acpica/dsopcode.c | 6 +-
drivers/acpi/acpica/dsutils.c | 4 +-
drivers/acpi/acpica/evgpe.c | 115 ++-----------------------------
drivers/acpi/acpica/evgpeblk.c | 14 ++++-
drivers/acpi/acpica/evrgnini.c | 10 ++--
drivers/acpi/acpica/evxface.c | 7 --
drivers/acpi/acpica/evxfevnt.c | 59 ++++++++++++++--
drivers/acpi/acpica/exdump.c | 6 +-
drivers/acpi/acpica/exfldio.c | 4 +-
drivers/acpi/acpica/exprep.c | 23 ++----
drivers/acpi/acpica/exregion.c | 6 +-
drivers/acpi/acpica/exsystem.c | 8 ++
drivers/acpi/acpica/hwgpe.c | 94 +++++++++++++++++--------
drivers/acpi/acpica/hwsleep.c | 2 +-
drivers/acpi/acpica/hwvalid.c | 12 +++
drivers/acpi/acpica/nsaccess.c | 9 +--
drivers/acpi/acpica/nsalloc.c | 94 +++++++++++--------------
drivers/acpi/acpica/nsdump.c | 2 +-
drivers/acpi/acpica/nsinit.c | 25 +++++--
drivers/acpi/acpica/nsnames.c | 4 +-
drivers/acpi/acpica/nsparse.c | 4 +-
drivers/acpi/acpica/nsrepair2.c | 7 ++
drivers/acpi/acpica/nssearch.c | 15 +----
drivers/acpi/acpica/nsutils.c | 113 ------------------------------
drivers/acpi/acpica/nswalk.c | 15 +---
drivers/acpi/acpica/nsxfobj.c | 2 +-
drivers/acpi/acpica/utglobal.c | 2 +-
drivers/acpi/blacklist.c | 8 ++
drivers/acpi/button.c | 4 +-
drivers/acpi/fan.c | 3 +-
drivers/acpi/processor_driver.c | 5 ++
drivers/acpi/sleep.c | 34 +++++----
drivers/acpi/system.c | 6 +-
drivers/acpi/wakeup.c | 20 ++----
include/acpi/acexcep.h | 2 +-
include/acpi/acpixf.h | 3 +-
include/acpi/actbl2.h | 9 +++
include/acpi/actypes.h | 3 +-
include/linux/suspend.h | 26 ++++----
init/main.c | 4 +-
kernel/power/Kconfig | 9 ++-
kernel/power/Makefile | 2 +-
kernel/power/{hibernate_nvs.c => nvs.c} | 24 +++---
kernel/power/suspend.c | 6 ++
58 files changed, 471 insertions(+), 542 deletions(-)
rename kernel/power/{hibernate_nvs.c => nvs.c} (80%)
Merging idle-test/idle-test
$ git merge idle-test/idle-test
Already up-to-date.
Merging ieee1394/for-next
$ git merge ieee1394/for-next
Merge made by recursive.
drivers/firewire/core-card.c | 62 +++++--
drivers/firewire/core-cdev.c | 13 +-
drivers/firewire/core-topology.c | 5 +-
drivers/firewire/core-transaction.c | 176 ++++++++++++++++---
drivers/firewire/core.h | 9 +-
drivers/firewire/ohci.c | 323 +++++++++++++++++++++++++++--------
drivers/firewire/ohci.h | 1 +
drivers/firewire/sbp2.c | 10 +-
drivers/ieee1394/dv1394.c | 14 +--
drivers/ieee1394/eth1394.c | 3 -
drivers/ieee1394/raw1394.c | 3 +-
drivers/ieee1394/sbp2.c | 11 +-
drivers/ieee1394/video1394.c | 11 +-
include/linux/firewire.h | 13 ++
14 files changed, 496 insertions(+), 158 deletions(-)
Merging ubi/linux-next
$ git merge ubi/linux-next
Merge made by recursive.
drivers/mtd/ubi/eba.c | 7 ++-
drivers/mtd/ubi/io.c | 60 ++++++++++++----------
drivers/mtd/ubi/scan.c | 131 +++++++++++++++++++++++++++++++++++++-----------
drivers/mtd/ubi/scan.h | 19 +++++--
drivers/mtd/ubi/ubi.h | 10 ++--
5 files changed, 157 insertions(+), 70 deletions(-)
Merging kvm/linux-next
$ git merge kvm/linux-next
Auto-merging include/linux/mm.h
Auto-merging net/core/skbuff.c
Merge made by recursive.
Documentation/kvm/api.txt | 104 ++++
Documentation/kvm/mmu.txt | 52 ++-
Documentation/kvm/msr.txt | 153 +++++
arch/ia64/kvm/kvm-ia64.c | 11 -
arch/powerpc/include/asm/kvm_fpu.h | 27 +-
arch/powerpc/kernel/ppc_ksyms.c | 4 -
arch/powerpc/kvm/book3s.c | 65 +--
arch/powerpc/kvm/book3s_paired_singles.c | 94 ++--
arch/powerpc/kvm/booke.c | 12 +-
arch/powerpc/kvm/fpu.S | 18 +
arch/powerpc/kvm/powerpc.c | 9 +-
arch/s390/kvm/intercept.c | 2 +-
arch/s390/kvm/kvm-s390.c | 55 +--
arch/s390/kvm/kvm-s390.h | 2 +-
arch/x86/include/asm/i387.h | 2 +
arch/x86/include/asm/kvm.h | 22 +
arch/x86/include/asm/kvm_emulate.h | 30 +-
arch/x86/include/asm/kvm_host.h | 40 +-
arch/x86/include/asm/msr-index.h | 2 +
arch/x86/include/asm/vmx.h | 5 +
arch/x86/include/asm/xsave.h | 6 +
arch/x86/kernel/i387.c | 3 +-
arch/x86/kernel/process.c | 1 +
arch/x86/kvm/emulate.c | 690 +++++++++++++----------
arch/x86/kvm/i8254.c | 142 +++--
arch/x86/kvm/i8254.h | 4 +-
arch/x86/kvm/i8259.c | 1 +
arch/x86/kvm/irq.c | 2 +-
arch/x86/kvm/kvm_cache_regs.h | 8 +
arch/x86/kvm/lapic.c | 15 +-
arch/x86/kvm/mmu.c | 611 ++++++++++++---------
arch/x86/kvm/mmutrace.h | 2 +-
arch/x86/kvm/paging_tmpl.h | 69 ++-
arch/x86/kvm/svm.c | 129 ++++-
arch/x86/kvm/timer.c | 14 +
arch/x86/kvm/vmx.c | 234 +++++---
arch/x86/kvm/x86.c | 913 ++++++++++++++++++------------
include/linux/kvm.h | 12 +
include/linux/kvm_host.h | 4 +-
include/linux/mm.h | 8 +
mm/memory-failure.c | 30 +
virt/kvm/assigned-dev.c | 7 +-
virt/kvm/coalesced_mmio.c | 1 +
virt/kvm/eventfd.c | 1 +
virt/kvm/ioapic.c | 1 +
virt/kvm/iommu.c | 2 +
virt/kvm/irq_comm.c | 3 +-
virt/kvm/kvm_main.c | 48 ++-
48 files changed, 2327 insertions(+), 1343 deletions(-)
create mode 100644 Documentation/kvm/msr.txt
Merging dlm/next
$ git merge dlm/next
Already up-to-date.
Merging ibft/master
$ git merge ibft/master
Merge made by recursive.
drivers/firmware/Kconfig | 9 +
drivers/firmware/Makefile | 1 +
drivers/firmware/iscsi_boot_sysfs.c | 481 +++++++++++++++++++++++
drivers/firmware/iscsi_ibft.c | 726 +++++++++++++----------------------
drivers/firmware/iscsi_ibft_find.c | 56 +++-
include/linux/iscsi_boot_sysfs.h | 123 ++++++
include/linux/iscsi_ibft.h | 12 +-
7 files changed, 924 insertions(+), 484 deletions(-)
create mode 100644 drivers/firmware/iscsi_boot_sysfs.c
create mode 100644 include/linux/iscsi_boot_sysfs.h
Merging swiotlb/master
$ git merge swiotlb/master
Merge made by recursive.
include/linux/swiotlb.h | 27 +++++++++-
lib/swiotlb.c | 137 ++++++++++++++++++++++++++++-------------------
2 files changed, 106 insertions(+), 58 deletions(-)
Merging scsi/master
$ git merge scsi/master
Auto-merging MAINTAINERS
Auto-merging drivers/scsi/ipr.c
Auto-merging drivers/scsi/ipr.h
Merge made by recursive.
Documentation/scsi/hpsa.txt | 107 +++
MAINTAINERS | 8 +
drivers/message/fusion/mptbase.c | 6 +-
drivers/message/fusion/mptbase.h | 8 +-
drivers/message/fusion/mptctl.c | 14 +-
drivers/message/fusion/mptsas.c | 131 +++-
drivers/message/fusion/mptsas.h | 1 +
drivers/message/fusion/mptscsih.c | 8 +-
drivers/scsi/arcmsr/arcmsr.h | 135 ++--
drivers/scsi/arcmsr/arcmsr_hba.c | 1225 +++++++++++++++---------------
drivers/scsi/be2iscsi/be_iscsi.c | 123 ++--
drivers/scsi/be2iscsi/be_iscsi.h | 2 -
drivers/scsi/be2iscsi/be_main.c | 7 +-
drivers/scsi/cxgb3i/cxgb3i_ddp.c | 2 +
drivers/scsi/cxgb3i/cxgb3i_offload.c | 5 +
drivers/scsi/dpt_i2o.c | 15 +-
drivers/scsi/fcoe/libfcoe.c | 223 ++++--
drivers/scsi/fnic/fnic_scsi.c | 22 +-
drivers/scsi/hpsa.c | 754 +++++++++++++------
drivers/scsi/hpsa.h | 1 -
drivers/scsi/hpsa_cmd.h | 4 +
drivers/scsi/hptiop.c | 2 +-
drivers/scsi/ibmvscsi/ibmvfc.c | 85 ++-
drivers/scsi/ibmvscsi/ibmvfc.h | 6 +-
drivers/scsi/ibmvscsi/ibmvscsi.c | 157 +++--
drivers/scsi/ibmvscsi/ibmvscsi.h | 4 +
drivers/scsi/ibmvscsi/rpa_vscsi.c | 16 +-
drivers/scsi/ipr.c | 75 ++-
drivers/scsi/ipr.h | 22 +-
drivers/scsi/libfc/fc_fcp.c | 2 +-
drivers/scsi/libfc/fc_rport.c | 175 +++--
drivers/scsi/lpfc/lpfc.h | 14 +-
drivers/scsi/lpfc/lpfc_attr.c | 84 ++-
drivers/scsi/lpfc/lpfc_bsg.c | 9 +
drivers/scsi/lpfc/lpfc_crtn.h | 11 +
drivers/scsi/lpfc/lpfc_disc.h | 2 +
drivers/scsi/lpfc/lpfc_els.c | 83 ++-
drivers/scsi/lpfc/lpfc_hbadisc.c | 189 +++++-
drivers/scsi/lpfc/lpfc_hw.h | 17 +-
drivers/scsi/lpfc/lpfc_init.c | 257 ++++++-
drivers/scsi/lpfc/lpfc_mbox.c | 21 +-
drivers/scsi/lpfc/lpfc_nportdisc.c | 31 +-
drivers/scsi/lpfc/lpfc_scsi.c | 33 +-
drivers/scsi/lpfc/lpfc_sli.c | 298 ++++++--
drivers/scsi/lpfc/lpfc_sli.h | 2 +
drivers/scsi/lpfc/lpfc_sli4.h | 7 +-
drivers/scsi/lpfc/lpfc_version.h | 2 +-
drivers/scsi/lpfc/lpfc_vport.c | 2 +-
drivers/scsi/mpt2sas/mpi/mpi2.h | 17 +-
drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 193 +++++-
drivers/scsi/mpt2sas/mpi/mpi2_init.h | 17 +-
drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 119 +++-
drivers/scsi/mpt2sas/mpt2sas_base.c | 159 +++--
drivers/scsi/mpt2sas/mpt2sas_base.h | 32 +-
drivers/scsi/mpt2sas/mpt2sas_config.c | 4 +-
drivers/scsi/mpt2sas/mpt2sas_ctl.c | 407 +++++++++--
drivers/scsi/mpt2sas/mpt2sas_scsih.c | 701 +++++++++++++----
drivers/scsi/mpt2sas/mpt2sas_transport.c | 569 +++++++++++++--
drivers/scsi/pmcraid.c | 886 ++++++++++++++++------
drivers/scsi/pmcraid.h | 305 +++++---
drivers/scsi/qla2xxx/qla_attr.c | 4 +-
drivers/scsi/qla2xxx/qla_bsg.c | 196 +++++-
drivers/scsi/qla2xxx/qla_bsg.h | 7 +
drivers/scsi/qla2xxx/qla_def.h | 9 +
drivers/scsi/qla2xxx/qla_gbl.h | 6 +-
drivers/scsi/qla2xxx/qla_init.c | 71 ++-
drivers/scsi/qla2xxx/qla_iocb.c | 4 +-
drivers/scsi/qla2xxx/qla_isr.c | 54 +-
drivers/scsi/qla2xxx/qla_mbx.c | 152 +++-
drivers/scsi/qla2xxx/qla_mid.c | 3 +-
drivers/scsi/qla2xxx/qla_nx.c | 228 ++++++-
drivers/scsi/qla2xxx/qla_nx.h | 38 +-
drivers/scsi/qla2xxx/qla_os.c | 42 +-
drivers/scsi/qla2xxx/qla_version.h | 6 +-
include/scsi/fc/fc_els.h | 9 +
include/scsi/fc/fc_fcoe.h | 15 +-
include/scsi/libfc.h | 7 +-
77 files changed, 6384 insertions(+), 2283 deletions(-)
create mode 100644 Documentation/scsi/hpsa.txt
Merging async_tx/next
$ git merge async_tx/next
Already up-to-date.
Merging net/master
$ git merge net/master
Resolved 'net/ipv4/ip_output.c' using previous resolution.
Auto-merging arch/microblaze/include/asm/system.h
Auto-merging drivers/net/Kconfig
Auto-merging drivers/net/bnx2.c
Auto-merging drivers/net/cnic.c
Auto-merging drivers/net/e1000e/netdev.c
Auto-merging drivers/net/gianfar.c
Auto-merging drivers/net/r8169.c
Auto-merging drivers/net/ucc_geth.c
Auto-merging drivers/net/usb/hso.c
Auto-merging drivers/net/wireless/ath/ath5k/attach.c
Auto-merging drivers/net/wireless/ath/ath9k/ath9k.h
Auto-merging drivers/net/wireless/ath/ath9k/main.c
Auto-merging drivers/scsi/cxgb3i/cxgb3i_offload.c
Auto-merging drivers/vhost/net.c
Auto-merging net/bridge/br_fdb.c
Auto-merging net/bridge/br_forward.c
Auto-merging net/ipv4/ip_output.c
CONFLICT (content): Merge conflict in net/ipv4/ip_output.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master b59da34] Merge remote branch 'net/master'
$ git diff -M --stat --summary HEAD^..
Documentation/filesystems/nfs/nfsroot.txt | 2 +
Documentation/networking/README.ipw2200 | 2 +-
Documentation/networking/bonding.txt | 84 +-
Documentation/networking/ip-sysctl.txt | 2 +-
Documentation/networking/packet_mmap.txt | 26 +
Documentation/networking/pktgen.txt | 5 +
arch/microblaze/include/asm/system.h | 3 -
arch/powerpc/include/asm/system.h | 3 -
drivers/atm/Kconfig | 2 +-
drivers/atm/he.c | 308 +-
drivers/atm/he.h | 65 +-
drivers/atm/nicstar.c | 5197 ++++++++++----------
drivers/atm/nicstar.h | 602 +--
drivers/atm/nicstarmac.c | 364 +-
drivers/infiniband/core/addr.c | 2 +-
drivers/infiniband/hw/cxgb3/iwch_cm.c | 4 +-
drivers/infiniband/hw/cxgb4/cm.c | 4 +-
drivers/infiniband/hw/nes/nes_cm.c | 2 +-
drivers/isdn/i4l/isdn_ppp.c | 11 +-
drivers/isdn/pcbit/drv.c | 10 +-
drivers/isdn/sc/ioctl.c | 23 +-
drivers/net/3c527.h | 6 +-
drivers/net/8139cp.c | 2 +-
drivers/net/8139too.c | 8 +-
drivers/net/Kconfig | 1 +
drivers/net/arcnet/capmode.c | 177 +-
drivers/net/arm/ixp4xx_eth.c | 11 +
drivers/net/atl1c/atl1c.h | 9 +-
drivers/net/atl1c/atl1c_hw.c | 107 +-
drivers/net/atl1c/atl1c_hw.h | 49 +-
drivers/net/atl1c/atl1c_main.c | 348 +-
drivers/net/atlx/atl1.h | 4 +-
drivers/net/b44.c | 144 +-
drivers/net/benet/be_cmds.c | 11 +-
drivers/net/benet/be_hw.h | 2 +-
drivers/net/benet/be_main.c | 101 +-
drivers/net/bfin_mac.c | 123 +-
drivers/net/bfin_mac.h | 5 +
drivers/net/bnx2.c | 43 +-
drivers/net/bnx2x_link.c | 8 +-
drivers/net/bonding/bond_alb.c | 33 +-
drivers/net/bonding/bond_main.c | 130 +-
drivers/net/bonding/bond_sysfs.c | 279 +-
drivers/net/bonding/bonding.h | 14 +-
drivers/net/caif/caif_serial.c | 12 +-
drivers/net/can/mscan/mscan.h | 2 +-
drivers/net/can/usb/ems_usb.c | 2 +-
drivers/net/chelsio/common.h | 1 -
drivers/net/chelsio/subr.c | 49 +-
drivers/net/cnic.c | 56 +-
drivers/net/cxgb3/cxgb3_main.c | 12 +-
drivers/net/cxgb4/cxgb4.h | 6 +-
drivers/net/cxgb4/cxgb4_main.c | 281 +-
drivers/net/cxgb4/cxgb4_uld.h | 2 +
drivers/net/cxgb4/l2t.c | 7 +
drivers/net/cxgb4/t4_hw.c | 94 +-
drivers/net/cxgb4/t4_hw.h | 2 -
drivers/net/cxgb4/t4_regs.h | 3 +
drivers/net/cxgb4/t4fw_api.h | 34 +-
drivers/net/dm9000.c | 2 +-
drivers/net/e1000e/82571.c | 2 +-
drivers/net/e1000e/defines.h | 4 +-
drivers/net/e1000e/e1000.h | 9 +-
drivers/net/e1000e/es2lan.c | 2 +-
drivers/net/e1000e/ethtool.c | 143 +-
drivers/net/e1000e/hw.h | 15 +-
drivers/net/e1000e/ich8lan.c | 452 ++-
drivers/net/e1000e/lib.c | 2 +-
drivers/net/e1000e/netdev.c | 255 +-
drivers/net/e1000e/param.c | 30 +-
drivers/net/e1000e/phy.c | 5 +-
drivers/net/ehea/ehea_qmr.h | 2 +-
drivers/net/enic/vnic_vic.c | 5 +-
drivers/net/enic/vnic_vic.h | 2 +-
drivers/net/ethoc.c | 103 +-
drivers/net/fec.c | 40 +-
drivers/net/fec_mpc52xx_phy.c | 24 +-
drivers/net/fsl_pq_mdio.h | 2 +-
drivers/net/gianfar.c | 8 +-
drivers/net/greth.c | 1 -
drivers/net/irda/donauboe.h | 2 +-
drivers/net/irda/irda-usb.h | 2 +-
drivers/net/irda/ks959-sir.c | 2 +-
drivers/net/irda/ksdazzle-sir.c | 2 +-
drivers/net/irda/vlsi_ir.h | 6 +-
drivers/net/ixgbe/ixgbe.h | 9 +-
drivers/net/ixgbe/ixgbe_82599.c | 5 +-
drivers/net/ixgbe/ixgbe_common.h | 26 +-
drivers/net/ixgbe/ixgbe_dcb_nl.c | 2 +-
drivers/net/ixgbe/ixgbe_ethtool.c | 41 +-
drivers/net/ixgbe/ixgbe_fcoe.c | 35 +-
drivers/net/ixgbe/ixgbe_main.c | 369 +-
drivers/net/ixgbe/ixgbe_sriov.c | 29 +-
drivers/net/ixgbevf/ixgbevf_main.c | 1 +
drivers/net/ksz884x.c | 2 +-
drivers/net/loopback.c | 61 +-
drivers/net/mac8390.c | 57 +-
drivers/net/macvlan.c | 49 +-
drivers/net/mlx4/en_netdev.c | 1 +
drivers/net/mlx4/eq.c | 14 +-
drivers/net/mlx4/mr.c | 2 +-
drivers/net/ppp_generic.c | 18 +-
drivers/net/pppoe.c | 3 +-
drivers/net/ps3_gelic_wireless.h | 10 +-
drivers/net/qlcnic/qlcnic.h | 150 +-
drivers/net/qlcnic/qlcnic_ctx.c | 576 ++-
drivers/net/qlcnic/qlcnic_ethtool.c | 20 +-
drivers/net/qlcnic/qlcnic_hdr.h | 84 +-
drivers/net/qlcnic/qlcnic_hw.c | 62 +-
drivers/net/qlcnic/qlcnic_init.c | 144 +-
drivers/net/qlcnic/qlcnic_main.c | 523 ++-
drivers/net/qlge/qlge.h | 24 +-
drivers/net/r6040.c | 302 +-
drivers/net/r8169.c | 2 +-
drivers/net/sfc/efx.c | 75 +-
drivers/net/sfc/efx.h | 4 +-
drivers/net/sfc/falcon.c | 8 +-
drivers/net/sfc/mcdi_phy.c | 21 +-
drivers/net/sfc/net_driver.h | 44 +-
drivers/net/sfc/nic.c | 55 +-
drivers/net/sfc/nic.h | 4 +-
drivers/net/sfc/rx.c | 393 +-
drivers/net/sfc/selftest.c | 28 +-
drivers/net/sfc/workarounds.h | 2 +-
drivers/net/sky2.h | 6 +-
drivers/net/tehuti.h | 2 +-
drivers/net/tg3.c | 163 +-
drivers/net/tg3.h | 17 +-
drivers/net/tulip/de2104x.c | 4 +-
drivers/net/tulip/eeprom.c | 10 +-
drivers/net/tulip/tulip.h | 64 +-
drivers/net/tulip/tulip_core.c | 122 +-
drivers/net/typhoon.c | 2 +-
drivers/net/typhoon.h | 26 +-
drivers/net/ucc_geth.c | 14 +
drivers/net/ucc_geth.h | 46 +-
drivers/net/usb/asix.c | 2 +-
drivers/net/usb/hso.c | 2 +-
drivers/net/usb/kaweth.c | 2 +-
drivers/net/usb/net1080.c | 4 +-
drivers/net/usb/sierra_net.c | 2 +-
drivers/net/usb/usbnet.c | 2 +-
drivers/net/via-velocity.h | 12 +-
drivers/net/vxge/vxge-main.c | 93 +-
drivers/net/wan/farsync.c | 14 +-
drivers/net/wan/hd64570.h | 2 +-
drivers/net/wan/hdlc_cisco.c | 4 +-
drivers/net/wan/hdlc_fr.c | 2 +-
drivers/net/wan/sdla.c | 13 +-
drivers/net/wimax/i2400m/control.c | 2 +-
drivers/net/wimax/i2400m/fw.c | 8 +-
drivers/net/wimax/i2400m/op-rfkill.c | 2 +-
drivers/net/wireless/adm8211.h | 6 +-
drivers/net/wireless/airo.c | 32 +-
drivers/net/wireless/at76c50x-usb.c | 2 +-
drivers/net/wireless/at76c50x-usb.h | 40 +-
drivers/net/wireless/ath/ath5k/Makefile | 1 +
drivers/net/wireless/ath/ath5k/ani.c | 20 +-
drivers/net/wireless/ath/ath5k/ath5k.h | 19 +-
drivers/net/wireless/ath/ath5k/attach.c | 2 -
drivers/net/wireless/ath/ath5k/base.c | 373 +-
drivers/net/wireless/ath/ath5k/caps.c | 7 -
drivers/net/wireless/ath/ath5k/debug.c | 79 +-
drivers/net/wireless/ath/ath5k/debug.h | 9 +-
drivers/net/wireless/ath/ath5k/desc.c | 152 +-
drivers/net/wireless/ath/ath5k/desc.h | 310 +-
drivers/net/wireless/ath/ath5k/dma.c | 13 -
drivers/net/wireless/ath/ath5k/eeprom.c | 3 +-
drivers/net/wireless/ath/ath5k/gpio.c | 7 -
drivers/net/wireless/ath/ath5k/pcu.c | 24 -
drivers/net/wireless/ath/ath5k/phy.c | 82 +-
drivers/net/wireless/ath/ath5k/qcu.c | 9 -
drivers/net/wireless/ath/ath5k/reset.c | 64 +-
drivers/net/wireless/ath/ath5k/sysfs.c | 116 +
drivers/net/wireless/ath/ath9k/Makefile | 3 +-
drivers/net/wireless/ath/ath9k/ani.c | 743 +++-
drivers/net/wireless/ath/ath9k/ani.h | 78 +-
drivers/net/wireless/ath/ath9k/ar5008_phy.c | 372 ++-
drivers/net/wireless/ath/ath9k/ar9002_hw.c | 118 +-
drivers/net/wireless/ath/ath9k/ar9002_initvals.h | 6 +-
drivers/net/wireless/ath/ath9k/ar9002_phy.h | 7 +
.../{ar9003_initvals.h => ar9003_2p0_initvals.h} | 254 +-
.../{ar9003_initvals.h => ar9003_2p2_initvals.h} | 433 +-
drivers/net/wireless/ath/ath9k/ar9003_calib.c | 10 +-
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 13 +-
drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 4 +-
drivers/net/wireless/ath/ath9k/ar9003_hw.c | 165 +-
drivers/net/wireless/ath/ath9k/ar9003_mac.c | 13 +
drivers/net/wireless/ath/ath9k/ar9003_mac.h | 5 +
drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 714 +++
drivers/net/wireless/ath/ath9k/ar9003_phy.c | 513 ++-
drivers/net/wireless/ath/ath9k/ar9003_phy.h | 298 +-
drivers/net/wireless/ath/ath9k/ath9k.h | 85 +-
drivers/net/wireless/ath/ath9k/beacon.c | 3 +-
drivers/net/wireless/ath/ath9k/common.c | 314 +-
drivers/net/wireless/ath/ath9k/common.h | 77 +-
drivers/net/wireless/ath/ath9k/debug.c | 68 +-
drivers/net/wireless/ath/ath9k/debug.h | 2 +
drivers/net/wireless/ath/ath9k/eeprom.c | 29 +
drivers/net/wireless/ath/ath9k/eeprom.h | 5 +-
drivers/net/wireless/ath/ath9k/eeprom_4k.c | 1 +
drivers/net/wireless/ath/ath9k/eeprom_9287.c | 618 ++--
drivers/net/wireless/ath/ath9k/eeprom_def.c | 1 +
drivers/net/wireless/ath/ath9k/hif_usb.c | 58 +-
drivers/net/wireless/ath/ath9k/hif_usb.h | 2 +
drivers/net/wireless/ath/ath9k/htc.h | 37 +-
drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 23 +
drivers/net/wireless/ath/ath9k/htc_drv_init.c | 168 +-
drivers/net/wireless/ath/ath9k/htc_drv_main.c | 491 +-
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 86 +-
drivers/net/wireless/ath/ath9k/htc_hst.c | 3 +-
drivers/net/wireless/ath/ath9k/hw-ops.h | 16 +
drivers/net/wireless/ath/ath9k/hw.c | 185 +-
drivers/net/wireless/ath/ath9k/hw.h | 91 +-
drivers/net/wireless/ath/ath9k/init.c | 54 +-
drivers/net/wireless/ath/ath9k/mac.c | 14 +-
drivers/net/wireless/ath/ath9k/mac.h | 13 +-
drivers/net/wireless/ath/ath9k/main.c | 411 +-
drivers/net/wireless/ath/ath9k/pci.c | 1 +
drivers/net/wireless/ath/ath9k/rc.c | 184 +-
drivers/net/wireless/ath/ath9k/recv.c | 296 ++-
drivers/net/wireless/ath/ath9k/reg.h | 62 +-
drivers/net/wireless/ath/ath9k/virtual.c | 2 +-
drivers/net/wireless/ath/ath9k/wmi.c | 3 -
drivers/net/wireless/ath/ath9k/xmit.c | 144 +-
drivers/net/wireless/b43/b43.h | 6 +-
drivers/net/wireless/b43/dma.c | 69 +-
drivers/net/wireless/b43/dma.h | 8 +-
drivers/net/wireless/b43/xmit.h | 20 +-
drivers/net/wireless/b43legacy/b43legacy.h | 6 +-
drivers/net/wireless/b43legacy/dma.c | 49 +-
drivers/net/wireless/b43legacy/dma.h | 8 +-
drivers/net/wireless/b43legacy/xmit.h | 10 +-
drivers/net/wireless/hostap/hostap_80211.h | 18 +-
drivers/net/wireless/hostap/hostap_common.h | 10 +-
drivers/net/wireless/hostap/hostap_wlan.h | 32 +-
drivers/net/wireless/ipw2x00/ipw2100.c | 22 +-
drivers/net/wireless/ipw2x00/ipw2100.h | 16 +-
drivers/net/wireless/ipw2x00/ipw2200.c | 7 +-
drivers/net/wireless/ipw2x00/ipw2200.h | 122 +-
drivers/net/wireless/ipw2x00/libipw.h | 62 +-
drivers/net/wireless/iwlwifi/Kconfig | 6 +-
drivers/net/wireless/iwlwifi/iwl-1000.c | 2 +
drivers/net/wireless/iwlwifi/iwl-3945-debugfs.c | 28 +-
drivers/net/wireless/iwlwifi/iwl-3945-fh.h | 4 +-
drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 10 +-
drivers/net/wireless/iwlwifi/iwl-3945.c | 203 +-
drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-4965.c | 83 +-
drivers/net/wireless/iwlwifi/iwl-5000.c | 58 +-
drivers/net/wireless/iwlwifi/iwl-6000.c | 345 ++-
drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 27 +-
drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 26 +-
drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 230 +-
drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 3 +-
drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 77 +-
drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 123 +
drivers/net/wireless/iwlwifi/iwl-agn.c | 319 +-
drivers/net/wireless/iwlwifi/iwl-agn.h | 34 +
drivers/net/wireless/iwlwifi/iwl-calib.c | 7 +
drivers/net/wireless/iwlwifi/iwl-commands.h | 249 +-
drivers/net/wireless/iwlwifi/iwl-core.c | 266 +-
drivers/net/wireless/iwlwifi/iwl-core.h | 23 +-
drivers/net/wireless/iwlwifi/iwl-debugfs.c | 88 +-
drivers/net/wireless/iwlwifi/iwl-dev.h | 88 +-
drivers/net/wireless/iwlwifi/iwl-eeprom.h | 12 +-
drivers/net/wireless/iwlwifi/iwl-fh.h | 6 +-
drivers/net/wireless/iwlwifi/iwl-helpers.h | 27 +
drivers/net/wireless/iwlwifi/iwl-rx.c | 10 +-
drivers/net/wireless/iwlwifi/iwl-scan.c | 40 +-
drivers/net/wireless/iwlwifi/iwl-spectrum.h | 10 +-
drivers/net/wireless/iwlwifi/iwl-sta.c | 72 +-
drivers/net/wireless/iwlwifi/iwl-sta.h | 29 +
drivers/net/wireless/iwlwifi/iwl-tx.c | 33 +-
drivers/net/wireless/iwlwifi/iwl3945-base.c | 136 +-
drivers/net/wireless/iwmc3200wifi/commands.h | 50 +-
drivers/net/wireless/iwmc3200wifi/hal.c | 2 +-
drivers/net/wireless/iwmc3200wifi/iwm.h | 2 +-
drivers/net/wireless/iwmc3200wifi/lmac.h | 32 +-
drivers/net/wireless/iwmc3200wifi/rx.c | 4 +-
drivers/net/wireless/iwmc3200wifi/umac.h | 60 +-
drivers/net/wireless/libertas/cmd.c | 37 +-
drivers/net/wireless/libertas/cmdresp.c | 30 +-
drivers/net/wireless/libertas/decl.h | 2 +-
drivers/net/wireless/libertas/dev.h | 6 +
drivers/net/wireless/libertas/ethtool.c | 24 +-
drivers/net/wireless/libertas/host.h | 120 +-
drivers/net/wireless/libertas/if_sdio.c | 58 +
drivers/net/wireless/libertas/if_usb.c | 12 +-
drivers/net/wireless/libertas/main.c | 79 +-
drivers/net/wireless/libertas/radiotap.h | 4 +-
drivers/net/wireless/libertas/rx.c | 8 +-
drivers/net/wireless/libertas/scan.c | 2 +-
drivers/net/wireless/libertas/types.h | 66 +-
drivers/net/wireless/libertas_tf/if_usb.c | 5 +-
drivers/net/wireless/libertas_tf/libertas_tf.h | 4 +-
drivers/net/wireless/mac80211_hwsim.c | 2 +-
drivers/net/wireless/mwl8k.c | 78 +-
drivers/net/wireless/orinoco/fw.c | 2 +-
drivers/net/wireless/orinoco/hermes.h | 18 +-
drivers/net/wireless/orinoco/hermes_dld.c | 10 +-
drivers/net/wireless/orinoco/hw.c | 6 +-
drivers/net/wireless/orinoco/main.c | 10 +-
drivers/net/wireless/orinoco/orinoco.h | 2 +-
drivers/net/wireless/orinoco/orinoco_usb.c | 8 +-
drivers/net/wireless/orinoco/wext.c | 6 +-
drivers/net/wireless/p54/eeprom.c | 4 +-
drivers/net/wireless/p54/net2280.h | 16 +-
drivers/net/wireless/p54/p54pci.h | 6 +-
drivers/net/wireless/p54/p54spi.c | 5 +-
drivers/net/wireless/p54/p54spi.h | 2 +-
drivers/net/wireless/p54/p54usb.c | 6 +-
drivers/net/wireless/p54/p54usb.h | 6 +-
drivers/net/wireless/prism54/isl_ioctl.c | 13 +-
drivers/net/wireless/prism54/isl_oid.h | 18 +-
drivers/net/wireless/prism54/islpci_eth.h | 4 +-
drivers/net/wireless/prism54/islpci_mgt.h | 2 +-
drivers/net/wireless/rndis_wlan.c | 70 +-
drivers/net/wireless/rt2x00/rt2400pci.c | 17 +-
drivers/net/wireless/rt2x00/rt2500pci.c | 17 +-
drivers/net/wireless/rt2x00/rt2500usb.c | 31 +-
drivers/net/wireless/rt2x00/rt2800.h | 63 +-
drivers/net/wireless/rt2x00/rt2800lib.c | 210 +-
drivers/net/wireless/rt2x00/rt2800lib.h | 13 +-
drivers/net/wireless/rt2x00/rt2800pci.c | 136 +-
drivers/net/wireless/rt2x00/rt2800pci.h | 19 -
drivers/net/wireless/rt2x00/rt2800usb.c | 106 +-
drivers/net/wireless/rt2x00/rt2800usb.h | 37 -
drivers/net/wireless/rt2x00/rt2x00.h | 42 +-
drivers/net/wireless/rt2x00/rt2x00config.c | 12 +-
drivers/net/wireless/rt2x00/rt2x00debug.c | 1 +
drivers/net/wireless/rt2x00/rt2x00dev.c | 23 +-
drivers/net/wireless/rt2x00/rt2x00dump.h | 7 +-
drivers/net/wireless/rt2x00/rt2x00ht.c | 47 +-
drivers/net/wireless/rt2x00/rt2x00lib.h | 26 +-
drivers/net/wireless/rt2x00/rt2x00pci.c | 51 +-
drivers/net/wireless/rt2x00/rt2x00pci.h | 8 +
drivers/net/wireless/rt2x00/rt2x00queue.c | 43 +-
drivers/net/wireless/rt2x00/rt2x00queue.h | 9 +-
drivers/net/wireless/rt2x00/rt2x00usb.c | 33 +-
drivers/net/wireless/rt2x00/rt2x00usb.h | 19 -
drivers/net/wireless/rt2x00/rt61pci.c | 59 +-
drivers/net/wireless/rt2x00/rt61pci.h | 4 +-
drivers/net/wireless/rt2x00/rt73usb.c | 51 +-
drivers/net/wireless/rt2x00/rt73usb.h | 4 +-
drivers/net/wireless/rtl818x/rtl8180.h | 4 +-
drivers/net/wireless/rtl818x/rtl8187.h | 8 +-
drivers/net/wireless/rtl818x/rtl818x.h | 2 +-
drivers/net/wireless/wl12xx/Kconfig | 4 +-
drivers/net/wireless/wl12xx/wl1251_acx.h | 102 +-
drivers/net/wireless/wl12xx/wl1251_cmd.h | 22 +-
drivers/net/wireless/wl12xx/wl1251_event.h | 4 +-
drivers/net/wireless/wl12xx/wl1251_main.c | 4 +-
drivers/net/wireless/wl12xx/wl1251_rx.h | 2 +-
drivers/net/wireless/wl12xx/wl1251_sdio.c | 40 +-
drivers/net/wireless/wl12xx/wl1251_tx.h | 6 +-
drivers/net/wireless/wl12xx/wl1271.h | 33 +-
drivers/net/wireless/wl12xx/wl1271_acx.h | 102 +-
drivers/net/wireless/wl12xx/wl1271_cmd.c | 41 +-
drivers/net/wireless/wl12xx/wl1271_cmd.h | 66 +-
drivers/net/wireless/wl12xx/wl1271_event.c | 10 +-
drivers/net/wireless/wl12xx/wl1271_event.h | 4 +-
drivers/net/wireless/wl12xx/wl1271_ini.h | 123 +
drivers/net/wireless/wl12xx/wl1271_main.c | 95 +-
drivers/net/wireless/wl12xx/wl1271_rx.h | 2 +-
drivers/net/wireless/wl12xx/wl1271_sdio.c | 2 +-
drivers/net/wireless/wl12xx/wl1271_testmode.c | 11 +-
drivers/net/wireless/wl12xx/wl1271_tx.c | 36 +-
drivers/net/wireless/wl12xx/wl1271_tx.h | 7 +-
drivers/net/wireless/wl12xx/wl12xx_80211.h | 26 +-
drivers/net/wireless/wl3501.h | 16 +-
drivers/net/wireless/zd1211rw/zd_mac.c | 5 +-
drivers/net/wireless/zd1211rw/zd_mac.h | 15 +-
drivers/net/wireless/zd1211rw/zd_usb.c | 2 +-
drivers/net/wireless/zd1211rw/zd_usb.h | 14 +-
drivers/net/xen-netfront.c | 1 +
drivers/s390/net/qeth_core.h | 22 +-
drivers/s390/net/qeth_core_main.c | 369 +-
drivers/s390/net/qeth_core_mpc.h | 5 +-
drivers/s390/net/qeth_l2_main.c | 101 +-
drivers/s390/net/qeth_l3_main.c | 252 +-
drivers/s390/net/smsgiucv.c | 11 +-
drivers/scsi/cxgb3i/cxgb3i_offload.c | 4 +-
drivers/ssb/driver_chipcommon.c | 25 +
drivers/ssb/driver_chipcommon_pmu.c | 17 +-
drivers/ssb/main.c | 76 +-
drivers/ssb/pci.c | 15 +-
drivers/staging/batman-adv/hard-interface.c | 2 +-
drivers/usb/gadget/rndis.c | 2 +-
drivers/vhost/net.c | 13 +-
drivers/vhost/vhost.c | 4 +-
include/linux/caif/caif_socket.h | 34 +
include/linux/ethtool.h | 40 +-
include/linux/if.h | 2 +
include/linux/if_bonding.h | 1 +
include/linux/if_bridge.h | 2 -
include/linux/if_ether.h | 2 +-
include/linux/if_fddi.h | 8 +-
include/linux/if_frad.h | 2 +-
include/linux/if_hippi.h | 8 +-
include/linux/if_link.h | 3 +-
include/linux/if_macvlan.h | 4 -
include/linux/if_packet.h | 1 +
include/linux/if_pppox.h | 8 +-
include/linux/in.h | 1 +
include/linux/ipv6.h | 4 +-
include/linux/isdnif.h | 2 +-
include/linux/mISDNif.h | 2 +-
include/linux/nbd.h | 2 +-
include/linux/ncp.h | 10 +-
include/linux/ncp_fs_sb.h | 14 +-
include/linux/netdevice.h | 121 +-
include/linux/netfilter/Kbuild | 1 +
include/linux/netfilter/nf_conntrack_common.h | 4 +
include/linux/netfilter/nfnetlink_log.h | 1 +
include/linux/netfilter/xt_IDLETIMER.h | 45 +
include/linux/netpoll.h | 24 +-
include/linux/nl80211.h | 2 +-
include/linux/notifier.h | 1 +
include/linux/phonet.h | 4 +-
include/linux/rds.h | 12 +-
include/linux/sctp.h | 80 +-
include/linux/skbuff.h | 11 +-
include/linux/snmp.h | 1 +
include/linux/socket.h | 5 +
include/linux/ssb/ssb.h | 159 +-
include/linux/u64_stats_sync.h | 107 +
include/linux/user_namespace.h | 14 +
include/linux/wlp.h | 22 +-
include/net/act_api.h | 2 +
include/net/af_unix.h | 4 +-
include/net/caif/caif_dev.h | 8 +-
include/net/caif/caif_layer.h | 6 -
include/net/caif/cfcnfg.h | 16 +-
include/net/caif/cfsrvl.h | 15 +-
include/net/cfg80211.h | 137 +-
include/net/dn_dev.h | 8 +-
include/net/dn_nsp.h | 16 +-
include/net/dn_route.h | 4 +-
include/net/genetlink.h | 15 +-
include/net/inet_sock.h | 3 +-
include/net/inetpeer.h | 30 +-
include/net/ip.h | 7 +-
include/net/ip6_fib.h | 10 +-
include/net/ip6_tunnel.h | 2 +-
include/net/ipip.h | 2 +-
include/net/ipv6.h | 4 +
include/net/ipx.h | 8 +-
include/net/mac80211.h | 81 +-
include/net/mip6.h | 2 +-
include/net/ndisc.h | 2 +-
include/net/netfilter/nf_conntrack.h | 17 +-
include/net/netfilter/nf_conntrack_core.h | 2 +-
include/net/netfilter/xt_rateest.h | 11 +-
include/net/netlink.h | 2 +-
include/net/phonet/pn_dev.h | 1 +
include/net/pkt_sched.h | 2 +-
include/net/route.h | 6 +-
include/net/sch_generic.h | 27 +-
include/net/scm.h | 30 +-
include/net/sctp/structs.h | 4 +-
include/net/sock.h | 13 +-
include/net/tcp.h | 29 +-
include/rxrpc/packet.h | 8 +-
kernel/user_namespace.c | 44 +
net/8021q/vlanproc.c | 13 +-
net/atm/clip.c | 2 +-
net/bluetooth/bnep/bnep.h | 8 +-
net/bridge/br.c | 2 -
net/bridge/br_device.c | 135 +-
net/bridge/br_fdb.c | 4 +-
net/bridge/br_forward.c | 34 +-
net/bridge/br_if.c | 33 +-
net/bridge/br_input.c | 21 +-
net/bridge/br_netfilter.c | 29 +-
net/bridge/br_netlink.c | 9 +-
net/bridge/br_notify.c | 5 +-
net/bridge/br_private.h | 64 +-
net/bridge/br_stp_bpdu.c | 5 +-
net/bridge/netfilter/ebt_redirect.c | 3 +-
net/bridge/netfilter/ebt_ulog.c | 8 +-
net/bridge/netfilter/ebtables.c | 11 +-
net/caif/caif_config_util.c | 5 +
net/caif/caif_dev.c | 12 +-
net/caif/caif_socket.c | 61 +-
net/caif/cfcnfg.c | 54 +-
net/caif/cfctrl.c | 8 +-
net/caif/cfdbgl.c | 2 +-
net/caif/cfdgml.c | 7 +-
net/caif/cfpkt_skbuff.c | 5 +-
net/caif/cfrfml.c | 318 +-
net/caif/cfserl.c | 7 +-
net/caif/cfsrvl.c | 26 +-
net/caif/cfutill.c | 8 +-
net/caif/cfveil.c | 7 +-
net/caif/cfvidl.c | 2 +-
net/caif/chnl_net.c | 67 +-
net/can/raw.c | 11 +-
net/compat.c | 53 +-
net/core/dev.c | 269 +-
net/core/gen_estimator.c | 1 +
net/core/net-sysfs.c | 12 +-
net/core/netpoll.c | 195 +-
net/core/pktgen.c | 42 +-
net/core/rtnetlink.c | 6 +-
net/core/scm.c | 24 +
net/core/sock.c | 39 +-
net/dccp/ipv4.c | 4 +-
net/dccp/ipv6.c | 30 +-
net/dccp/proto.c | 11 +-
net/decnet/dn_route.c | 158 +-
net/econet/af_econet.c | 27 +-
net/ethernet/eth.c | 5 +-
net/ipv4/af_inet.c | 6 +-
net/ipv4/arp.c | 21 +-
net/ipv4/datagram.c | 2 +-
net/ipv4/devinet.c | 1 +
net/ipv4/fib_frontend.c | 6 +-
net/ipv4/icmp.c | 30 +-
net/ipv4/igmp.c | 23 +-
net/ipv4/inet_connection_sock.c | 2 +-
net/ipv4/inetpeer.c | 244 +-
net/ipv4/ip_forward.c | 10 +-
net/ipv4/ip_fragment.c | 12 +-
net/ipv4/ip_gre.c | 14 +-
net/ipv4/ip_input.c | 24 +-
net/ipv4/ip_output.c | 60 +-
net/ipv4/ip_sockglue.c | 45 +-
net/ipv4/ipconfig.c | 7 +
net/ipv4/ipip.c | 8 +-
net/ipv4/ipmr.c | 8 +-
net/ipv4/netfilter.c | 12 +-
net/ipv4/netfilter/arp_tables.c | 7 +-
net/ipv4/netfilter/ip_queue.c | 57 +-
net/ipv4/netfilter/ip_tables.c | 4 +-
net/ipv4/netfilter/ipt_CLUSTERIP.c | 48 +-
net/ipv4/netfilter/nf_defrag_ipv4.c | 5 +
net/ipv4/netfilter/nf_nat_core.c | 2 +-
net/ipv4/netfilter/nf_nat_standalone.c | 2 +-
net/ipv4/proc.c | 1 +
net/ipv4/raw.c | 22 +-
net/ipv4/route.c | 504 +-
net/ipv4/syncookies.c | 71 +-
net/ipv4/tcp.c | 13 +-
net/ipv4/tcp_input.c | 2 +-
net/ipv4/tcp_ipv4.c | 131 +-
net/ipv4/tcp_output.c | 59 +-
net/ipv4/udp.c | 4 +-
net/ipv4/xfrm4_policy.c | 2 +-
net/ipv6/addrconf.c | 10 +-
net/ipv6/addrlabel.c | 6 +-
net/ipv6/af_inet6.c | 9 +-
net/ipv6/anycast.c | 96 +-
net/ipv6/datagram.c | 18 +-
net/ipv6/exthdrs.c | 34 +-
net/ipv6/fib6_rules.c | 10 +-
net/ipv6/inet6_connection_sock.c | 9 +-
net/ipv6/ip6_fib.c | 30 +-
net/ipv6/ip6_output.c | 38 +-
net/ipv6/ip6_tunnel.c | 8 +-
net/ipv6/mcast.c | 190 +-
net/ipv6/ndisc.c | 8 +-
net/ipv6/netfilter.c | 4 +-
net/ipv6/netfilter/ip6_queue.c | 57 +-
net/ipv6/netfilter/ip6_tables.c | 7 +-
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 2 +-
net/ipv6/netfilter/nf_conntrack_reasm.c | 9 +-
net/ipv6/raw.c | 32 +-
net/ipv6/reassembly.c | 10 +-
net/ipv6/route.c | 319 +-
net/ipv6/sit.c | 16 +-
net/ipv6/syncookies.c | 54 +-
net/ipv6/tcp_ipv6.c | 42 +-
net/ipv6/udp.c | 11 +-
net/irda/irttp.c | 14 +-
net/iucv/iucv.c | 14 +-
net/l2tp/l2tp_ip.c | 6 +-
net/mac80211/Kconfig | 7 +
net/mac80211/Makefile | 4 +
net/mac80211/agg-rx.c | 123 +-
net/mac80211/agg-tx.c | 554 ++-
net/mac80211/cfg.c | 77 +-
net/mac80211/debugfs.c | 154 +-
net/mac80211/debugfs_key.c | 2 +-
net/mac80211/debugfs_sta.c | 65 +-
net/mac80211/driver-ops.h | 95 +-
net/mac80211/driver-trace.h | 188 +-
net/mac80211/ht.c | 50 +-
net/mac80211/ibss.c | 109 +-
net/mac80211/ieee80211_i.h | 73 +-
net/mac80211/iface.c | 188 +-
net/mac80211/key.c | 290 +-
net/mac80211/key.h | 30 +-
net/mac80211/main.c | 116 +-
net/mac80211/mesh.c | 73 +-
net/mac80211/mesh.h | 2 -
net/mac80211/mesh_hwmp.c | 4 +-
net/mac80211/mesh_pathtbl.c | 4 +-
net/mac80211/mlme.c | 200 +-
net/mac80211/pm.c | 18 +-
net/mac80211/rate.h | 13 +
net/mac80211/rc80211_minstrel_ht.c | 824 ++++
net/mac80211/rc80211_minstrel_ht.h | 128 +
net/mac80211/rc80211_minstrel_ht_debugfs.c | 120 +
net/mac80211/rx.c | 177 +-
net/mac80211/sta_info.c | 22 +-
net/mac80211/sta_info.h | 97 +-
net/mac80211/status.c | 2 +-
net/mac80211/tx.c | 93 +-
net/mac80211/util.c | 31 +-
net/mac80211/work.c | 2 +-
net/mac80211/wpa.c | 8 +-
net/netfilter/Kconfig | 12 +
net/netfilter/Makefile | 1 +
net/netfilter/ipvs/ip_vs_xmit.c | 86 +-
net/netfilter/nf_conntrack_core.c | 46 +-
net/netfilter/nf_conntrack_h323_main.c | 12 +-
net/netfilter/nf_conntrack_netbios_ns.c | 2 +-
net/netfilter/nf_conntrack_netlink.c | 2 +-
net/netfilter/nf_conntrack_proto_tcp.c | 32 +-
net/netfilter/nfnetlink_log.c | 73 +-
net/netfilter/nfnetlink_queue.c | 39 +-
net/netfilter/xt_CT.c | 4 +-
net/netfilter/xt_IDLETIMER.c | 314 ++
net/netfilter/xt_NOTRACK.c | 2 +-
net/netfilter/xt_RATEEST.c | 12 +-
net/netfilter/xt_TCPMSS.c | 8 +-
net/netfilter/xt_TEE.c | 8 +-
net/netfilter/xt_cluster.c | 2 +-
net/netfilter/xt_conntrack.c | 11 +-
net/netfilter/xt_sctp.c | 3 +-
net/netfilter/xt_socket.c | 2 +-
net/netfilter/xt_state.c | 14 +-
net/netfilter/xt_statistic.c | 19 +-
net/netlink/af_netlink.c | 11 +-
net/packet/af_packet.c | 37 +-
net/phonet/pn_dev.c | 15 +-
net/rxrpc/ar-peer.c | 4 +-
net/sched/act_api.c | 11 +-
net/sched/act_pedit.c | 3 +-
net/sched/act_police.c | 12 +-
net/sched/sch_generic.c | 23 +-
net/sched/sch_htb.c | 2 -
net/sctp/protocol.c | 4 +-
net/sctp/sm_make_chunk.c | 2 +-
net/socket.c | 164 +-
net/unix/af_unix.c | 97 +-
net/wireless/chan.c | 5 +-
net/wireless/core.h | 1 +
net/wireless/mlme.c | 8 +-
net/wireless/nl80211.c | 60 +-
net/wireless/util.c | 4 +-
653 files changed, 24309 insertions(+), 15980 deletions(-)
create mode 100644 drivers/net/wireless/ath/ath5k/sysfs.c
copy drivers/net/wireless/ath/ath9k/{ar9003_initvals.h => ar9003_2p0_initvals.h} (87%)
rename drivers/net/wireless/ath/ath9k/{ar9003_initvals.h => ar9003_2p2_initvals.h} (78%)
create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_paprd.c
create mode 100644 drivers/net/wireless/wl12xx/wl1271_ini.h
create mode 100644 include/linux/netfilter/xt_IDLETIMER.h
create mode 100644 include/linux/u64_stats_sync.h
create mode 100644 net/mac80211/rc80211_minstrel_ht.c
create mode 100644 net/mac80211/rc80211_minstrel_ht.h
create mode 100644 net/mac80211/rc80211_minstrel_ht_debugfs.c
create mode 100644 net/netfilter/xt_IDLETIMER.c
Merging wireless/master
$ git merge wireless/master
Resolved 'drivers/net/wireless/libertas/host.h' using previous resolution.
Auto-merging drivers/net/wireless/ath/ath9k/ath9k.h
Auto-merging drivers/net/wireless/ath/ath9k/main.c
Auto-merging drivers/net/wireless/iwlwifi/iwl-dev.h
Removing drivers/net/wireless/libertas/assoc.c
Removing drivers/net/wireless/libertas/assoc.h
Auto-merging drivers/net/wireless/libertas/host.h
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/host.h
Auto-merging drivers/net/wireless/libertas/rx.c
Removing drivers/net/wireless/libertas/scan.c
Removing drivers/net/wireless/libertas/scan.h
Removing drivers/net/wireless/libertas/wext.c
Removing drivers/net/wireless/libertas/wext.h
Auto-merging drivers/net/wireless/mac80211_hwsim.c
Auto-merging net/mac80211/ieee80211_i.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 839aea1] Merge remote branch 'wireless/master'
$ git diff -M --stat --summary HEAD^..
drivers/net/wireless/ath/ath9k/ar9003_hw.c | 20 +
drivers/net/wireless/ath/ath9k/ath9k.h | 1 +
drivers/net/wireless/ath/ath9k/gpio.c | 9 +-
drivers/net/wireless/ath/ath9k/hif_usb.c | 33 +-
drivers/net/wireless/ath/ath9k/htc_drv_init.c | 9 +-
drivers/net/wireless/ath/ath9k/hw.c | 55 +-
drivers/net/wireless/ath/ath9k/hw.h | 7 +
drivers/net/wireless/ath/ath9k/init.c | 4 +
drivers/net/wireless/ath/ath9k/main.c | 4 +-
drivers/net/wireless/ath/ath9k/reg.h | 5 +
drivers/net/wireless/b43/main.c | 2 +-
drivers/net/wireless/hostap/hostap_ap.c | 3 +-
drivers/net/wireless/hostap/hostap_main.c | 2 -
drivers/net/wireless/iwlwifi/Makefile | 4 +-
drivers/net/wireless/iwlwifi/iwl-4965.c | 12 +-
drivers/net/wireless/iwlwifi/iwl-5000.c | 2 +-
.../iwlwifi/{iwl-calib.c => iwl-agn-calib.c} | 19 +-
drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 72 +-
drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 3 +-
drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 278 +++
drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 5 +-
drivers/net/wireless/iwlwifi/iwl-agn.c | 47 +-
drivers/net/wireless/iwlwifi/iwl-agn.h | 10 +
drivers/net/wireless/iwlwifi/iwl-core.h | 10 -
drivers/net/wireless/iwlwifi/iwl-dev.h | 14 +-
drivers/net/wireless/iwlwifi/iwl-rx.c | 238 --
drivers/net/wireless/iwlwifi/iwl-sta.c | 76 +-
drivers/net/wireless/iwlwifi/iwl-sta.h | 2 +-
drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +-
drivers/net/wireless/libertas/Makefile | 3 -
drivers/net/wireless/libertas/assoc.c | 2264 -------------------
drivers/net/wireless/libertas/assoc.h | 155 --
drivers/net/wireless/libertas/cfg.c | 2038 +++++++++++++++++-
drivers/net/wireless/libertas/cfg.h | 21 +-
drivers/net/wireless/libertas/cmd.c | 87 +-
drivers/net/wireless/libertas/cmdresp.c | 83 +-
drivers/net/wireless/libertas/debugfs.c | 54 +-
drivers/net/wireless/libertas/decl.h | 8 +
drivers/net/wireless/libertas/dev.h | 62 +-
drivers/net/wireless/libertas/ethtool.c | 5 -
drivers/net/wireless/libertas/host.h | 27 +
drivers/net/wireless/libertas/main.c | 226 +--
drivers/net/wireless/libertas/mesh.c | 6 +-
drivers/net/wireless/libertas/mesh.h | 5 -
drivers/net/wireless/libertas/rx.c | 121 +-
drivers/net/wireless/libertas/scan.c | 1354 -----------
drivers/net/wireless/libertas/scan.h | 63 -
drivers/net/wireless/libertas/tx.c | 12 +-
drivers/net/wireless/libertas/wext.c | 2353 --------------------
drivers/net/wireless/libertas/wext.h | 17 -
drivers/net/wireless/mac80211_hwsim.c | 5 +
include/net/mac80211.h | 39 +
net/mac80211/ieee80211_i.h | 2 +
net/mac80211/mlme.c | 39 +-
net/mac80211/scan.c | 6 +-
net/wireless/core.c | 2 +-
net/wireless/reg.c | 4 +-
net/wireless/reg.h | 2 +-
58 files changed, 2870 insertions(+), 7141 deletions(-)
rename drivers/net/wireless/iwlwifi/{iwl-calib.c => iwl-agn-calib.c} (98%)
create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-rx.c
delete mode 100644 drivers/net/wireless/libertas/assoc.c
delete mode 100644 drivers/net/wireless/libertas/assoc.h
delete mode 100644 drivers/net/wireless/libertas/scan.c
delete mode 100644 drivers/net/wireless/libertas/scan.h
delete mode 100644 drivers/net/wireless/libertas/wext.c
delete mode 100644 drivers/net/wireless/libertas/wext.h
Merging mtd/master
$ git merge mtd/master
Auto-merging drivers/mtd/maps/physmap_of.c
Auto-merging drivers/mtd/nand/fsl_upm.c
Auto-merging drivers/mtd/nand/socrates_nand.c
Merge made by recursive.
drivers/mtd/maps/physmap_of.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Merging crypto/master
$ git merge crypto/master
Auto-merging kernel/padata.c
Merge made by recursive.
arch/s390/crypto/Makefile | 2 +-
arch/s390/crypto/crypto_des.h | 2 +-
arch/s390/crypto/des_s390.c | 238 ++----------------
crypto/Kconfig | 15 +-
crypto/Makefile | 4 +-
crypto/algboss.c | 4 +
crypto/authenc.c | 2 +-
crypto/ctr.c | 2 +-
crypto/testmgr.c | 14 +
crypto/{twofish.c => twofish_generic.c} | 1 +
crypto/xts.c | 2 +-
drivers/crypto/mv_cesa.c | 10 +-
drivers/crypto/n2_core.c | 417 ++++++++++++++++++++++---------
drivers/crypto/omap-sham.c | 1 -
drivers/crypto/talitos.c | 77 +++---
kernel/padata.c | 2 +-
16 files changed, 404 insertions(+), 389 deletions(-)
rename crypto/{twofish.c => twofish_generic.c} (99%)
Merging sound/for-next
$ git merge sound/for-next
Auto-merging Documentation/kernel-parameters.txt
Auto-merging arch/arm/mach-ep93xx/core.c
Auto-merging arch/arm/mach-ep93xx/include/mach/platform.h
Removing sound/soc/fsl/mpc5200_psc_i2s.h
Merge made by recursive.
Documentation/kernel-parameters.txt | 167 +-----
Documentation/sound/alsa/HD-Audio-Models.txt | 6 +
Documentation/sound/alsa/alsa-parameters.txt | 135 ++++
Documentation/sound/oss/oss-parameters.txt | 51 ++
arch/arm/mach-ep93xx/clock.c | 67 ++-
arch/arm/mach-ep93xx/core.c | 67 ++
arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 10 +
arch/arm/mach-ep93xx/include/mach/platform.h | 3 +
arch/arm/mach-ep93xx/snappercl15.c | 1 +
arch/arm/mach-kirkwood/common.c | 38 ++
arch/arm/mach-kirkwood/common.h | 2 +
arch/arm/mach-kirkwood/include/mach/kirkwood.h | 3 +
arch/arm/mach-kirkwood/openrd-setup.c | 13 +
arch/arm/mach-omap2/mcbsp.c | 10 +-
arch/arm/plat-mxc/include/mach/ssi.h | 3 +
arch/arm/plat-omap/include/plat/mcbsp.h | 2 +
arch/arm/plat-omap/mcbsp.c | 51 +-
arch/arm/plat-orion/include/plat/audio.h | 11 +
drivers/usb/gadget/f_audio.c | 6 +-
drivers/usb/gadget/gmidi.c | 2 +-
include/linux/usb/audio-v2.h | 17 +-
include/linux/usb/audio.h | 12 +-
include/sound/asound.h | 6 +-
include/sound/pcm.h | 4 +
include/sound/soc-dapm.h | 2 +
include/sound/soc.h | 21 +
sound/core/pcm_misc.c | 16 +
sound/pci/hda/patch_conexant.c | 20 +
sound/pci/hda/patch_realtek.c | 342 ++++++++++-
sound/pci/riptide/riptide.c | 12 +-
sound/soc/Kconfig | 4 +
sound/soc/Makefile | 4 +
sound/soc/atmel/atmel-pcm.c | 1 -
sound/soc/atmel/atmel_ssc_dai.c | 1 -
sound/soc/au1x/psc-ac97.c | 13 +-
sound/soc/au1x/psc-i2s.c | 13 +-
sound/soc/au1x/psc.h | 1 -
sound/soc/codecs/Kconfig | 16 +-
sound/soc/codecs/Makefile | 4 +
sound/soc/codecs/ad193x.c | 41 ++-
sound/soc/codecs/ad193x.h | 5 +
sound/soc/codecs/ak4642.c | 8 -
sound/soc/codecs/cs42l51.c | 763 +++++++++++++++++++++++
sound/soc/codecs/cs42l51.h | 163 +++++
sound/soc/codecs/da7210.c | 9 -
sound/soc/codecs/jz4740.c | 511 +++++++++++++++
sound/soc/codecs/jz4740.h | 20 +
sound/soc/codecs/spdif_transciever.c | 94 +++-
sound/soc/codecs/spdif_transciever.h | 1 +
sound/soc/codecs/tlv320dac33.c | 57 ++-
sound/soc/codecs/twl4030.c | 291 +++++----
sound/soc/codecs/twl4030.h | 3 +
sound/soc/codecs/twl6040.c | 2 +-
sound/soc/codecs/wm2000.c | 2 +
sound/soc/codecs/wm8990.c | 4 -
sound/soc/ep93xx/Kconfig | 18 +
sound/soc/ep93xx/Makefile | 11 +
sound/soc/ep93xx/ep93xx-i2s.c | 487 +++++++++++++++
sound/soc/ep93xx/ep93xx-i2s.h | 18 +
sound/soc/ep93xx/ep93xx-pcm.c | 319 ++++++++++
sound/soc/ep93xx/ep93xx-pcm.h | 22 +
sound/soc/ep93xx/snappercl15.c | 150 +++++
sound/soc/fsl/mpc5200_psc_i2s.c | 1 -
sound/soc/fsl/mpc5200_psc_i2s.h | 12 -
sound/soc/imx/Kconfig | 9 +
sound/soc/imx/Makefile | 2 +
sound/soc/imx/eukrea-tlv320.c | 136 ++++
sound/soc/imx/imx-ssi.c | 11 +-
sound/soc/jz4740/Kconfig | 23 +
sound/soc/jz4740/Makefile | 13 +
sound/soc/jz4740/jz4740-i2s.c | 540 ++++++++++++++++
sound/soc/jz4740/jz4740-i2s.h | 18 +
sound/soc/jz4740/jz4740-pcm.c | 373 +++++++++++
sound/soc/jz4740/jz4740-pcm.h | 22 +
sound/soc/jz4740/qi_lb60.c | 166 +++++
sound/soc/kirkwood/Kconfig | 20 +
sound/soc/kirkwood/Makefile | 9 +
sound/soc/kirkwood/kirkwood-dma.c | 383 ++++++++++++
sound/soc/kirkwood/kirkwood-dma.h | 17 +
sound/soc/kirkwood/kirkwood-i2s.c | 484 ++++++++++++++
sound/soc/kirkwood/kirkwood-i2s.h | 17 +
sound/soc/kirkwood/kirkwood-openrd.c | 126 ++++
sound/soc/kirkwood/kirkwood.h | 126 ++++
sound/soc/nuc900/Kconfig | 27 +
sound/soc/nuc900/Makefile | 11 +
sound/soc/nuc900/nuc900-ac97.c | 430 +++++++++++++
sound/soc/nuc900/nuc900-audio.c | 81 +++
sound/soc/nuc900/nuc900-audio.h | 117 ++++
sound/soc/nuc900/nuc900-pcm.c | 354 +++++++++++
sound/soc/omap/omap-mcbsp.c | 112 +++-
sound/soc/s3c24xx/Kconfig | 4 +-
sound/soc/s3c24xx/s3c-ac97.c | 1 -
sound/soc/s3c24xx/smdk_wm9713.c | 3 +
sound/soc/s6000/s6000-i2s.c | 38 +-
sound/soc/sh/Kconfig | 4 +-
sound/soc/sh/fsi-ak4642.c | 9 -
sound/soc/sh/fsi-da7210.c | 9 -
sound/soc/sh/fsi.c | 9 -
sound/soc/soc-core.c | 93 +++
sound/usb/card.c | 2 +-
sound/usb/clock.c | 54 +-
sound/usb/clock.h | 4 +-
sound/usb/endpoint.c | 5 +-
sound/usb/format.c | 9 +-
sound/usb/midi.c | 14 +-
sound/usb/mixer.c | 88 ++-
sound/usb/mixer.h | 1 -
sound/usb/pcm.h | 3 -
sound/usb/quirks.c | 1 +
109 files changed, 7583 insertions(+), 564 deletions(-)
create mode 100644 Documentation/sound/alsa/alsa-parameters.txt
create mode 100644 Documentation/sound/oss/oss-parameters.txt
create mode 100644 arch/arm/plat-orion/include/plat/audio.h
create mode 100644 sound/soc/codecs/cs42l51.c
create mode 100644 sound/soc/codecs/cs42l51.h
create mode 100644 sound/soc/codecs/jz4740.c
create mode 100644 sound/soc/codecs/jz4740.h
create mode 100644 sound/soc/ep93xx/Kconfig
create mode 100644 sound/soc/ep93xx/Makefile
create mode 100644 sound/soc/ep93xx/ep93xx-i2s.c
create mode 100644 sound/soc/ep93xx/ep93xx-i2s.h
create mode 100644 sound/soc/ep93xx/ep93xx-pcm.c
create mode 100644 sound/soc/ep93xx/ep93xx-pcm.h
create mode 100644 sound/soc/ep93xx/snappercl15.c
delete mode 100644 sound/soc/fsl/mpc5200_psc_i2s.h
create mode 100644 sound/soc/imx/eukrea-tlv320.c
create mode 100644 sound/soc/jz4740/Kconfig
create mode 100644 sound/soc/jz4740/Makefile
create mode 100644 sound/soc/jz4740/jz4740-i2s.c
create mode 100644 sound/soc/jz4740/jz4740-i2s.h
create mode 100644 sound/soc/jz4740/jz4740-pcm.c
create mode 100644 sound/soc/jz4740/jz4740-pcm.h
create mode 100644 sound/soc/jz4740/qi_lb60.c
create mode 100644 sound/soc/kirkwood/Kconfig
create mode 100644 sound/soc/kirkwood/Makefile
create mode 100644 sound/soc/kirkwood/kirkwood-dma.c
create mode 100644 sound/soc/kirkwood/kirkwood-dma.h
create mode 100644 sound/soc/kirkwood/kirkwood-i2s.c
create mode 100644 sound/soc/kirkwood/kirkwood-i2s.h
create mode 100644 sound/soc/kirkwood/kirkwood-openrd.c
create mode 100644 sound/soc/kirkwood/kirkwood.h
create mode 100644 sound/soc/nuc900/Kconfig
create mode 100644 sound/soc/nuc900/Makefile
create mode 100644 sound/soc/nuc900/nuc900-ac97.c
create mode 100644 sound/soc/nuc900/nuc900-audio.c
create mode 100644 sound/soc/nuc900/nuc900-audio.h
create mode 100644 sound/soc/nuc900/nuc900-pcm.c
$ git reset --hard HEAD^
HEAD is now at 186f8f1 Merge remote branch 'crypto/master'
Merging refs/next/20100623/sound
$ git merge refs/next/20100623/sound
Auto-merging Documentation/kernel-parameters.txt
Auto-merging arch/arm/mach-ep93xx/core.c
Auto-merging arch/arm/mach-ep93xx/include/mach/platform.h
Removing sound/soc/fsl/mpc5200_psc_i2s.h
Merge made by recursive.
Documentation/kernel-parameters.txt | 167 +-----
Documentation/sound/alsa/HD-Audio-Models.txt | 1 +
Documentation/sound/alsa/alsa-parameters.txt | 135 ++++
Documentation/sound/oss/oss-parameters.txt | 51 ++
arch/arm/mach-ep93xx/clock.c | 67 ++-
arch/arm/mach-ep93xx/core.c | 67 ++
arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 10 +
arch/arm/mach-ep93xx/include/mach/platform.h | 3 +
arch/arm/mach-ep93xx/snappercl15.c | 1 +
arch/arm/mach-kirkwood/common.c | 38 ++
arch/arm/mach-kirkwood/common.h | 2 +
arch/arm/mach-kirkwood/include/mach/kirkwood.h | 3 +
arch/arm/mach-kirkwood/openrd-setup.c | 13 +
arch/arm/mach-omap2/mcbsp.c | 10 +-
arch/arm/plat-mxc/include/mach/ssi.h | 3 +
arch/arm/plat-omap/include/plat/mcbsp.h | 2 +
arch/arm/plat-omap/mcbsp.c | 51 +-
arch/arm/plat-orion/include/plat/audio.h | 11 +
include/sound/asound.h | 6 +-
include/sound/pcm.h | 4 +
include/sound/soc-dapm.h | 2 +
include/sound/soc.h | 21 +
sound/core/pcm_misc.c | 16 +
sound/pci/hda/patch_conexant.c | 20 +
sound/pci/hda/patch_realtek.c | 3 +-
sound/pci/riptide/riptide.c | 12 +-
sound/soc/Kconfig | 3 +
sound/soc/Makefile | 3 +
sound/soc/atmel/atmel-pcm.c | 1 -
sound/soc/atmel/atmel_ssc_dai.c | 1 -
sound/soc/au1x/psc-ac97.c | 13 +-
sound/soc/au1x/psc-i2s.c | 13 +-
sound/soc/au1x/psc.h | 1 -
sound/soc/codecs/Kconfig | 4 +
sound/soc/codecs/Makefile | 2 +
sound/soc/codecs/ad193x.c | 41 ++-
sound/soc/codecs/ad193x.h | 5 +
sound/soc/codecs/ak4642.c | 8 -
sound/soc/codecs/cs42l51.c | 763 +++++++++++++++++++++++
sound/soc/codecs/cs42l51.h | 163 +++++
sound/soc/codecs/da7210.c | 9 -
sound/soc/codecs/spdif_transciever.c | 94 +++-
sound/soc/codecs/spdif_transciever.h | 1 +
sound/soc/codecs/tlv320dac33.c | 57 ++-
sound/soc/codecs/twl4030.c | 291 +++++----
sound/soc/codecs/twl4030.h | 3 +
sound/soc/codecs/twl6040.c | 2 +-
sound/soc/codecs/wm2000.c | 2 +
sound/soc/codecs/wm8990.c | 4 -
sound/soc/ep93xx/Kconfig | 18 +
sound/soc/ep93xx/Makefile | 11 +
sound/soc/ep93xx/ep93xx-i2s.c | 487 +++++++++++++++
sound/soc/ep93xx/ep93xx-i2s.h | 18 +
sound/soc/ep93xx/ep93xx-pcm.c | 319 ++++++++++
sound/soc/ep93xx/ep93xx-pcm.h | 22 +
sound/soc/ep93xx/snappercl15.c | 150 +++++
sound/soc/fsl/mpc5200_psc_i2s.c | 1 -
sound/soc/fsl/mpc5200_psc_i2s.h | 12 -
sound/soc/imx/Kconfig | 9 +
sound/soc/imx/Makefile | 2 +
sound/soc/imx/eukrea-tlv320.c | 135 ++++
sound/soc/imx/imx-ssi.c | 11 +-
sound/soc/kirkwood/Kconfig | 20 +
sound/soc/kirkwood/Makefile | 9 +
sound/soc/kirkwood/kirkwood-dma.c | 383 ++++++++++++
sound/soc/kirkwood/kirkwood-dma.h | 17 +
sound/soc/kirkwood/kirkwood-i2s.c | 484 ++++++++++++++
sound/soc/kirkwood/kirkwood-i2s.h | 17 +
sound/soc/kirkwood/kirkwood-openrd.c | 126 ++++
sound/soc/kirkwood/kirkwood.h | 126 ++++
sound/soc/nuc900/Kconfig | 27 +
sound/soc/nuc900/Makefile | 11 +
sound/soc/nuc900/nuc900-ac97.c | 430 +++++++++++++
sound/soc/nuc900/nuc900-audio.c | 81 +++
sound/soc/nuc900/nuc900-audio.h | 117 ++++
sound/soc/nuc900/nuc900-pcm.c | 354 +++++++++++
sound/soc/omap/omap-mcbsp.c | 112 +++-
sound/soc/s3c24xx/Kconfig | 4 +-
sound/soc/s3c24xx/s3c-ac97.c | 1 -
sound/soc/s3c24xx/smdk_wm9713.c | 3 +
sound/soc/s6000/s6000-i2s.c | 38 +-
sound/soc/sh/Kconfig | 4 +-
sound/soc/sh/fsi-ak4642.c | 9 -
sound/soc/sh/fsi-da7210.c | 9 -
sound/soc/sh/fsi.c | 9 -
sound/soc/soc-core.c | 93 +++
86 files changed, 5420 insertions(+), 462 deletions(-)
create mode 100644 Documentation/sound/alsa/alsa-parameters.txt
create mode 100644 Documentation/sound/oss/oss-parameters.txt
create mode 100644 arch/arm/plat-orion/include/plat/audio.h
create mode 100644 sound/soc/codecs/cs42l51.c
create mode 100644 sound/soc/codecs/cs42l51.h
create mode 100644 sound/soc/ep93xx/Kconfig
create mode 100644 sound/soc/ep93xx/Makefile
create mode 100644 sound/soc/ep93xx/ep93xx-i2s.c
create mode 100644 sound/soc/ep93xx/ep93xx-i2s.h
create mode 100644 sound/soc/ep93xx/ep93xx-pcm.c
create mode 100644 sound/soc/ep93xx/ep93xx-pcm.h
create mode 100644 sound/soc/ep93xx/snappercl15.c
delete mode 100644 sound/soc/fsl/mpc5200_psc_i2s.h
create mode 100644 sound/soc/imx/eukrea-tlv320.c
create mode 100644 sound/soc/kirkwood/Kconfig
create mode 100644 sound/soc/kirkwood/Makefile
create mode 100644 sound/soc/kirkwood/kirkwood-dma.c
create mode 100644 sound/soc/kirkwood/kirkwood-dma.h
create mode 100644 sound/soc/kirkwood/kirkwood-i2s.c
create mode 100644 sound/soc/kirkwood/kirkwood-i2s.h
create mode 100644 sound/soc/kirkwood/kirkwood-openrd.c
create mode 100644 sound/soc/kirkwood/kirkwood.h
create mode 100644 sound/soc/nuc900/Kconfig
create mode 100644 sound/soc/nuc900/Makefile
create mode 100644 sound/soc/nuc900/nuc900-ac97.c
create mode 100644 sound/soc/nuc900/nuc900-audio.c
create mode 100644 sound/soc/nuc900/nuc900-audio.h
create mode 100644 sound/soc/nuc900/nuc900-pcm.c
Merging cpufreq/next
$ git merge cpufreq/next
Auto-merging Documentation/feature-removal-schedule.txt
Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c
Auto-merging drivers/cpufreq/cpufreq.c
Auto-merging drivers/cpufreq/cpufreq_ondemand.c
Auto-merging include/linux/cpufreq.h
Merge made by recursive.
Documentation/feature-removal-schedule.txt | 10 --------
arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 2 +
drivers/cpufreq/cpufreq.c | 10 ++------
drivers/cpufreq/cpufreq_ondemand.c | 33 +++++++++++++++------------
include/linux/cpufreq.h | 5 ----
5 files changed, 23 insertions(+), 37 deletions(-)
Merging quilt/rr
$ git merge quilt/rr
Auto-merging drivers/message/fusion/mptbase.c
Auto-merging drivers/net/wireless/libertas/if_sdio.c
Auto-merging drivers/net/wireless/libertas/if_usb.c
Auto-merging drivers/net/wireless/libertas_tf/if_usb.c
Auto-merging drivers/staging/rtl8187se/r8180_core.c
Auto-merging drivers/staging/rtl8192su/r8192U_core.c
Auto-merging init/main.c
Auto-merging net/sunrpc/xprtsock.c
Auto-merging scripts/mod/modpost.c
Merge made by recursive.
Documentation/cpu-hotplug.txt | 2 +-
arch/um/drivers/hostaudio_kern.c | 10 +
drivers/acpi/debug.c | 32 +-
drivers/block/virtio_blk.c | 26 +-
drivers/char/hvc_iucv.c | 9 +-
drivers/char/ipmi/ipmi_watchdog.c | 42 +-
drivers/ide/ide.c | 20 +-
drivers/input/misc/ati_remote2.c | 26 +-
drivers/input/mouse/psmouse-base.c | 14 +-
drivers/message/fusion/mptbase.c | 3 +-
drivers/misc/lkdtm.c | 4 +-
drivers/net/myri10ge/myri10ge.c | 54 ++-
drivers/net/virtio_net.c | 42 +-
drivers/net/wireless/libertas/if_sdio.c | 32 +-
drivers/net/wireless/libertas/if_usb.c | 3 +
drivers/net/wireless/libertas_tf/if_usb.c | 3 +
drivers/pci/pci.c | 1 +
drivers/scsi/bfa/bfad.c | 2 +
drivers/staging/rtl8187se/r8180_core.c | 6 +-
drivers/staging/rtl8192e/r8192E_core.c | 6 +-
drivers/staging/rtl8192su/r8192U_core.c | 6 +-
drivers/usb/atm/ueagle-atm.c | 2 +
drivers/video/uvesafb.c | 7 +-
drivers/video/vt8623fb.c | 2 +
drivers/virtio/virtio_pci.c | 3 +
drivers/virtio/virtio_ring.c | 2 +-
fs/nfs/callback.c | 11 +-
include/linux/dynamic_debug.h | 4 +-
include/linux/moduleparam.h | 282 ++++++--
init/main.c | 8 +-
kernel/module.c | 1098 ++++++++++++++++-------------
kernel/params.c | 233 +++++--
lib/dynamic_debug.c | 2 +-
net/mac80211/rate.c | 2 +
net/sunrpc/xprtsock.c | 26 +-
scripts/mod/modpost.c | 13 +
36 files changed, 1274 insertions(+), 764 deletions(-)
Merging input/next
$ git merge input/next
Merge made by recursive.
drivers/hid/hid-input.c | 3 +
drivers/input/evdev.c | 35 +++++++--
drivers/input/keyboard/matrix_keypad.c | 108 ++++++++++++++++++++-------
drivers/input/mouse/bcm5974.c | 23 ++++--
drivers/input/serio/i8042-ppcio.h | 75 -------------------
drivers/input/touchscreen/tps6507x-ts.c | 3 -
drivers/input/touchscreen/usbtouchscreen.c | 34 +++++----
include/linux/input.h | 21 ++++++
include/linux/input/matrix_keypad.h | 6 ++
9 files changed, 172 insertions(+), 136 deletions(-)
Merging lsm/for-next
$ git merge lsm/for-next
Already up-to-date.
Merging block/for-next
$ git merge block/for-next
Auto-merging drivers/block/virtio_blk.c
Auto-merging fs/btrfs/inode.c
Auto-merging fs/gfs2/ops_fstype.c
Auto-merging include/linux/fs.h
Merge made by recursive.
arch/alpha/include/asm/scatterlist.h | 2 -
arch/avr32/include/asm/scatterlist.h | 2 -
arch/blackfin/include/asm/scatterlist.h | 2 -
arch/cris/include/asm/scatterlist.h | 2 -
arch/frv/include/asm/scatterlist.h | 2 -
arch/h8300/include/asm/scatterlist.h | 2 -
arch/ia64/include/asm/scatterlist.h | 9 -
arch/m32r/include/asm/scatterlist.h | 2 -
arch/m68k/include/asm/scatterlist.h | 3 -
arch/microblaze/include/asm/scatterlist.h | 2 -
arch/mips/include/asm/scatterlist.h | 2 -
arch/mn10300/include/asm/scatterlist.h | 2 -
arch/parisc/include/asm/scatterlist.h | 1 -
arch/powerpc/include/asm/scatterlist.h | 3 -
arch/s390/include/asm/scatterlist.h | 2 -
arch/score/include/asm/scatterlist.h | 2 -
arch/sh/include/asm/scatterlist.h | 2 -
arch/sparc/include/asm/scatterlist.h | 1 -
arch/x86/include/asm/scatterlist.h | 1 -
arch/xtensa/include/asm/scatterlist.h | 2 -
block/blk-barrier.c | 9 +-
block/blk-core.c | 88 +++--
block/blk-exec.c | 2 +-
block/blk-lib.c | 33 +--
block/blk-map.c | 2 +-
block/blk-merge.c | 9 +-
block/blk-sysfs.c | 82 ++--
block/blk.h | 6 +-
block/cfq-iosched.c | 88 +++--
block/cfq.h | 115 ++++++
block/elevator.c | 19 +-
drivers/ata/libata-scsi.c | 4 +-
drivers/block/aoe/aoeblk.c | 2 +-
drivers/block/brd.c | 2 +-
drivers/block/cciss.c | 602 ++++++++++++++++++++---------
drivers/block/cciss.h | 115 +++++-
drivers/block/cciss_cmd.h | 32 ++-
drivers/block/cciss_scsi.c | 5 +-
drivers/block/cpqarray.c | 6 +-
drivers/block/drbd/drbd_actlog.c | 8 +-
drivers/block/drbd/drbd_main.c | 8 +-
drivers/block/drbd/drbd_nl.c | 6 +
drivers/block/drbd/drbd_receiver.c | 22 +-
drivers/block/drbd/drbd_req.c | 2 +-
drivers/block/floppy.c | 144 ++-----
drivers/block/hd.c | 2 +-
drivers/block/loop.c | 2 +-
drivers/block/mg_disk.c | 4 +-
drivers/block/nbd.c | 2 +-
drivers/block/osdblk.c | 3 +-
drivers/block/paride/pd.c | 2 +-
drivers/block/pktcdvd.c | 2 +-
drivers/block/ps3disk.c | 2 +-
drivers/block/ub.c | 8 +-
drivers/block/umem.c | 2 +-
drivers/block/viodasd.c | 2 +-
drivers/block/virtio_blk.c | 17 +-
drivers/block/xd.c | 2 +-
drivers/block/xen-blkfront.c | 4 +-
drivers/block/xsysace.c | 2 +-
drivers/cdrom/gdrom.c | 2 +-
drivers/cdrom/viocd.c | 2 +-
drivers/ide/ide-atapi.c | 17 +-
drivers/ide/ide-cd.c | 66 ++--
drivers/ide/ide-cd_ioctl.c | 2 +-
drivers/ide/ide-disk.c | 2 +-
drivers/ide/ide-eh.c | 5 +-
drivers/ide/ide-floppy.c | 27 +-
drivers/ide/ide-io.c | 8 +-
drivers/ide/ide-pm.c | 8 +-
drivers/ide/ide-tape.c | 3 +-
drivers/md/dm-io.c | 12 +-
drivers/md/dm-kcopyd.c | 2 +-
drivers/md/dm-raid1.c | 2 +-
drivers/md/dm-stripe.c | 2 +-
drivers/md/dm.c | 24 +-
drivers/md/linear.c | 2 +-
drivers/md/md.c | 10 +-
drivers/md/md.h | 4 +-
drivers/md/multipath.c | 8 +-
drivers/md/raid0.c | 2 +-
drivers/md/raid1.c | 22 +-
drivers/md/raid10.c | 12 +-
drivers/md/raid5.c | 2 +-
drivers/memstick/core/mspro_block.c | 3 +-
drivers/message/i2o/i2o_block.c | 2 +-
drivers/mmc/card/queue.c | 2 +-
drivers/mtd/mtd_blkdevs.c | 4 +-
drivers/scsi/aha1542.c | 25 --
drivers/scsi/osd/osd_initiator.c | 8 +-
drivers/scsi/scsi_error.c | 10 +-
drivers/scsi/scsi_lib.c | 5 +-
drivers/scsi/sd.c | 62 ++--
drivers/scsi/sun3_NCR5380.c | 2 +-
drivers/scsi/sun3_scsi.c | 2 +-
drivers/scsi/sun3_scsi_vme.c | 2 +-
drivers/staging/hv/blkvsc_drv.c | 8 +-
fs/afs/write.c | 1 -
fs/bio.c | 5 +-
fs/btrfs/disk-io.c | 8 +-
fs/btrfs/extent_io.c | 2 -
fs/btrfs/inode.c | 6 +-
fs/btrfs/volumes.c | 18 +-
fs/exofs/ios.c | 2 +-
fs/fs-writeback.c | 504 +++++++++---------------
fs/gfs2/log.c | 4 +-
fs/gfs2/meta_io.c | 8 +-
fs/gfs2/ops_fstype.c | 2 +-
fs/nilfs2/segbuf.c | 2 +-
fs/splice.c | 2 -
fs/ubifs/budget.c | 2 +
include/linux/audit.h | 2 +-
include/linux/backing-dev.h | 13 +-
include/linux/bio.h | 125 ++++---
include/linux/blkdev.h | 116 +-----
include/linux/blktrace_api.h | 2 +-
include/linux/drbd.h | 2 +-
include/linux/fs.h | 40 +-
include/linux/writeback.h | 7 +-
include/trace/events/block.h | 15 +-
kernel/power/block_io.c | 2 +-
kernel/trace/blktrace.c | 37 +-
mm/backing-dev.c | 122 ++-----
mm/page-writeback.c | 8 +-
mm/page_io.c | 2 +-
125 files changed, 1548 insertions(+), 1405 deletions(-)
create mode 100644 block/cfq.h
Merging quilt/device-mapper
$ git merge quilt/device-mapper
Merge made by recursive.
drivers/md/dm-crypt.c | 3 +-
drivers/md/dm-ioctl.c | 115 +++++++++++++++++++--------------------
drivers/md/dm-mpath.c | 1 +
drivers/md/dm-snap-persistent.c | 6 +-
4 files changed, 61 insertions(+), 64 deletions(-)
Merging embedded/master
$ git merge embedded/master
Already up-to-date.
Merging firmware/master
$ git merge firmware/master
Already up-to-date.
Merging pcmcia/master
$ git merge pcmcia/master
Already up-to-date.
Merging battery/master
$ git merge battery/master
Merge made by recursive.
drivers/power/Kconfig | 7 +
drivers/power/Makefile | 1 +
drivers/power/ds2782_battery.c | 29 +-
drivers/power/intel_mid_battery.c | 799 +++++++++++++++++++++++++++++++++++++
4 files changed, 821 insertions(+), 15 deletions(-)
create mode 100644 drivers/power/intel_mid_battery.c
Merging leds/for-mm
$ git merge leds/for-mm
Merge made by recursive.
Merging backlight/for-mm
$ git merge backlight/for-mm
Already up-to-date.
Merging kgdb/kgdb-next
$ git merge kgdb/kgdb-next
Auto-merging drivers/char/sysrq.c
Auto-merging kernel/debug/kdb/kdb_main.c
Merge made by recursive.
drivers/char/sysrq.c | 2 +-
kernel/debug/kdb/kdb_main.c | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
Merging slab/for-next
$ git merge slab/for-next
Merge made by recursive.
Merging uclinux/for-next
$ git merge uclinux/for-next
Already up-to-date.
Merging md/for-next
$ git merge md/for-next
Auto-merging drivers/md/md.c
Auto-merging drivers/md/md.h
Auto-merging drivers/md/raid0.c
Auto-merging drivers/md/raid10.c
Auto-merging drivers/md/raid5.c
Merge made by recursive.
drivers/md/md.c | 38 +++++++++++--
drivers/md/md.h | 3 +
drivers/md/raid0.c | 21 ++++----
drivers/md/raid0.h | 3 -
drivers/md/raid10.c | 34 ++++--------
drivers/md/raid10.h | 5 --
drivers/md/raid5.c | 150 +++++++++++++++++++++++++++++++++++++++++----------
7 files changed, 181 insertions(+), 73 deletions(-)
Merging mfd/for-next
$ git merge mfd/for-next
Merge made by recursive.
drivers/mfd/88pm860x-core.c | 86 +++++++++++++++++---------------------
drivers/mfd/Kconfig | 11 ++++-
drivers/mfd/ab3100-otp.c | 16 ++++----
drivers/mfd/ab3550-core.c | 23 +++++-----
drivers/mfd/ab8500-spi.c | 7 +++-
drivers/mfd/abx500-core.c | 2 +-
drivers/mfd/davinci_voicecodec.c | 6 ++-
drivers/mfd/max8925-core.c | 27 ++++++++++++
drivers/mfd/mfd-core.c | 4 +-
9 files changed, 110 insertions(+), 72 deletions(-)
Merging hdlc/hdlc-next
$ git merge hdlc/hdlc-next
Already up-to-date.
Merging drm/drm-next
$ git merge drm/drm-next
Merge made by recursive.
drivers/char/agp/generic.c | 6 +-
drivers/char/vt.c | 13 +++-
drivers/gpu/drm/drm_fb_helper.c | 61 ++++++++++++++----
drivers/gpu/drm/i915/intel_fb.c | 4 +-
drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 +
drivers/gpu/drm/radeon/atombios_crtc.c | 2 +-
drivers/gpu/drm/radeon/evergreen.c | 12 ++--
drivers/gpu/drm/radeon/r100.c | 81 +++++++++++++---------
drivers/gpu/drm/radeon/r200.c | 5 ++
drivers/gpu/drm/radeon/r300.c | 5 ++
drivers/gpu/drm/radeon/r600.c | 2 +-
drivers/gpu/drm/radeon/radeon_bios.c | 4 +
drivers/gpu/drm/radeon/radeon_combios.c | 32 +++++++++
drivers/gpu/drm/radeon/radeon_cursor.c | 2 +-
drivers/gpu/drm/radeon/radeon_device.c | 7 ++
drivers/gpu/drm/radeon/radeon_encoders.c | 4 +-
drivers/gpu/drm/radeon/radeon_fb.c | 2 +-
drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 22 +++----
drivers/gpu/drm/radeon/radeon_mode.h | 1 +
drivers/gpu/drm/radeon/rs690.c | 6 +--
drivers/gpu/drm/radeon/rv770.c | 2 +-
drivers/gpu/drm/ttm/ttm_page_alloc.c | 2 +-
drivers/video/console/fbcon.c | 4 +-
include/linux/agp_backend.h | 1 -
include/linux/console_struct.h | 1 +
include/linux/fb.h | 8 ++-
include/linux/vt_kern.h | 7 ++
27 files changed, 205 insertions(+), 92 deletions(-)
Merging viafb/viafb-next
$ git merge viafb/viafb-next
Auto-merging drivers/media/video/Kconfig
Auto-merging drivers/media/video/Makefile
Auto-merging include/media/v4l2-chip-ident.h
Merge made by recursive.
drivers/media/video/Kconfig | 10 +
drivers/media/video/Makefile | 2 +
drivers/media/video/via-camera.c | 1369 ++++++++++++++++++++++++++++++++++++++
drivers/media/video/via-camera.h | 93 +++
drivers/video/via/accel.c | 2 +-
drivers/video/via/via-core.c | 16 +-
include/linux/via-core.h | 4 +-
include/media/v4l2-chip-ident.h | 4 +
8 files changed, 1496 insertions(+), 4 deletions(-)
create mode 100644 drivers/media/video/via-camera.c
create mode 100644 drivers/media/video/via-camera.h
Merging voltage/for-next
$ git merge voltage/for-next
Auto-merging drivers/mfd/Kconfig
Merge made by recursive.
drivers/mfd/Kconfig | 10 +
drivers/mfd/Makefile | 1 +
drivers/mfd/max8998.c | 160 +++++++++
drivers/regulator/Kconfig | 20 +
drivers/regulator/Makefile | 3 +
drivers/regulator/ad5398.c | 288 +++++++++++++++
drivers/regulator/isl6271a-regulator.c | 236 ++++++++++++
drivers/regulator/max8998.c | 610 ++++++++++++++++++++++++++++++++
include/linux/mfd/max8998-private.h | 112 ++++++
include/linux/mfd/max8998.h | 78 ++++
10 files changed, 1518 insertions(+), 0 deletions(-)
create mode 100644 drivers/mfd/max8998.c
create mode 100644 drivers/regulator/ad5398.c
create mode 100644 drivers/regulator/isl6271a-regulator.c
create mode 100644 drivers/regulator/max8998.c
create mode 100644 include/linux/mfd/max8998-private.h
create mode 100644 include/linux/mfd/max8998.h
Merging security-testing/next
$ git merge security-testing/next
Removing security/tomoyo/path_group.c
Merge made by recursive.
fs/namei.c | 3 +-
fs/open.c | 5 +-
include/linux/security.h | 11 +-
security/capability.c | 3 +-
security/keys/internal.h | 5 +
security/keys/keyctl.c | 21 +-
security/keys/proc.c | 20 +-
security/keys/process_keys.c | 64 +-
security/security.c | 5 +-
security/selinux/avc.c | 1 -
security/selinux/hooks.c | 243 ++---
security/selinux/netnode.c | 2 -
security/selinux/ss/policydb.c | 139 ++--
security/smack/smack_lsm.c | 14 +-
security/tomoyo/Makefile | 2 +-
security/tomoyo/common.c | 2380 ++++++++++++++++++---------------------
security/tomoyo/common.h | 729 ++++++++-----
security/tomoyo/domain.c | 844 +++++---------
security/tomoyo/file.c | 1494 +++++++++++-------------
security/tomoyo/gc.c | 352 +++----
security/tomoyo/group.c | 130 +++
security/tomoyo/load_policy.c | 81 ++
security/tomoyo/memory.c | 282 +++++
security/tomoyo/mount.c | 284 +++++
security/tomoyo/path_group.c | 172 ---
security/tomoyo/realpath.c | 426 ++-----
security/tomoyo/securityfs_if.c | 140 +++
security/tomoyo/tomoyo.c | 35 +-
security/tomoyo/util.c | 963 ++++++++++++++++
29 files changed, 4929 insertions(+), 3921 deletions(-)
create mode 100644 security/tomoyo/group.c
create mode 100644 security/tomoyo/load_policy.c
create mode 100644 security/tomoyo/memory.c
create mode 100644 security/tomoyo/mount.c
delete mode 100644 security/tomoyo/path_group.c
create mode 100644 security/tomoyo/securityfs_if.c
create mode 100644 security/tomoyo/util.c
Merging lblnet/master
$ git merge lblnet/master
Already up-to-date.
Merging agp/agp-next
$ git merge agp/agp-next
Auto-merging drivers/char/agp/backend.c
Auto-merging drivers/char/agp/hp-agp.c
Merge made by recursive.
Merging uwb/for-upstream
$ git merge uwb/for-upstream
Auto-merging include/linux/wlp.h
Merge made by recursive.
drivers/uwb/i1480/i1480u-wlp/lc.c | 16 ++++++------
drivers/uwb/wlp/messages.c | 40 ++++++++++++++++----------------
drivers/uwb/wlp/sysfs.c | 46 ++++++++++++++++++------------------
drivers/uwb/wlp/wlp-lc.c | 12 +++++-----
include/linux/wlp.h | 2 +-
5 files changed, 58 insertions(+), 58 deletions(-)
Merging watchdog/master
$ git merge watchdog/master
Merge made by recursive.
drivers/watchdog/at32ap700x_wdt.c | 16 ++++++++++------
drivers/watchdog/hpwdt.c | 20 ++++++++++++++++----
drivers/watchdog/imx2_wdt.c | 1 -
drivers/watchdog/s3c2410_wdt.c | 17 +++++++++--------
drivers/watchdog/sch311x_wdt.c | 4 ++--
5 files changed, 37 insertions(+), 21 deletions(-)
Merging bdev/master
$ git merge bdev/master
Already up-to-date.
Merging dwmw2-iommu/master
$ git merge dwmw2-iommu/master
Merge made by recursive.
drivers/pci/intel-iommu.c | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
Merging cputime/cputime
$ git merge cputime/cputime
Already up-to-date.
Merging osd/linux-next
$ git merge osd/linux-next
Auto-merging fs/exofs/file.c
Auto-merging fs/exofs/inode.c
Merge made by recursive.
fs/exofs/file.c | 29 +++++++++++++++++------------
fs/exofs/inode.c | 9 ++-------
fs/exofs/super.c | 1 -
3 files changed, 19 insertions(+), 20 deletions(-)
Merging jc_docs/docs-next
$ git merge jc_docs/docs-next
Already up-to-date.
Merging nommu/master
$ git merge nommu/master
Already up-to-date.
Merging trivial/for-next
$ git merge trivial/for-next
Auto-merging arch/arm/mach-msm/acpuclock-arm11.c
Auto-merging arch/ia64/kvm/kvm-ia64.c
Auto-merging drivers/message/fusion/mptbase.c
Auto-merging drivers/net/benet/be_hw.h
Auto-merging drivers/net/gianfar.c
Auto-merging drivers/net/ksz884x.c
Auto-merging drivers/net/wimax/i2400m/control.c
Auto-merging drivers/scsi/libfc/fc_rport.c
Auto-merging drivers/scsi/mpt2sas/mpt2sas_base.h
Auto-merging drivers/scsi/mpt2sas/mpt2sas_scsih.c
Auto-merging drivers/scsi/qla2xxx/qla_iocb.c
Auto-merging drivers/scsi/qla2xxx/qla_nx.h
Auto-merging fs/reiserfs/inode.c
Auto-merging include/linux/if_link.h
Auto-merging include/linux/netdevice.h
Auto-merging net/sctp/protocol.c
Auto-merging security/smack/smack_lsm.c
Auto-merging sound/soc/soc-core.c
Merge made by recursive.
Documentation/rt-mutex-design.txt | 2 +-
arch/arm/mach-msm/acpuclock-arm11.c | 4 ++--
arch/arm/mach-omap2/dpll3xxx.c | 2 +-
arch/arm/mach-omap2/sleep34xx.S | 2 +-
arch/arm/mach-u300/gpio.c | 2 +-
arch/arm/plat-s3c24xx/clock.c | 2 +-
arch/arm/plat-samsung/clock.c | 2 +-
arch/cris/arch-v32/mm/intmem.c | 13 +++++--------
arch/h8300/kernel/timer/itu.c | 2 +-
arch/h8300/kernel/timer/timer16.c | 2 +-
arch/h8300/kernel/timer/timer8.c | 2 +-
arch/ia64/kvm/kvm-ia64.c | 6 +++---
arch/ia64/sn/kernel/setup.c | 2 +-
arch/microblaze/Makefile | 2 +-
arch/mips/sibyte/bcm1480/irq.c | 11 -----------
arch/powerpc/platforms/ps3/htab.c | 2 +-
arch/sh/kernel/clkdev.c | 2 +-
arch/sparc/boot/btfixupprep.c | 4 ++--
arch/x86/kernel/apic/apic.c | 2 +-
arch/x86/kernel/head32.c | 2 +-
drivers/crypto/amcc/crypto4xx_reg_def.h | 2 +-
drivers/dma/at_hdmac.c | 2 +-
drivers/gpu/drm/savage/savage_bci.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 +-
drivers/ide/ide-gd.c | 2 +-
drivers/infiniband/hw/cxgb3/iwch_qp.c | 4 ++--
drivers/infiniband/hw/cxgb4/qp.c | 4 ++--
drivers/infiniband/hw/ehca/hcp_if.h | 2 +-
drivers/input/misc/ad714x.c | 2 +-
drivers/media/dvb/siano/smscoreapi.c | 2 +-
drivers/media/video/ov511.c | 2 +-
drivers/media/video/zoran/zoran.h | 2 +-
drivers/media/video/zoran/zr36050.c | 2 +-
drivers/media/video/zoran/zr36060.c | 2 +-
drivers/message/fusion/mptbase.c | 4 ++--
drivers/mtd/nand/denali.c | 2 +-
drivers/net/3c527.c | 4 ++--
drivers/net/appletalk/ipddp.c | 2 +-
drivers/net/benet/be_hw.h | 2 +-
drivers/net/gianfar.c | 2 +-
drivers/net/hp100.c | 2 +-
drivers/net/ibm_newemac/core.c | 2 +-
drivers/net/ksz884x.c | 2 +-
drivers/net/ll_temac_main.c | 2 +-
drivers/net/tulip/dmfe.c | 20 ++++++++++----------
drivers/net/wimax/i2400m/control.c | 2 +-
drivers/parisc/ccio-dma.c | 4 ++--
drivers/pcmcia/sa11xx_base.c | 2 +-
drivers/rapidio/rio.c | 2 +-
drivers/rtc/rtc-fm3130.c | 2 +-
drivers/scsi/advansys.c | 2 +-
drivers/scsi/aic94xx/aic94xx_seq.c | 4 ++--
drivers/scsi/bfa/vport.c | 2 +-
drivers/scsi/fcoe/fcoe.c | 4 ++--
drivers/scsi/libfc/fc_lport.c | 6 +++---
drivers/scsi/libfc/fc_rport.c | 2 +-
drivers/scsi/mpt2sas/mpt2sas_base.h | 2 +-
drivers/scsi/mpt2sas/mpt2sas_scsih.c | 4 ++--
drivers/scsi/pm8001/pm8001_hwi.c | 4 ++--
drivers/scsi/qla2xxx/qla_iocb.c | 2 +-
drivers/scsi/qla2xxx/qla_nx.h | 2 +-
drivers/scsi/qla4xxx/ql4_init.c | 2 +-
drivers/scsi/scsi_transport_fc.c | 2 +-
drivers/serial/sn_console.c | 6 +++---
drivers/usb/serial/kl5kusb105.c | 2 +-
drivers/usb/wusbcore/wusbhc.c | 2 +-
drivers/uwb/wlp/wss-lc.c | 2 +-
drivers/video/carminefb.c | 2 +-
drivers/video/tgafb.c | 2 +-
fs/befs/linuxvfs.c | 2 +-
fs/ecryptfs/crypto.c | 2 +-
fs/ext4/extents.c | 2 +-
fs/ext4/super.c | 2 +-
fs/freevxfs/vxfs_super.c | 2 +-
fs/ocfs2/super.c | 2 +-
fs/reiserfs/inode.c | 2 +-
include/linux/ide.h | 2 +-
include/linux/if_link.h | 2 +-
include/linux/lru_cache.h | 2 +-
include/linux/netdevice.h | 2 +-
kernel/cpuset.c | 2 +-
lib/random32.c | 2 +-
net/netfilter/ipvs/ip_vs_lblc.c | 2 +-
net/netfilter/ipvs/ip_vs_lblcr.c | 2 +-
net/sctp/associola.c | 2 +-
net/sctp/protocol.c | 2 +-
security/smack/smack_lsm.c | 2 +-
sound/pci/trident/trident_main.c | 2 +-
sound/soc/fsl/mpc8610_hpcd.c | 2 +-
sound/soc/soc-core.c | 2 +-
90 files changed, 119 insertions(+), 133 deletions(-)
Merging audit/for-next
$ git merge audit/for-next
Already up-to-date.
Merging quilt/aoe
$ git merge quilt/aoe
Auto-merging drivers/block/aoe/aoecmd.c
Merge made by recursive.
drivers/block/aoe/aoecmd.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
Merging suspend/linux-next
$ git merge suspend/linux-next
Merge made by recursive.
include/linux/pm_wakeup.h | 10 +++++++---
kernel/power/swap.c | 4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
Merging bluetooth/master
$ git merge bluetooth/master
Already up-to-date.
Merging fsnotify/for-next
$ git merge fsnotify/for-next
Auto-merging Documentation/feature-removal-schedule.txt
Auto-merging fs/compat.c
Auto-merging fs/exec.c
Auto-merging fs/inode.c
Auto-merging fs/namei.c
Auto-merging fs/namespace.c
Auto-merging fs/nfsd/vfs.c
Auto-merging fs/notify/inotify/Kconfig
CONFLICT (delete/modify): fs/notify/inotify/inotify.c deleted in fsnotify/for-next and modified in HEAD. Version HEAD of fs/notify/inotify/inotify.c left in tree.
Auto-merging fs/open.c
Auto-merging fs/read_write.c
Auto-merging include/linux/Kbuild
Auto-merging include/linux/fs.h
Auto-merging include/linux/security.h
Auto-merging include/linux/syscalls.h
Auto-merging init/Kconfig
Auto-merging kernel/Makefile
Auto-merging kernel/sysctl.c
Auto-merging security/security.c
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f fs/notify/inotify/inotify.c
fs/notify/inotify/inotify.c: needs merge
rm 'fs/notify/inotify/inotify.c'
$ git commit -v -a
[master 8697649] Merge remote branch 'fsnotify/for-next'
$ git diff -M --stat --summary HEAD^..
Documentation/feature-removal-schedule.txt | 8 -
arch/x86/ia32/ia32entry.S | 2 +
arch/x86/ia32/sys_ia32.c | 9 +
arch/x86/include/asm/sys_ia32.h | 3 +
arch/x86/include/asm/unistd_32.h | 4 +-
arch/x86/include/asm/unistd_64.h | 4 +
arch/x86/kernel/syscall_table_32.S | 2 +
fs/compat.c | 5 +-
fs/exec.c | 4 +-
fs/inode.c | 8 +-
fs/namei.c | 2 +-
fs/namespace.c | 5 +
fs/nfsd/vfs.c | 4 +-
fs/notify/Kconfig | 1 +
fs/notify/Makefile | 4 +-
fs/notify/dnotify/dnotify.c | 198 +++----
fs/notify/fanotify/Kconfig | 26 +
fs/notify/fanotify/Makefile | 1 +
fs/notify/fanotify/fanotify.c | 255 ++++++++
fs/notify/fanotify/fanotify_user.c | 776 ++++++++++++++++++++++++
fs/notify/fsnotify.c | 141 ++++-
fs/notify/fsnotify.h | 33 +-
fs/notify/group.c | 178 +++---
fs/notify/inode_mark.c | 309 +++-------
fs/notify/inotify/Kconfig | 15 -
fs/notify/inotify/Makefile | 1 -
fs/notify/inotify/inotify.c | 873 ----------------------------
fs/notify/inotify/inotify.h | 7 +-
fs/notify/inotify/inotify_fsnotify.c | 114 +++-
fs/notify/inotify/inotify_user.c | 307 ++++++----
fs/notify/mark.c | 325 +++++++++++
fs/notify/notification.c | 180 ++++---
fs/notify/vfsmount_mark.c | 176 ++++++
fs/open.c | 3 +-
fs/read_write.c | 8 +-
include/asm-generic/fcntl.h | 8 +
include/linux/Kbuild | 1 +
include/linux/dnotify.h | 1 +
include/linux/fanotify.h | 105 ++++
include/linux/fs.h | 16 +-
include/linux/fsnotify.h | 166 +++---
include/linux/fsnotify_backend.h | 169 ++++--
include/linux/inotify.h | 175 +------
include/linux/mount.h | 6 +-
include/linux/security.h | 1 +
include/linux/syscalls.h | 5 +
init/Kconfig | 10 +-
kernel/Makefile | 5 +-
kernel/audit.c | 1 -
kernel/audit.h | 26 +-
kernel/audit_tree.c | 233 ++++----
kernel/audit_watch.c | 295 ++++++----
kernel/auditfilter.c | 39 +-
kernel/auditsc.c | 10 +-
kernel/sys_ni.c | 4 +
kernel/sysctl.c | 7 +-
security/security.c | 16 +-
57 files changed, 3100 insertions(+), 2190 deletions(-)
create mode 100644 fs/notify/fanotify/Kconfig
create mode 100644 fs/notify/fanotify/Makefile
create mode 100644 fs/notify/fanotify/fanotify.c
create mode 100644 fs/notify/fanotify/fanotify_user.c
delete mode 100644 fs/notify/inotify/inotify.c
create mode 100644 fs/notify/mark.c
create mode 100644 fs/notify/vfsmount_mark.c
create mode 100644 include/linux/fanotify.h
$ git am -3 ../patches/fsnotify__update_gfp_slab.h_includes
Applying: fsnotify: update gfp/slab.h includes
$ git reset HEAD^
Unstaged changes after reset:
M fs/notify/fanotify/fanotify_user.c
M fs/notify/vfsmount_mark.c
$ git add .
$ git commit -v -a --amend
[master 92645fe] Merge remote branch 'fsnotify/for-next'
Merging irda/for-next
$ git merge irda/for-next
Resolved 'drivers/net/irda/irda-usb.c' using previous resolution.
Auto-merging drivers/net/irda/irda-usb.c
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 0e385ce] Merge remote branch 'irda/for-next'
$ git diff -M --stat --summary HEAD^..
drivers/net/irda/irda-usb.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
Merging catalin/for-next
$ git merge catalin/for-next
Already up-to-date.
Merging alacrity/linux-next
$ git merge alacrity/linux-next
Auto-merging MAINTAINERS
Auto-merging arch/x86/Kconfig
Auto-merging drivers/Makefile
Auto-merging drivers/net/Kconfig
Auto-merging drivers/net/Makefile
Auto-merging include/linux/Kbuild
Auto-merging lib/Makefile
Merge made by recursive.
MAINTAINERS | 25 +
arch/x86/Kconfig | 2 +
drivers/Makefile | 1 +
drivers/net/Kconfig | 14 +
drivers/net/Makefile | 1 +
drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++
drivers/vbus/Kconfig | 25 +
drivers/vbus/Makefile | 6 +
drivers/vbus/bus-proxy.c | 248 +++++++
drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++
include/linux/Kbuild | 4 +
include/linux/ioq.h | 414 ++++++++++++
include/linux/shm_signal.h | 189 ++++++
include/linux/vbus_driver.h | 83 +++
include/linux/vbus_pci.h | 145 ++++
include/linux/venet.h | 133 ++++
lib/Kconfig | 21 +
lib/Makefile | 2 +
lib/ioq.c | 304 +++++++++
lib/shm_signal.c | 196 ++++++
20 files changed, 4389 insertions(+), 0 deletions(-)
create mode 100644 drivers/net/vbus-enet.c
create mode 100644 drivers/vbus/Kconfig
create mode 100644 drivers/vbus/Makefile
create mode 100644 drivers/vbus/bus-proxy.c
create mode 100644 drivers/vbus/pci-bridge.c
create mode 100644 include/linux/ioq.h
create mode 100644 include/linux/shm_signal.h
create mode 100644 include/linux/vbus_driver.h
create mode 100644 include/linux/vbus_pci.h
create mode 100644 include/linux/venet.h
create mode 100644 lib/ioq.c
create mode 100644 lib/shm_signal.c
Merging i7core_edac/linux_next
$ git merge i7core_edac/linux_next
Already up-to-date.
Merging devicetree/next-devicetree
$ git merge devicetree/next-devicetree
Auto-merging arch/microblaze/kernel/Makefile
Auto-merging arch/microblaze/kernel/irq.c
Removing arch/microblaze/kernel/of_device.c
Auto-merging arch/powerpc/include/asm/irq.h
Auto-merging arch/powerpc/kernel/irq.c
Auto-merging drivers/serial/sunsu.c
Merge made by recursive.
arch/microblaze/include/asm/device.h | 3 +
arch/microblaze/include/asm/irq.h | 13 -
arch/microblaze/include/asm/of_device.h | 31 -
arch/microblaze/include/asm/of_platform.h | 33 -
arch/microblaze/include/asm/pci-bridge.h | 5 -
arch/microblaze/include/asm/prom.h | 94 +---
arch/microblaze/kernel/Makefile | 2 +-
arch/microblaze/kernel/irq.c | 14 +-
arch/microblaze/kernel/of_device.c | 112 ---
arch/microblaze/kernel/of_platform.c | 141 +----
arch/microblaze/kernel/prom_parse.c | 867 +-----------------------
arch/microblaze/kernel/reset.c | 12 +-
arch/powerpc/include/asm/device.h | 3 +
arch/powerpc/include/asm/irq.h | 13 -
arch/powerpc/include/asm/of_device.h | 24 -
arch/powerpc/include/asm/of_platform.h | 11 -
arch/powerpc/include/asm/pci-bridge.h | 5 -
arch/powerpc/include/asm/prom.h | 82 +--
arch/powerpc/include/asm/smu.h | 4 +-
arch/powerpc/kernel/irq.c | 14 +-
arch/powerpc/kernel/of_device.c | 110 +---
arch/powerpc/kernel/of_platform.c | 131 +----
arch/powerpc/kernel/prom_parse.c | 827 +----------------------
arch/powerpc/platforms/52xx/mpc52xx_gpio.c | 30 +-
arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 29 +-
arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 34 +-
arch/powerpc/platforms/86xx/gef_gpio.c | 24 +-
arch/powerpc/sysdev/cpm1.c | 10 +-
arch/powerpc/sysdev/cpm_common.c | 5 +-
arch/powerpc/sysdev/mpc8xxx_gpio.c | 5 +-
arch/powerpc/sysdev/ppc4xx_gpio.c | 5 +-
arch/powerpc/sysdev/qe_lib/gpio.c | 31 +-
arch/powerpc/sysdev/simple_gpio.c | 5 +-
arch/sparc/include/asm/device.h | 9 +-
arch/sparc/include/asm/floppy_64.h | 4 +-
arch/sparc/include/asm/of_device.h | 19 -
arch/sparc/include/asm/parport.h | 4 +-
arch/sparc/include/asm/prom.h | 1 -
arch/sparc/kernel/of_device_32.c | 28 +-
arch/sparc/kernel/of_device_64.c | 24 +-
arch/sparc/kernel/of_device_common.c | 4 +-
arch/sparc/kernel/pci.c | 2 +-
arch/sparc/kernel/pci_psycho.c | 8 +-
arch/sparc/kernel/pci_sabre.c | 8 +-
arch/sparc/kernel/pci_schizo.c | 20 +-
arch/sparc/kernel/power.c | 2 +-
drivers/atm/fore200e.c | 2 +-
drivers/gpio/gpiolib.c | 55 ++-
drivers/gpio/xilinx_gpio.c | 15 +-
drivers/input/serio/i8042-sparcio.h | 8 +-
drivers/macintosh/macio_sysfs.c | 5 +-
drivers/net/myri_sbus.c | 2 +-
drivers/net/niu.c | 9 +-
drivers/net/niu.h | 4 +-
drivers/net/sunbmac.c | 2 +-
drivers/net/sunhme.c | 6 +-
drivers/net/sunlance.c | 2 +-
drivers/net/sunqe.c | 6 +-
drivers/of/Kconfig | 8 +
drivers/of/Makefile | 2 +
drivers/of/address.c | 595 ++++++++++++++++
drivers/of/device.c | 64 ++-
drivers/of/gpio.c | 86 ++-
drivers/of/irq.c | 338 +++++++++
drivers/of/of_mdio.c | 1 +
drivers/of/platform.c | 221 ++++++
drivers/parport/parport_sunbpp.c | 2 +-
drivers/sbus/char/bbc_i2c.c | 6 +-
drivers/sbus/char/uctrl.c | 2 +-
drivers/scsi/qlogicpti.c | 4 +-
drivers/scsi/sun_esp.c | 2 +-
drivers/serial/sunhv.c | 4 +-
drivers/serial/sunsab.c | 2 +-
drivers/serial/sunsu.c | 2 +-
drivers/serial/sunzilog.c | 10 +-
drivers/watchdog/cpwd.c | 2 +-
include/asm-generic/gpio.h | 15 +
include/linux/of_address.h | 12 +
include/linux/of_device.h | 42 ++-
include/linux/of_gpio.h | 35 +-
include/linux/of_irq.h | 49 ++
include/linux/of_platform.h | 21 +
sound/sparc/amd7930.c | 2 +-
sound/sparc/cs4231.c | 14 +-
sound/sparc/dbri.c | 2 +-
85 files changed, 1721 insertions(+), 2800 deletions(-)
delete mode 100644 arch/microblaze/kernel/of_device.c
create mode 100644 drivers/of/address.c
create mode 100644 drivers/of/irq.c
create mode 100644 include/linux/of_address.h
create mode 100644 include/linux/of_irq.h
Merging spi/next-spi
$ git merge spi/next-spi
Already up-to-date.
Merging omap_dss2/for-next
$ git merge omap_dss2/for-next
Merge made by recursive.
drivers/video/omap/lcdc.c | 14 ++------------
drivers/video/omap/rfbi.c | 5 +++--
2 files changed, 5 insertions(+), 14 deletions(-)
Merging tip/auto-latest
$ git merge tip/auto-latest
Resolved 'fs/fs-writeback.c' using previous resolution.
Resolved 'net/bridge/br_fdb.c' using previous resolution.
Resolved 'net/bridge/netfilter/ebt_redirect.c' using previous resolution.
Resolved 'net/bridge/netfilter/ebt_ulog.c' using previous resolution.
Resolved 'net/bridge/netfilter/ebtables.c' using previous resolution.
Resolved 'net/netfilter/nfnetlink_log.c' using previous resolution.
Removing Documentation/ABI/testing/debugfs-kmemtrace
Auto-merging Documentation/kernel-parameters.txt
Removing Documentation/trace/kmemtrace.txt
Auto-merging MAINTAINERS
Auto-merging Makefile
Auto-merging arch/powerpc/kernel/process.c
Auto-merging arch/sparc/kernel/perf_event.c
Auto-merging arch/x86/Kconfig
Removing arch/x86/kernel/dumpstack.h
Auto-merging arch/x86/kernel/process.c
Auto-merging fs/exec.c
Auto-merging fs/fs-writeback.c
CONFLICT (content): Merge conflict in fs/fs-writeback.c
Auto-merging include/linux/if_bridge.h
Removing include/linux/kmemtrace.h
Removing include/trace/boot.h
Auto-merging init/main.c
Auto-merging kernel/Makefile
Auto-merging kernel/cpuset.c
Removing kernel/softlockup.c
Auto-merging kernel/sysctl.c
Removing kernel/trace/kmemtrace.c
Removing kernel/trace/trace_boot.c
Auto-merging lib/Kconfig.debug
Auto-merging mm/backing-dev.c
Auto-merging net/bridge/br_fdb.c
CONFLICT (content): Merge conflict in net/bridge/br_fdb.c
Auto-merging net/bridge/br_private.h
Auto-merging net/bridge/netfilter/ebt_redirect.c
CONFLICT (content): Merge conflict in net/bridge/netfilter/ebt_redirect.c
Auto-merging net/bridge/netfilter/ebt_ulog.c
CONFLICT (content): Merge conflict in net/bridge/netfilter/ebt_ulog.c
Auto-merging net/bridge/netfilter/ebtables.c
CONFLICT (content): Merge conflict in net/bridge/netfilter/ebtables.c
Auto-merging net/netfilter/nfnetlink_log.c
CONFLICT (content): Merge conflict in net/netfilter/nfnetlink_log.c
Auto-merging net/netfilter/nfnetlink_queue.c
CONFLICT (content): Merge conflict in net/netfilter/nfnetlink_queue.c
Auto-merging scripts/package/Makefile
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'net/netfilter/nfnetlink_queue.c'.
[master 9a1274f] Merge remote branch 'tip/auto-latest'
$ git diff -M --stat --summary HEAD^..
Documentation/ABI/testing/debugfs-kmemtrace | 71 ---
Documentation/kernel-parameters.txt | 2 +
Documentation/trace/kmemtrace.txt | 126 -----
Documentation/x86/zero-page.txt | 1 +
MAINTAINERS | 7 -
Makefile | 4 +-
arch/Kconfig | 7 +
arch/alpha/include/asm/local64.h | 1 +
arch/arm/include/asm/local64.h | 1 +
arch/arm/kernel/perf_event.c | 18 +-
arch/avr32/include/asm/local64.h | 1 +
arch/blackfin/include/asm/local64.h | 1 +
arch/cris/include/asm/local64.h | 1 +
arch/frv/include/asm/local64.h | 1 +
arch/frv/kernel/local64.h | 1 +
arch/h8300/include/asm/local64.h | 1 +
arch/ia64/include/asm/local64.h | 1 +
arch/m32r/include/asm/local64.h | 1 +
arch/m68k/include/asm/local64.h | 1 +
arch/microblaze/include/asm/local64.h | 1 +
arch/mips/include/asm/local64.h | 1 +
arch/mn10300/include/asm/local64.h | 1 +
arch/parisc/include/asm/local64.h | 1 +
arch/parisc/kernel/ftrace.c | 4 +-
arch/powerpc/include/asm/cputable.h | 3 +-
arch/powerpc/include/asm/local64.h | 1 +
arch/powerpc/include/asm/perf_event.h | 12 +
arch/powerpc/kernel/misc.S | 26 -
arch/powerpc/kernel/perf_event.c | 41 +-
arch/powerpc/kernel/process.c | 11 +
arch/powerpc/mm/pgtable.c | 1 -
arch/s390/include/asm/local64.h | 1 +
arch/score/include/asm/local64.h | 1 +
arch/sh/include/asm/local64.h | 1 +
arch/sh/kernel/perf_event.c | 6 +-
arch/sparc/include/asm/local64.h | 1 +
arch/sparc/include/asm/perf_event.h | 8 +
arch/sparc/kernel/helpers.S | 6 +-
arch/sparc/kernel/perf_event.c | 25 +-
arch/um/include/asm/arch_hweight.h | 6 +
arch/x86/Kconfig | 10 +
arch/x86/boot/video-vga.c | 3 +-
arch/x86/include/asm/apb_timer.h | 1 -
arch/x86/include/asm/bootparam.h | 11 +-
arch/x86/include/asm/io_apic.h | 4 +-
arch/x86/include/asm/local64.h | 1 +
arch/x86/include/asm/mrst.h | 26 +
arch/x86/include/asm/nmi.h | 2 +
arch/x86/include/asm/olpc_ofw.h | 31 ++
arch/x86/include/asm/percpu.h | 2 +
arch/x86/include/asm/perf_event.h | 18 +-
arch/x86/include/asm/pgtable_32_types.h | 2 +-
arch/x86/include/asm/stacktrace.h | 49 ++
arch/x86/include/asm/system.h | 2 +-
arch/x86/include/asm/uv/uv_bau.h | 151 ++++--
arch/x86/kernel/Makefile | 1 +
arch/x86/kernel/acpi/boot.c | 8 +-
arch/x86/kernel/apb_timer.c | 37 +-
arch/x86/kernel/apic/Makefile | 7 +-
arch/x86/kernel/apic/hw_nmi.c | 107 ++++
arch/x86/kernel/apic/io_apic.c | 12 +-
arch/x86/kernel/apic/nmi.c | 7 -
arch/x86/kernel/cpu/common.c | 2 +-
arch/x86/kernel/cpu/mcheck/mce.c | 2 +-
arch/x86/kernel/cpu/perf_event.c | 62 +--
arch/x86/kernel/cpu/perf_event_intel.c | 1 +
arch/x86/kernel/cpu/perf_event_p4.c | 9 +
arch/x86/kernel/dumpstack.c | 1 -
arch/x86/kernel/dumpstack.h | 56 --
arch/x86/kernel/dumpstack_32.c | 2 -
arch/x86/kernel/dumpstack_64.c | 1 -
arch/x86/kernel/head_32.S | 6 +
arch/x86/kernel/mpparse.c | 2 +-
arch/x86/kernel/mrst.c | 105 +++-
arch/x86/kernel/olpc.c | 12 +-
arch/x86/kernel/olpc_ofw.c | 104 ++++
arch/x86/kernel/process.c | 1 -
arch/x86/kernel/process_32.c | 4 +
arch/x86/kernel/process_64.c | 5 +
arch/x86/kernel/setup.c | 6 +
arch/x86/kernel/sfi.c | 2 +-
arch/x86/kernel/stacktrace.c | 31 +-
arch/x86/kernel/tlb_uv.c | 740 ++++++++++++++++++---------
arch/x86/kernel/traps.c | 7 +
arch/x86/mm/kmmio.c | 16 +-
arch/x86/mm/pat.c | 2 +-
arch/x86/mm/pat_rbtree.c | 35 +-
arch/x86/mm/testmmiotrace.c | 22 +
arch/x86/vdso/Makefile | 3 +-
arch/x86/vdso/checkundef.sh | 10 +
arch/xtensa/include/asm/local64.h | 1 +
fs/exec.c | 1 +
fs/file.c | 3 -
fs/partitions/check.c | 1 -
include/asm-generic/local64.h | 96 ++++
include/linux/cgroup.h | 20 +-
include/linux/compiler.h | 2 +
include/linux/cpu.h | 25 +
include/linux/cpuset.h | 6 +
include/linux/fdtable.h | 1 +
include/linux/ftrace_event.h | 3 +-
include/linux/if_bridge.h | 3 +
include/linux/kmemtrace.h | 25 -
include/linux/nmi.h | 13 +
include/linux/perf_event.h | 91 ++--
include/linux/rbtree.h | 13 +-
include/linux/rcupdate.h | 82 +++
include/linux/sched.h | 65 ++--
include/linux/slab_def.h | 3 +-
include/linux/slub_def.h | 3 +-
include/linux/topology.h | 1 +
include/linux/workqueue.h | 4 +
include/trace/boot.h | 60 ---
include/trace/ftrace.h | 2 +-
init/main.c | 29 +-
kernel/Makefile | 2 +-
kernel/cpu.c | 6 -
kernel/cpuset.c | 21 +-
kernel/fork.c | 2 +-
kernel/hrtimer.c | 8 +-
kernel/irq/manage.c | 3 +
kernel/lockdep.c | 2 +-
kernel/perf_event.c | 460 +++++++++--------
kernel/posix-cpu-timers.c | 36 +-
kernel/rcupdate.c | 160 ++++++
kernel/rcutiny.c | 2 +
kernel/rcutorture.c | 3 +-
kernel/rcutree.c | 2 +
kernel/sched.c | 486 +++++++++++++-----
kernel/sched_clock.c | 95 +++-
kernel/sched_fair.c | 519 +++++++++++++------
kernel/sched_rt.c | 3 -
kernel/sched_stats.h | 27 +-
kernel/softlockup.c | 293 -----------
kernel/sysctl.c | 55 ++-
kernel/time/tick-sched.c | 13 +-
kernel/timer.c | 9 +-
kernel/trace/Kconfig | 37 --
kernel/trace/Makefile | 2 -
kernel/trace/ftrace.c | 5 +-
kernel/trace/kmemtrace.c | 529 -------------------
kernel/trace/ring_buffer.c | 38 +--
kernel/trace/trace.c | 8 +-
kernel/trace/trace.h | 68 ---
kernel/trace/trace_boot.c | 185 -------
kernel/trace/trace_clock.c | 7 +-
kernel/trace/trace_entries.h | 62 ---
kernel/trace/trace_event_perf.c | 6 +-
kernel/trace/trace_events.c | 5 +-
kernel/trace/trace_functions.c | 6 +-
kernel/trace/trace_sched_wakeup.c | 5 +-
kernel/trace/trace_stack.c | 6 +-
kernel/trace/trace_sysprof.c | 7 +-
kernel/watchdog.c | 567 ++++++++++++++++++++
kernel/workqueue.c | 15 +
kernel/workqueue_sched.h | 16 +
lib/Kconfig.debug | 41 +-
lib/rbtree.c | 116 +++--
mm/backing-dev.c | 1 -
mm/mmap.c | 6 +-
mm/slab.c | 1 -
mm/slob.c | 5 +-
mm/slub.c | 1 -
net/bridge/br_private.h | 5 +
scripts/package/Makefile | 37 ++-
tools/perf/.gitignore | 2 +
tools/perf/Documentation/perf-probe.txt | 4 +
tools/perf/Documentation/perf-record.txt | 13 +
tools/perf/Documentation/perf-stat.txt | 7 +
tools/perf/Documentation/perf-top.txt | 8 +-
tools/perf/MANIFEST | 12 +
tools/perf/Makefile | 109 ++--
tools/perf/builtin-annotate.c | 6 +-
tools/perf/builtin-buildid-cache.c | 3 +-
tools/perf/builtin-diff.c | 7 +-
tools/perf/builtin-probe.c | 2 +
tools/perf/builtin-record.c | 37 +-
tools/perf/builtin-report.c | 25 +-
tools/perf/builtin-stat.c | 14 +-
tools/perf/builtin-top.c | 20 +-
tools/perf/feature-tests.mak | 119 +++++
tools/perf/perf-archive.sh | 20 +-
tools/perf/perf.c | 2 +
tools/perf/util/build-id.c | 10 +-
tools/perf/util/cache.h | 1 +
tools/perf/util/callchain.c | 2 +-
tools/perf/util/callchain.h | 2 +-
tools/perf/util/config.c | 64 +++-
tools/perf/util/cpumap.c | 57 ++-
tools/perf/util/cpumap.h | 2 +-
tools/perf/util/debug.c | 10 +-
tools/perf/util/event.c | 41 ++-
tools/perf/util/event.h | 5 +-
tools/perf/util/header.c | 13 +-
tools/perf/util/hist.c | 3 +-
tools/perf/util/newt.c | 15 +-
tools/perf/util/probe-finder.c | 58 ++-
tools/perf/util/session.c | 17 +-
tools/perf/util/session.h | 2 +
tools/perf/util/sort.c | 27 +
tools/perf/util/sort.h | 6 +-
tools/perf/util/symbol.c | 37 ++-
tools/perf/util/symbol.h | 6 +-
tools/perf/util/thread.h | 5 +-
tools/perf/util/util.h | 3 +
205 files changed, 4352 insertions(+), 3137 deletions(-)
delete mode 100644 Documentation/ABI/testing/debugfs-kmemtrace
delete mode 100644 Documentation/trace/kmemtrace.txt
create mode 100644 arch/alpha/include/asm/local64.h
create mode 100644 arch/arm/include/asm/local64.h
create mode 100644 arch/avr32/include/asm/local64.h
create mode 100644 arch/blackfin/include/asm/local64.h
create mode 100644 arch/cris/include/asm/local64.h
create mode 100644 arch/frv/include/asm/local64.h
create mode 100644 arch/frv/kernel/local64.h
create mode 100644 arch/h8300/include/asm/local64.h
create mode 100644 arch/ia64/include/asm/local64.h
create mode 100644 arch/m32r/include/asm/local64.h
create mode 100644 arch/m68k/include/asm/local64.h
create mode 100644 arch/microblaze/include/asm/local64.h
create mode 100644 arch/mips/include/asm/local64.h
create mode 100644 arch/mn10300/include/asm/local64.h
create mode 100644 arch/parisc/include/asm/local64.h
create mode 100644 arch/powerpc/include/asm/local64.h
create mode 100644 arch/s390/include/asm/local64.h
create mode 100644 arch/score/include/asm/local64.h
create mode 100644 arch/sh/include/asm/local64.h
create mode 100644 arch/sparc/include/asm/local64.h
create mode 100644 arch/um/include/asm/arch_hweight.h
create mode 100644 arch/x86/include/asm/local64.h
create mode 100644 arch/x86/include/asm/olpc_ofw.h
create mode 100644 arch/x86/kernel/apic/hw_nmi.c
delete mode 100644 arch/x86/kernel/dumpstack.h
create mode 100644 arch/x86/kernel/olpc_ofw.c
create mode 100755 arch/x86/vdso/checkundef.sh
create mode 100644 arch/xtensa/include/asm/local64.h
create mode 100644 include/asm-generic/local64.h
delete mode 100644 include/linux/kmemtrace.h
delete mode 100644 include/trace/boot.h
delete mode 100644 kernel/softlockup.c
delete mode 100644 kernel/trace/kmemtrace.c
delete mode 100644 kernel/trace/trace_boot.c
create mode 100644 kernel/watchdog.c
create mode 100644 kernel/workqueue_sched.h
create mode 100644 tools/perf/MANIFEST
create mode 100644 tools/perf/feature-tests.mak
$ git am -3 ../patches/0001-net-merge-fixups-for-bridge-rcu-code.patch
Applying: net: merge fixups for bridge rcu code
$ git reset HEAD^
Unstaged changes after reset:
M include/linux/if_bridge.h
M net/bridge/br_private.h
$ git add .
$ git commit -v -a --amend
[master 32325d3] Merge remote branch 'tip/auto-latest'
$ git am -3 ../patches/perf__Fix_argument_of_perf_arch_fetch_caller_regs
Applying: perf: Fix argument of perf_arch_fetch_caller_regs
$ git reset HEAD^
Unstaged changes after reset:
M include/linux/perf_event.h
$ git add .
$ git commit -v -a --amend
[master ad7af43] Merge remote branch 'tip/auto-latest'
Merging edac-amd/for-next
$ git merge edac-amd/for-next
Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
Auto-merging drivers/edac/Kconfig
Auto-merging drivers/edac/edac_core.h
Auto-merging drivers/edac/edac_mc_sysfs.c
Merge made by recursive.
arch/x86/kernel/cpu/mcheck/mce.c | 1 +
drivers/edac/Kconfig | 8 --
drivers/edac/amd64_edac.c | 156 ++++++--------------------------------
drivers/edac/amd64_edac.h | 47 +++---------
drivers/edac/e752x_edac.c | 4 +-
drivers/edac/edac_core.h | 17 +----
drivers/edac/edac_mc_sysfs.c | 86 +++++++++------------
drivers/edac/edac_mce_amd.c | 16 ++--
drivers/edac/i5100_edac.c | 7 +-
9 files changed, 88 insertions(+), 254 deletions(-)
Merging oprofile/for-next
$ git merge oprofile/for-next
Merge made by recursive.
arch/x86/oprofile/nmi_int.c | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
Merging percpu/for-next
$ git merge percpu/for-next
Already up-to-date.
Merging workqueues/for-next
$ git merge workqueues/for-next
Already up-to-date.
Merging sfi/sfi-test
$ git merge sfi/sfi-test
Already up-to-date.
Merging asm-generic/next
$ git merge asm-generic/next
Already up-to-date.
Merging drivers-x86/linux-next
$ git merge drivers-x86/linux-next
Auto-merging include/drm/i915_drm.h
Auto-merging kernel/timer.c
Merge made by recursive.
drivers/platform/x86/Kconfig | 12 +
drivers/platform/x86/Makefile | 1 +
drivers/platform/x86/hp-wmi.c | 234 ++++--
drivers/platform/x86/intel_ips.c | 1659 +++++++++++++++++++++++++++++++++++
drivers/platform/x86/intel_menlow.c | 33 +-
drivers/platform/x86/sony-laptop.c | 10 +-
include/drm/i915_drm.h | 9 +
include/linux/timer.h | 15 +
kernel/timer.c | 13 +
9 files changed, 1920 insertions(+), 66 deletions(-)
create mode 100644 drivers/platform/x86/intel_ips.c
Merging hwpoison/hwpoison
$ git merge hwpoison/hwpoison
Resolved 'mm/memory-failure.c' using previous resolution.
Auto-merging mm/memory-failure.c
CONFLICT (content): Merge conflict in mm/memory-failure.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 371cf91] Merge remote branch 'hwpoison/hwpoison'
$ git diff -M --stat --summary HEAD^..
include/linux/hugetlb.h | 14 +---
include/linux/hugetlb_inline.h | 22 +++++++
include/linux/pagemap.h | 9 +++-
include/linux/poison.h | 9 ---
include/linux/rmap.h | 5 ++
mm/hugetlb.c | 102 +++++++++++++++++++++++++++++++++-
mm/hwpoison-inject.c | 15 +++--
mm/memory-failure.c | 120 ++++++++++++++++++++++++++++++----------
mm/rmap.c | 59 ++++++++++++++++++++
9 files changed, 297 insertions(+), 58 deletions(-)
create mode 100644 include/linux/hugetlb_inline.h
Merging sysctl/master
$ git merge sysctl/master
Already up-to-date.
Merging bkl-core/bkl/core
$ git merge bkl-core/bkl/core
Already up-to-date.
Merging bkl-procfs/bkl/procfs
$ git merge bkl-procfs/bkl/procfs
Already up-to-date.
Merging bkl-ioctl/bkl/ioctl
$ git merge bkl-ioctl/bkl/ioctl
Already up-to-date.
Merging quilt/driver-core
$ git merge quilt/driver-core
Auto-merging MAINTAINERS
Auto-merging kernel/sysctl.c
Merge made by recursive.
Documentation/DocBook/device-drivers.tmpl | 1 +
MAINTAINERS | 6 +
drivers/base/dma-coherent.c | 2 +-
drivers/base/firmware_class.c | 262 +++++------
drivers/base/platform.c | 110 ++----
drivers/hwmon/Kconfig | 10 +
drivers/hwmon/Makefile | 1 +
drivers/hwmon/emc2103.c | 723 +++++++++++++++++++++++++++++
drivers/uio/uio_cif.c | 2 +-
drivers/uio/uio_pdrv_genirq.c | 1 -
drivers/uio/uio_sercos3.c | 2 +-
include/linux/device.h | 5 +-
include/linux/platform_device.h | 62 +++-
kernel/sysctl.c | 2 +-
14 files changed, 958 insertions(+), 231 deletions(-)
create mode 100644 drivers/hwmon/emc2103.c
Merging quilt/tty
$ git merge quilt/tty
Auto-merging drivers/char/Makefile
Auto-merging drivers/char/vt.c
Auto-merging drivers/serial/68328serial.c
Auto-merging include/linux/console_struct.h
Auto-merging include/linux/serial_core.h
Auto-merging lib/Kconfig.debug
Merge made by recursive.
arch/alpha/include/asm/ioctls.h | 2 -
arch/avr32/include/asm/ioctls.h | 2 -
arch/cris/include/asm/ioctls.h | 2 -
arch/ia64/include/asm/ioctls.h | 2 -
arch/m32r/include/asm/ioctls.h | 2 -
arch/mips/include/asm/ioctls.h | 2 -
arch/mn10300/include/asm/ioctls.h | 2 -
arch/parisc/include/asm/ioctls.h | 2 -
drivers/char/Makefile | 1 +
drivers/char/amiserial.c | 25 +-
drivers/char/briq_panel.c | 6 +-
drivers/char/cyclades.c | 22 +-
drivers/char/epca.c | 4 +-
drivers/char/ip2/ip2main.c | 4 +
drivers/char/isicom.c | 13 +-
drivers/char/istallion.c | 68 ++--
drivers/char/keyboard.c | 10 +-
drivers/char/n_gsm.c | 1 -
drivers/char/n_hdlc.c | 16 +-
drivers/char/n_r3964.c | 10 +-
drivers/char/pty.c | 26 +-
drivers/char/riscom8.c | 14 +-
drivers/char/rocket.c | 28 +-
drivers/char/selection.c | 13 +-
drivers/char/serial167.c | 8 +-
drivers/char/specialix.c | 13 +-
drivers/char/stallion.c | 20 +-
drivers/char/sx.c | 12 +-
drivers/char/synclink.c | 21 +-
drivers/char/synclink_gt.c | 92 ++--
drivers/char/synclinkmp.c | 43 +-
drivers/char/tty_io.c | 138 +++---
drivers/char/tty_ldisc.c | 43 ++-
drivers/char/tty_mutex.c | 47 ++
drivers/char/tty_port.c | 4 +-
drivers/char/vc_screen.c | 4 +-
drivers/char/vt.c | 24 +-
drivers/char/vt_ioctl.c | 14 +-
drivers/serial/21285.c | 10 +-
drivers/serial/68328serial.c | 2 +
drivers/serial/68360serial.c | 4 +-
drivers/serial/8250.c | 11 +-
drivers/serial/Kconfig | 17 +
drivers/serial/Makefile | 1 +
drivers/serial/bfin_5xx.c | 7 +-
drivers/serial/crisv10.c | 8 +-
drivers/serial/imx.c | 10 +-
drivers/serial/ioc3_serial.c | 9 +-
drivers/serial/ioc4_serial.c | 9 +-
drivers/serial/max3100.c | 7 +-
drivers/serial/mrst_max3110.c | 844 ++++++++++++++++++++++++++++++++++
drivers/serial/mrst_max3110.h | 59 +++
drivers/serial/serial_core.c | 281 ++++++------
drivers/usb/class/cdc-acm.c | 12 +-
drivers/usb/serial/digi_acceleport.c | 14 +-
drivers/video/console/vgacon.c | 2 -
include/asm-generic/ioctls.h | 6 +-
include/linux/console_struct.h | 3 +-
include/linux/istallion.h | 2 +-
include/linux/serial_core.h | 2 +-
include/linux/tty.h | 67 +++
lib/Kconfig.debug | 10 +
62 files changed, 1618 insertions(+), 539 deletions(-)
create mode 100644 drivers/char/tty_mutex.c
create mode 100644 drivers/serial/mrst_max3110.c
create mode 100644 drivers/serial/mrst_max3110.h
Merging quilt/usb
$ git merge quilt/usb
Auto-merging drivers/usb/atm/ueagle-atm.c
Merge made by recursive.
Documentation/usb/ehci.txt | 2 +-
Documentation/usb/gadget_multi.txt | 150 +++++++++++++
Documentation/usb/gadget_serial.txt | 87 +-------
Documentation/usb/hotplug.txt | 4 +-
Documentation/usb/linux-cdc-acm.inf | 107 ++++++++++
Documentation/usb/linux.inf | 228 ++++----------------
drivers/media/video/uvc/uvcvideo.h | 19 --
drivers/usb/atm/cxacru.c | 11 +-
drivers/usb/atm/speedtch.c | 10 +-
drivers/usb/atm/ueagle-atm.c | 5 +-
drivers/usb/atm/usbatm.c | 23 +--
drivers/usb/atm/usbatm.h | 22 +-
drivers/usb/atm/xusbatm.c | 10 +-
drivers/usb/core/devio.c | 7 +-
drivers/usb/core/driver.c | 7 +-
drivers/usb/core/endpoint.c | 9 +-
drivers/usb/core/hcd-pci.c | 8 +
drivers/usb/core/hcd.c | 48 ++++-
drivers/usb/core/hub.c | 7 +-
drivers/usb/core/inode.c | 4 -
drivers/usb/gadget/Kconfig | 1 +
drivers/usb/gadget/audio.c | 4 +-
drivers/usb/gadget/cdc2.c | 4 +-
drivers/usb/gadget/composite.c | 73 ++++++-
drivers/usb/gadget/ether.c | 6 +-
drivers/usb/gadget/f_fs.c | 38 ++--
drivers/usb/gadget/f_loopback.c | 4 +-
drivers/usb/gadget/f_mass_storage.c | 125 +++++++----
drivers/usb/gadget/f_sourcesink.c | 2 +-
drivers/usb/gadget/f_uvc.c | 16 +-
drivers/usb/gadget/f_uvc.h | 352 +-------------------------------
drivers/usb/gadget/file_storage.c | 71 +++++-
drivers/usb/gadget/g_ffs.c | 2 +-
drivers/usb/gadget/gmidi.c | 2 +-
drivers/usb/gadget/hid.c | 4 +-
drivers/usb/gadget/inode.c | 16 +-
drivers/usb/gadget/langwell_udc.c | 6 +-
drivers/usb/gadget/mass_storage.c | 24 ++-
drivers/usb/gadget/multi.c | 262 +++++++++++++----------
drivers/usb/gadget/printer.c | 2 +-
drivers/usb/gadget/serial.c | 4 +-
drivers/usb/gadget/u_ether.c | 15 +--
drivers/usb/gadget/uvc.h | 36 ----
drivers/usb/gadget/webcam.c | 28 ++--
drivers/usb/gadget/zero.c | 2 +-
drivers/usb/host/Kconfig | 11 +-
drivers/usb/host/ehci-dbg.c | 144 ++++++++++++-
drivers/usb/host/ehci-hcd.c | 37 +++-
drivers/usb/host/ehci-hub.c | 14 ++
drivers/usb/host/ehci-lpm.c | 83 ++++++++
drivers/usb/host/ehci-pci.c | 21 ++
drivers/usb/host/ehci.h | 4 +-
drivers/usb/host/uhci-debug.c | 20 +--
drivers/usb/host/uhci-hcd.c | 2 +
drivers/usb/host/uhci-q.c | 4 +-
drivers/usb/host/whci/qset.c | 2 +-
drivers/usb/host/xhci.c | 1 -
drivers/usb/misc/usbtest.c | 3 +-
drivers/usb/mon/mon_bin.c | 22 +--
drivers/usb/serial/ipaq.c | 1 -
drivers/usb/serial/iuu_phoenix.c | 54 ++++--
drivers/usb/serial/option.c | 4 +-
drivers/usb/serial/usb-serial.c | 30 ++--
drivers/usb/storage/isd200.c | 3 +-
include/linux/usb.h | 2 +-
include/linux/usb/composite.h | 6 +
include/linux/usb/ehci_def.h | 23 ++
include/linux/usb/functionfs.h | 6 +-
include/linux/usb/hcd.h | 5 +
include/linux/usb/otg.h | 4 +-
include/linux/usb/video.h | 397 +++++++++++++++++++++++++++++++++++
71 files changed, 1668 insertions(+), 1102 deletions(-)
create mode 100644 Documentation/usb/gadget_multi.txt
create mode 100644 Documentation/usb/linux-cdc-acm.inf
create mode 100644 drivers/usb/host/ehci-lpm.c
Merging staging-next/staging-next
$ git merge staging-next/staging-next
Resolved 'drivers/staging/batman-adv/bat_sysfs.c' using previous resolution.
Auto-merging drivers/staging/batman-adv/bat_sysfs.c
CONFLICT (content): Merge conflict in drivers/staging/batman-adv/bat_sysfs.c
CONFLICT (delete/modify): drivers/staging/batman-adv/device.c deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/batman-adv/device.c left in tree.
Auto-merging drivers/staging/batman-adv/hard-interface.c
Auto-merging drivers/staging/comedi/drivers/adl_pci9111.c
Auto-merging drivers/staging/comedi/drivers/cb_pcidda.c
Auto-merging drivers/staging/hv/vmbus_drv.c
Auto-merging drivers/staging/pohmelfs/inode.c
Removing drivers/staging/ramzswap/Kconfig
Removing drivers/staging/ramzswap/Makefile
Removing drivers/staging/ramzswap/ramzswap.txt
Removing drivers/staging/ramzswap/ramzswap_drv.c
Removing drivers/staging/rt3070/md4.h
Auto-merging drivers/staging/rtl8192e/r8192E_core.c
Auto-merging drivers/staging/rtl8192su/r8192U_core.c
Removing drivers/staging/wlan-ng/p80211wext.c
Removing drivers/staging/xgifb/XGI.h
Removing drivers/staging/xgifb/osdef.h
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/bat_sysfs.c: needs merge
drivers/staging/batman-adv/device.c: needs merge
rm 'drivers/staging/batman-adv/device.c'
$ git commit -v -a
[master 9a384d2] Merge remote branch 'staging-next/staging-next'
$ git diff -M --stat --summary HEAD^..
drivers/staging/Kconfig | 8 +-
drivers/staging/Makefile | 5 +-
drivers/staging/adis16255/adis16255.c | 4 +-
drivers/staging/batman-adv/CHANGELOG | 12 +
drivers/staging/batman-adv/Makefile | 2 +-
drivers/staging/batman-adv/README | 2 +-
drivers/staging/batman-adv/aggregation.c | 4 +-
drivers/staging/batman-adv/bat_debugfs.c | 150 +
drivers/staging/batman-adv/bat_debugfs.h | 33 +
drivers/staging/batman-adv/bat_sysfs.c | 205 +-
drivers/staging/batman-adv/bat_sysfs.h | 13 +
drivers/staging/batman-adv/bitarray.c | 10 +-
drivers/staging/batman-adv/bitarray.h | 9 +-
drivers/staging/batman-adv/device.c | 354 --
drivers/staging/batman-adv/hard-interface.c | 18 +-
drivers/staging/batman-adv/hash.c | 2 +-
drivers/staging/batman-adv/hash.h | 6 -
drivers/staging/batman-adv/icmp_socket.c | 337 ++
.../staging/batman-adv/{device.h => icmp_socket.h} | 19 +-
drivers/staging/batman-adv/main.c | 27 +-
drivers/staging/batman-adv/main.h | 15 +-
drivers/staging/batman-adv/originator.c | 104 +-
drivers/staging/batman-adv/originator.h | 5 +-
drivers/staging/batman-adv/packet.h | 27 +-
drivers/staging/batman-adv/routing.c | 326 ++-
drivers/staging/batman-adv/routing.h | 8 +-
drivers/staging/batman-adv/send.c | 32 +-
drivers/staging/batman-adv/send.h | 2 -
drivers/staging/batman-adv/soft-interface.c | 159 +-
drivers/staging/batman-adv/soft-interface.h | 6 -
.../staging/batman-adv/sysfs-class-net-batman-adv | 14 +
drivers/staging/batman-adv/sysfs-class-net-mesh | 25 +
drivers/staging/batman-adv/translation-table.c | 141 +-
drivers/staging/batman-adv/translation-table.h | 9 +-
drivers/staging/batman-adv/types.h | 25 +-
drivers/staging/batman-adv/vis.c | 124 +-
drivers/staging/batman-adv/vis.h | 6 +-
drivers/staging/comedi/TODO | 1 -
drivers/staging/comedi/comedi_fops.c | 11 +-
drivers/staging/comedi/comedidev.h | 58 +-
drivers/staging/comedi/drivers/8255.c | 17 +-
drivers/staging/comedi/drivers/acl7225b.c | 17 +-
.../staging/comedi/drivers/addi-data/addi_common.c | 38 +-
.../staging/comedi/drivers/addi-data/addi_eeprom.c | 10 +-
drivers/staging/comedi/drivers/addi_apci_035.c | 4 +
drivers/staging/comedi/drivers/addi_apci_1032.c | 4 +
drivers/staging/comedi/drivers/addi_apci_1500.c | 4 +
drivers/staging/comedi/drivers/addi_apci_1516.c | 4 +
drivers/staging/comedi/drivers/addi_apci_1564.c | 4 +
drivers/staging/comedi/drivers/addi_apci_16xx.c | 4 +
drivers/staging/comedi/drivers/addi_apci_2016.c | 4 +
drivers/staging/comedi/drivers/addi_apci_2032.c | 4 +
drivers/staging/comedi/drivers/addi_apci_2200.c | 4 +
drivers/staging/comedi/drivers/addi_apci_3001.c | 4 +
drivers/staging/comedi/drivers/addi_apci_3120.c | 4 +
drivers/staging/comedi/drivers/addi_apci_3501.c | 4 +
drivers/staging/comedi/drivers/addi_apci_3xxx.c | 4 +
drivers/staging/comedi/drivers/adl_pci6208.c | 42 +-
drivers/staging/comedi/drivers/adl_pci7230.c | 44 +-
drivers/staging/comedi/drivers/adl_pci7296.c | 44 +-
drivers/staging/comedi/drivers/adl_pci7432.c | 44 +-
drivers/staging/comedi/drivers/adl_pci8164.c | 44 +-
drivers/staging/comedi/drivers/adl_pci9111.c | 147 +-
drivers/staging/comedi/drivers/adl_pci9118.c | 42 +-
drivers/staging/comedi/drivers/adq12b.c | 17 +-
drivers/staging/comedi/drivers/adv_pci1710.c | 42 +-
drivers/staging/comedi/drivers/adv_pci1723.c | 42 +-
drivers/staging/comedi/drivers/adv_pci_dio.c | 42 +-
drivers/staging/comedi/drivers/aio_aio12_8.c | 17 +-
drivers/staging/comedi/drivers/aio_iiro_16.c | 17 +-
drivers/staging/comedi/drivers/am9513.h | 22 +-
drivers/staging/comedi/drivers/amplc_dio200.c | 57 +-
drivers/staging/comedi/drivers/amplc_pc236.c | 57 +-
drivers/staging/comedi/drivers/amplc_pc263.c | 57 +-
drivers/staging/comedi/drivers/amplc_pci224.c | 44 +-
drivers/staging/comedi/drivers/amplc_pci230.c | 44 +-
drivers/staging/comedi/drivers/c6xdigio.c | 17 +-
drivers/staging/comedi/drivers/cb_das16_cs.c | 16 +-
drivers/staging/comedi/drivers/cb_pcidas.c | 42 +-
drivers/staging/comedi/drivers/cb_pcidas64.c | 42 +-
drivers/staging/comedi/drivers/cb_pcidda.c | 42 +-
drivers/staging/comedi/drivers/cb_pcidio.c | 42 +-
drivers/staging/comedi/drivers/cb_pcimdas.c | 44 +-
drivers/staging/comedi/drivers/cb_pcimdda.c | 40 +-
drivers/staging/comedi/drivers/comedi_bond.c | 37 -
drivers/staging/comedi/drivers/comedi_parport.c | 17 +-
drivers/staging/comedi/drivers/comedi_test.c | 17 +-
drivers/staging/comedi/drivers/contec_pci_dio.c | 42 +-
drivers/staging/comedi/drivers/daqboard2000.c | 44 +-
drivers/staging/comedi/drivers/das08.c | 65 +-
drivers/staging/comedi/drivers/das08_cs.c | 3 +-
drivers/staging/comedi/drivers/das16.c | 17 +-
drivers/staging/comedi/drivers/das16m1.c | 17 +-
drivers/staging/comedi/drivers/das1800.c | 17 +-
drivers/staging/comedi/drivers/das6402.c | 17 +-
drivers/staging/comedi/drivers/das800.c | 17 +-
drivers/staging/comedi/drivers/dmm32at.c | 54 +-
drivers/staging/comedi/drivers/dt2801.c | 17 +-
drivers/staging/comedi/drivers/dt2811.c | 17 +-
drivers/staging/comedi/drivers/dt2814.c | 17 +-
drivers/staging/comedi/drivers/dt2815.c | 17 +-
drivers/staging/comedi/drivers/dt2817.c | 17 +-
drivers/staging/comedi/drivers/dt282x.c | 17 +-
drivers/staging/comedi/drivers/dt3000.c | 42 +-
drivers/staging/comedi/drivers/dt9812.c | 6 +-
drivers/staging/comedi/drivers/fl512.c | 17 +-
drivers/staging/comedi/drivers/gsc_hpdi.c | 72 +-
drivers/staging/comedi/drivers/icp_multi.c | 17 +-
drivers/staging/comedi/drivers/ii_pci20kc.c | 17 +-
drivers/staging/comedi/drivers/jr3_pci.c | 69 +-
drivers/staging/comedi/drivers/ke_counter.c | 42 +-
drivers/staging/comedi/drivers/me4000.c | 458 ++-
drivers/staging/comedi/drivers/me_daq.c | 42 +-
drivers/staging/comedi/drivers/mite.c | 4 +
drivers/staging/comedi/drivers/mpc624.c | 17 +-
drivers/staging/comedi/drivers/mpc8260cpm.c | 13 +-
drivers/staging/comedi/drivers/multiq3.c | 17 +-
drivers/staging/comedi/drivers/ni_6527.c | 38 +-
drivers/staging/comedi/drivers/ni_65xx.c | 38 +-
drivers/staging/comedi/drivers/ni_660x.c | 38 +-
drivers/staging/comedi/drivers/ni_670x.c | 38 +-
drivers/staging/comedi/drivers/ni_at_a2150.c | 17 +-
drivers/staging/comedi/drivers/ni_at_ao.c | 17 +-
drivers/staging/comedi/drivers/ni_atmio.c | 13 +-
drivers/staging/comedi/drivers/ni_atmio16d.c | 17 +-
drivers/staging/comedi/drivers/ni_daq_700.c | 3 +-
drivers/staging/comedi/drivers/ni_daq_dio24.c | 3 +-
drivers/staging/comedi/drivers/ni_labpc.c | 83 +-
drivers/staging/comedi/drivers/ni_pcidio.c | 38 +-
drivers/staging/comedi/drivers/ni_pcimio.c | 38 +-
drivers/staging/comedi/drivers/ni_tio.c | 54 +-
drivers/staging/comedi/drivers/pcl711.c | 31 +-
drivers/staging/comedi/drivers/pcl724.c | 17 +-
drivers/staging/comedi/drivers/pcl725.c | 17 +-
drivers/staging/comedi/drivers/pcl726.c | 17 +-
drivers/staging/comedi/drivers/pcl730.c | 17 +-
drivers/staging/comedi/drivers/pcl812.c | 493 ++-
drivers/staging/comedi/drivers/pcl816.c | 240 +-
drivers/staging/comedi/drivers/pcl818.c | 17 +-
drivers/staging/comedi/drivers/pcm3724.c | 17 +-
drivers/staging/comedi/drivers/pcm3730.c | 17 +-
drivers/staging/comedi/drivers/pcm_common.c | 4 +
drivers/staging/comedi/drivers/pcmad.c | 17 +-
drivers/staging/comedi/drivers/pcmda12.c | 29 +-
drivers/staging/comedi/drivers/pcmmio.c | 34 +-
drivers/staging/comedi/drivers/pcmuio.c | 17 +-
drivers/staging/comedi/drivers/poc.c | 17 +-
drivers/staging/comedi/drivers/quatech_daqp_cs.c | 56 +-
drivers/staging/comedi/drivers/rtd520.c | 42 +-
drivers/staging/comedi/drivers/rti800.c | 17 +-
drivers/staging/comedi/drivers/rti802.c | 17 +-
drivers/staging/comedi/drivers/s526.c | 17 +-
drivers/staging/comedi/drivers/s626.c | 163 +-
drivers/staging/comedi/drivers/s626.h | 9 -
drivers/staging/comedi/drivers/serial2002.c | 115 +-
drivers/staging/comedi/drivers/skel.c | 109 +-
drivers/staging/comedi/drivers/ssv_dnp.c | 17 +-
drivers/staging/comedi/drivers/unioxx5.c | 26 +-
drivers/staging/comedi/drivers/usbdux.c | 2 +-
drivers/staging/crystalhd/crystalhd_lnx.c | 9 +-
drivers/staging/cx25821/cx25821-audups11.c | 25 +-
drivers/staging/cxt1e1/functions.c | 12 -
drivers/staging/cxt1e1/hwprobe.c | 6 -
drivers/staging/cxt1e1/linux.c | 163 -
drivers/staging/cxt1e1/musycc.c | 204 -
drivers/staging/cxt1e1/pmc93x6_eeprom.c | 4 -
drivers/staging/cxt1e1/pmcc4.h | 4 -
drivers/staging/cxt1e1/pmcc4_drv.c | 158 -
drivers/staging/cxt1e1/sbecom_inline_linux.h | 11 -
drivers/staging/dream/camera/msm_vfe8x.c | 45 +-
drivers/staging/dream/pmem.c | 14 +-
drivers/staging/dt3155/dt3155_drv.c | 105 +-
drivers/staging/dt3155/dt3155_drv.h | 6 -
drivers/staging/dt3155/dt3155_io.c | 24 +-
drivers/staging/dt3155/dt3155_io.h | 9 +-
drivers/staging/dt3155/dt3155_isr.c | 47 +-
drivers/staging/dt3155v4l/dt3155v4l.c | 31 +-
drivers/staging/easycap/Kconfig | 16 +
drivers/staging/easycap/Makefile | 13 +
drivers/staging/easycap/README | 130 +
drivers/staging/easycap/easycap.h | 632 +++
drivers/staging/easycap/easycap_debug.h | 27 +
drivers/staging/easycap/easycap_ioctl.c | 2651 +++++++++++
drivers/staging/easycap/easycap_ioctl.h | 29 +
drivers/staging/easycap/easycap_low.c | 1057 +++++
drivers/staging/easycap/easycap_main.c | 4342 ++++++++++++++++++
drivers/staging/easycap/easycap_settings.c | 489 ++
drivers/staging/easycap/easycap_sound.c | 973 ++++
drivers/staging/easycap/easycap_sound.h | 30 +
drivers/staging/easycap/easycap_standard.h | 27 +
drivers/staging/easycap/easycap_testcard.c | 392 ++
drivers/staging/et131x/et1310_phy.c | 8 +-
drivers/staging/hv/vmbus_drv.c | 2 +-
drivers/staging/iio/Makefile | 3 +-
drivers/staging/iio/TODO | 2 +-
drivers/staging/iio/accel/Kconfig | 50 +-
drivers/staging/iio/accel/Makefile | 3 +-
drivers/staging/iio/accel/adis16209_core.c | 8 +-
drivers/staging/iio/accel/adis16209_ring.c | 1 +
drivers/staging/iio/accel/adis16220_core.c | 20 +-
drivers/staging/iio/accel/adis16240_core.c | 10 +-
drivers/staging/iio/accel/adis16240_ring.c | 1 +
drivers/staging/iio/accel/lis3l02dq.h | 19 +-
drivers/staging/iio/accel/sca3000.h | 14 +-
drivers/staging/iio/accel/sca3000_core.c | 14 +-
drivers/staging/iio/adc/Makefile | 2 +-
drivers/staging/iio/adc/max1363.h | 14 +-
drivers/staging/iio/adc/max1363_core.c | 4 +-
drivers/staging/iio/adc/max1363_ring.c | 4 +-
drivers/staging/iio/gyro/Makefile | 2 +-
drivers/staging/iio/gyro/adis16260_core.c | 2 +-
drivers/staging/iio/gyro/adis16260_ring.c | 1 +
drivers/staging/iio/imu/Kconfig | 8 +-
drivers/staging/iio/imu/Makefile | 3 +-
drivers/staging/iio/imu/adis16300.h | 6 -
drivers/staging/iio/imu/adis16300_core.c | 153 +-
drivers/staging/iio/imu/adis16300_ring.c | 55 +-
drivers/staging/iio/imu/adis16350_core.c | 10 +-
drivers/staging/iio/imu/adis16350_ring.c | 1 +
drivers/staging/iio/imu/adis16400.h | 6 -
drivers/staging/iio/imu/adis16400_core.c | 86 +-
drivers/staging/iio/imu/adis16400_ring.c | 49 +
drivers/staging/iio/light/Kconfig | 1 -
drivers/staging/iio/trigger/Makefile | 3 +-
drivers/staging/memrar/memrar_handler.c | 9 +-
drivers/staging/msm/mddihost.h | 2 -
drivers/staging/msm/msm_fb_def.h | 4 -
drivers/staging/msm/staging-devices.c | 1 -
drivers/staging/octeon/cvmx-cmd-queue.c | 6 +-
drivers/staging/otus/TODO | 16 +-
drivers/staging/otus/apdbg.c | 2 +-
drivers/staging/otus/ioctl.c | 2 +-
drivers/staging/otus/zdusb.c | 251 +-
drivers/staging/panel/panel.c | 1045 +++--
drivers/staging/pohmelfs/inode.c | 4 +-
drivers/staging/ramzswap/Kconfig | 21 -
drivers/staging/ramzswap/Makefile | 3 -
drivers/staging/ramzswap/ramzswap.txt | 51 -
drivers/staging/ramzswap/ramzswap_drv.c | 837 ----
drivers/staging/rt2860/common/cmm_wpa.c | 4 +-
drivers/staging/rt2860/mlme.h | 21 +-
drivers/staging/rt2860/rtmp.h | 4 +-
drivers/staging/rt3070/md4.h | 42 -
drivers/staging/rtl8187se/Kconfig | 1 +
drivers/staging/rtl8192e/Kconfig | 1 +
drivers/staging/rtl8192e/ieee80211/dot11d.c | 18 -
drivers/staging/rtl8192e/ieee80211/ieee80211.h | 97 +-
.../staging/rtl8192e/ieee80211/ieee80211_crypt.c | 20 -
.../staging/rtl8192e/ieee80211/ieee80211_crypt.h | 8 -
.../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 48 -
.../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 198 +-
.../rtl8192e/ieee80211/ieee80211_crypt_wep.c | 96 +-
.../staging/rtl8192e/ieee80211/ieee80211_module.c | 68 -
drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 16 -
.../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 185 +-
.../rtl8192e/ieee80211/ieee80211_softmac_wx.c | 73 +-
drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 9 -
drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 130 -
.../staging/rtl8192e/ieee80211/rtl819x_HTProc.c | 17 -
drivers/staging/rtl8192e/r8190_rtl8256.c | 6 +-
drivers/staging/rtl8192e/r8192E_core.c | 1 -
drivers/staging/rtl8192su/Kconfig | 1 +
drivers/staging/rtl8192su/r8192SU_led.c | 9 -
drivers/staging/rtl8192su/r8192S_Efuse.c | 19 +-
drivers/staging/rtl8192su/r8192U_core.c | 76 +-
drivers/staging/rtl8192u/Kconfig | 1 +
drivers/staging/rtl8192u/r8192U_core.c | 73 +-
drivers/staging/solo6x10/Kconfig | 7 +
drivers/staging/solo6x10/Makefile | 6 +
drivers/staging/solo6x10/TODO | 28 +
drivers/staging/solo6x10/solo6010-core.c | 282 ++
drivers/staging/solo6x10/solo6010-disp.c | 271 ++
drivers/staging/solo6x10/solo6010-enc.c | 229 +
drivers/staging/solo6x10/solo6010-g723.c | 398 ++
drivers/staging/solo6x10/solo6010-gpio.c | 103 +
drivers/staging/solo6x10/solo6010-i2c.c | 331 ++
drivers/staging/solo6x10/solo6010-jpeg.h | 105 +
drivers/staging/solo6x10/solo6010-offsets.h | 78 +
drivers/staging/solo6x10/solo6010-osd-font.h | 154 +
drivers/staging/solo6x10/solo6010-p2m.c | 208 +
drivers/staging/solo6x10/solo6010-registers.h | 657 +++
drivers/staging/solo6x10/solo6010-tw28.c | 823 ++++
drivers/staging/solo6x10/solo6010-tw28.h | 65 +
drivers/staging/solo6x10/solo6010-v4l2-enc.c | 1564 +++++++
drivers/staging/solo6x10/solo6010-v4l2.c | 859 ++++
drivers/staging/solo6x10/solo6010.h | 316 ++
drivers/staging/spectra/Kconfig | 40 +
drivers/staging/spectra/Makefile | 11 +
drivers/staging/spectra/README | 29 +
drivers/staging/spectra/ffsdefs.h | 58 +
drivers/staging/spectra/ffsport.c | 827 ++++
drivers/staging/spectra/ffsport.h | 84 +
drivers/staging/spectra/flash.c | 4731 ++++++++++++++++++++
drivers/staging/spectra/flash.h | 198 +
drivers/staging/spectra/lld.c | 339 ++
drivers/staging/spectra/lld.h | 111 +
drivers/staging/spectra/lld_cdma.c | 910 ++++
drivers/staging/spectra/lld_cdma.h | 123 +
drivers/staging/spectra/lld_emu.c | 780 ++++
drivers/staging/spectra/lld_emu.h | 51 +
drivers/staging/spectra/lld_mtd.c | 687 +++
drivers/staging/spectra/lld_mtd.h | 51 +
drivers/staging/spectra/lld_nand.c | 2601 +++++++++++
drivers/staging/spectra/lld_nand.h | 131 +
drivers/staging/spectra/nand_regs.h | 619 +++
drivers/staging/spectra/spectraswconfig.h | 82 +
drivers/staging/ti-st/Kconfig | 2 +-
drivers/staging/ti-st/TODO | 11 +-
drivers/staging/ti-st/st_core.c | 13 +-
drivers/staging/ti-st/st_kim.c | 89 +-
drivers/staging/ti-st/st_kim.h | 15 +-
.../staging/tidspbridge/Documentation/CONTRIBUTORS | 82 +
drivers/staging/tidspbridge/Documentation/README | 70 +
.../staging/tidspbridge/Documentation/error-codes | 157 +
drivers/staging/tidspbridge/TODO | 18 +
drivers/staging/tidspbridge/core/_cmm.h | 45 +
drivers/staging/tidspbridge/core/_deh.h | 35 +
drivers/staging/tidspbridge/core/_msg_sm.h | 142 +
drivers/staging/tidspbridge/core/_tiomap.h | 377 ++
drivers/staging/tidspbridge/core/_tiomap_pwr.h | 85 +
drivers/staging/tidspbridge/core/chnl_sm.c | 1015 +++++
drivers/staging/tidspbridge/core/dsp-clock.c | 421 ++
drivers/staging/tidspbridge/core/io_sm.c | 2410 ++++++++++
drivers/staging/tidspbridge/core/mmu_fault.c | 139 +
drivers/staging/tidspbridge/core/mmu_fault.h | 36 +
drivers/staging/tidspbridge/core/msg_sm.c | 673 +++
drivers/staging/tidspbridge/core/tiomap3430.c | 1887 ++++++++
drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 604 +++
drivers/staging/tidspbridge/core/tiomap_io.c | 458 ++
drivers/staging/tidspbridge/core/tiomap_io.h | 104 +
drivers/staging/tidspbridge/core/ue_deh.c | 303 ++
drivers/staging/tidspbridge/core/wdt.c | 150 +
drivers/staging/tidspbridge/dynload/cload.c | 1960 ++++++++
.../staging/tidspbridge/dynload/dload_internal.h | 351 ++
drivers/staging/tidspbridge/dynload/doff.h | 344 ++
drivers/staging/tidspbridge/dynload/getsection.c | 416 ++
drivers/staging/tidspbridge/dynload/header.h | 55 +
drivers/staging/tidspbridge/dynload/module_list.h | 159 +
drivers/staging/tidspbridge/dynload/params.h | 226 +
drivers/staging/tidspbridge/dynload/reloc.c | 484 ++
drivers/staging/tidspbridge/dynload/reloc_table.h | 102 +
.../tidspbridge/dynload/reloc_table_c6000.c | 257 ++
drivers/staging/tidspbridge/dynload/tramp.c | 1143 +++++
.../tidspbridge/dynload/tramp_table_c6000.c | 164 +
drivers/staging/tidspbridge/gen/gb.c | 167 +
drivers/staging/tidspbridge/gen/gh.c | 213 +
drivers/staging/tidspbridge/gen/gs.c | 89 +
drivers/staging/tidspbridge/gen/uuidutil.c | 223 +
drivers/staging/tidspbridge/hw/EasiGlobal.h | 41 +
drivers/staging/tidspbridge/hw/GlobalTypes.h | 308 ++
drivers/staging/tidspbridge/hw/MMUAccInt.h | 76 +
drivers/staging/tidspbridge/hw/MMURegAcM.h | 226 +
drivers/staging/tidspbridge/hw/hw_defs.h | 60 +
drivers/staging/tidspbridge/hw/hw_mmu.c | 587 +++
drivers/staging/tidspbridge/hw/hw_mmu.h | 161 +
.../tidspbridge/include/dspbridge/_chnl_sm.h | 181 +
.../tidspbridge/include/dspbridge/brddefs.h | 39 +
.../staging/tidspbridge/include/dspbridge/cfg.h | 222 +
.../tidspbridge/include/dspbridge/cfgdefs.h | 81 +
.../staging/tidspbridge/include/dspbridge/chnl.h | 130 +
.../tidspbridge/include/dspbridge/chnldefs.h | 67 +
.../tidspbridge/include/dspbridge/chnlpriv.h | 101 +
.../staging/tidspbridge/include/dspbridge/clk.h | 101 +
.../staging/tidspbridge/include/dspbridge/cmm.h | 386 ++
.../tidspbridge/include/dspbridge/cmmdefs.h | 105 +
.../staging/tidspbridge/include/dspbridge/cod.h | 369 ++
.../staging/tidspbridge/include/dspbridge/dbc.h | 46 +
.../staging/tidspbridge/include/dspbridge/dbdcd.h | 358 ++
.../tidspbridge/include/dspbridge/dbdcddef.h | 78 +
.../staging/tidspbridge/include/dspbridge/dbdefs.h | 546 +++
.../tidspbridge/include/dspbridge/dbldefs.h | 140 +
.../staging/tidspbridge/include/dspbridge/dbll.h | 59 +
.../tidspbridge/include/dspbridge/dblldefs.h | 496 ++
.../staging/tidspbridge/include/dspbridge/dbtype.h | 88 +
.../tidspbridge/include/dspbridge/dehdefs.h | 32 +
.../staging/tidspbridge/include/dspbridge/dev.h | 702 +++
.../tidspbridge/include/dspbridge/devdefs.h | 26 +
.../staging/tidspbridge/include/dspbridge/disp.h | 204 +
.../tidspbridge/include/dspbridge/dispdefs.h | 35 +
.../staging/tidspbridge/include/dspbridge/dmm.h | 75 +
.../staging/tidspbridge/include/dspbridge/drv.h | 522 +++
.../tidspbridge/include/dspbridge/drvdefs.h | 25 +
.../tidspbridge/include/dspbridge/dspapi-ioctl.h | 475 ++
.../staging/tidspbridge/include/dspbridge/dspapi.h | 167 +
.../tidspbridge/include/dspbridge/dspchnl.h | 72 +
.../tidspbridge/include/dspbridge/dspdefs.h | 1128 +++++
.../staging/tidspbridge/include/dspbridge/dspdeh.h | 47 +
.../staging/tidspbridge/include/dspbridge/dspdrv.h | 62 +
.../staging/tidspbridge/include/dspbridge/dspio.h | 41 +
.../tidspbridge/include/dspbridge/dspioctl.h | 73 +
.../staging/tidspbridge/include/dspbridge/dspmsg.h | 56 +
.../tidspbridge/include/dspbridge/dynamic_loader.h | 492 ++
drivers/staging/tidspbridge/include/dspbridge/gb.h | 79 +
.../tidspbridge/include/dspbridge/getsection.h | 108 +
drivers/staging/tidspbridge/include/dspbridge/gh.h | 32 +
drivers/staging/tidspbridge/include/dspbridge/gs.h | 59 +
.../tidspbridge/include/dspbridge/host_os.h | 89 +
drivers/staging/tidspbridge/include/dspbridge/io.h | 114 +
.../staging/tidspbridge/include/dspbridge/io_sm.h | 309 ++
.../staging/tidspbridge/include/dspbridge/iodefs.h | 36 +
.../staging/tidspbridge/include/dspbridge/ldr.h | 29 +
.../staging/tidspbridge/include/dspbridge/list.h | 225 +
.../staging/tidspbridge/include/dspbridge/mbx_sh.h | 198 +
.../tidspbridge/include/dspbridge/memdefs.h | 30 +
.../staging/tidspbridge/include/dspbridge/mgr.h | 205 +
.../tidspbridge/include/dspbridge/mgrpriv.h | 45 +
.../staging/tidspbridge/include/dspbridge/msg.h | 86 +
.../tidspbridge/include/dspbridge/msgdefs.h | 29 +
.../staging/tidspbridge/include/dspbridge/nldr.h | 55 +
.../tidspbridge/include/dspbridge/nldrdefs.h | 293 ++
.../staging/tidspbridge/include/dspbridge/node.h | 579 +++
.../tidspbridge/include/dspbridge/nodedefs.h | 28 +
.../tidspbridge/include/dspbridge/nodepriv.h | 182 +
.../staging/tidspbridge/include/dspbridge/ntfy.h | 217 +
.../staging/tidspbridge/include/dspbridge/proc.h | 621 +++
.../tidspbridge/include/dspbridge/procpriv.h | 25 +
.../staging/tidspbridge/include/dspbridge/pwr.h | 107 +
.../staging/tidspbridge/include/dspbridge/pwr_sh.h | 33 +
.../include/dspbridge/resourcecleanup.h | 63 +
.../staging/tidspbridge/include/dspbridge/rmm.h | 181 +
.../staging/tidspbridge/include/dspbridge/rms_sh.h | 95 +
.../tidspbridge/include/dspbridge/rmstypes.h | 28 +
.../tidspbridge/include/dspbridge/services.h | 50 +
.../staging/tidspbridge/include/dspbridge/std.h | 94 +
.../staging/tidspbridge/include/dspbridge/strm.h | 404 ++
.../tidspbridge/include/dspbridge/strmdefs.h | 46 +
.../staging/tidspbridge/include/dspbridge/sync.h | 109 +
.../tidspbridge/include/dspbridge/utildefs.h | 39 +
.../tidspbridge/include/dspbridge/uuidutil.h | 62 +
.../staging/tidspbridge/include/dspbridge/wdt.h | 79 +
drivers/staging/tidspbridge/pmgr/chnl.c | 163 +
drivers/staging/tidspbridge/pmgr/chnlobj.h | 46 +
drivers/staging/tidspbridge/pmgr/cmm.c | 1172 +++++
drivers/staging/tidspbridge/pmgr/cod.c | 658 +++
drivers/staging/tidspbridge/pmgr/dbll.c | 1585 +++++++
drivers/staging/tidspbridge/pmgr/dev.c | 1171 +++++
drivers/staging/tidspbridge/pmgr/dmm.c | 533 +++
drivers/staging/tidspbridge/pmgr/dspapi.c | 1685 +++++++
drivers/staging/tidspbridge/pmgr/io.c | 142 +
drivers/staging/tidspbridge/pmgr/ioobj.h | 38 +
drivers/staging/tidspbridge/pmgr/msg.c | 129 +
drivers/staging/tidspbridge/pmgr/msgobj.h | 38 +
drivers/staging/tidspbridge/rmgr/dbdcd.c | 1506 +++++++
drivers/staging/tidspbridge/rmgr/disp.c | 754 ++++
drivers/staging/tidspbridge/rmgr/drv.c | 1047 +++++
drivers/staging/tidspbridge/rmgr/drv_interface.c | 644 +++
drivers/staging/tidspbridge/rmgr/drv_interface.h | 27 +
drivers/staging/tidspbridge/rmgr/dspdrv.c | 142 +
drivers/staging/tidspbridge/rmgr/mgr.c | 374 ++
drivers/staging/tidspbridge/rmgr/nldr.c | 1999 +++++++++
drivers/staging/tidspbridge/rmgr/node.c | 3231 +++++++++++++
drivers/staging/tidspbridge/rmgr/proc.c | 1948 ++++++++
drivers/staging/tidspbridge/rmgr/pwr.c | 182 +
drivers/staging/tidspbridge/rmgr/rmm.c | 535 +++
drivers/staging/tidspbridge/rmgr/strm.c | 861 ++++
drivers/staging/tidspbridge/services/cfg.c | 253 ++
drivers/staging/tidspbridge/services/ntfy.c | 31 +
drivers/staging/tidspbridge/services/services.c | 69 +
drivers/staging/tidspbridge/services/sync.c | 104 +
drivers/staging/vme/bridges/vme_ca91cx42.c | 4 +-
drivers/staging/vme/devices/vme_user.c | 92 +-
drivers/staging/vt6655/80211hdr.h | 4 +-
drivers/staging/vt6655/80211mgr.c | 110 +-
drivers/staging/vt6655/80211mgr.h | 112 +-
drivers/staging/vt6655/IEEE11h.c | 14 +-
drivers/staging/vt6655/Makefile | 1 +
drivers/staging/vt6655/TODO | 1 -
drivers/staging/vt6655/aes_ccmp.c | 22 +-
drivers/staging/vt6655/aes_ccmp.h | 2 +-
drivers/staging/vt6655/baseband.c | 72 +-
drivers/staging/vt6655/baseband.h | 36 +-
drivers/staging/vt6655/bssdb.c | 131 +-
drivers/staging/vt6655/bssdb.h | 74 +-
drivers/staging/vt6655/card.c | 955 +----
drivers/staging/vt6655/card.h | 87 +-
drivers/staging/vt6655/channel.c | 835 ++++
drivers/staging/vt6655/channel.h | 58 +
drivers/staging/vt6655/country.h | 15 -
drivers/staging/vt6655/datarate.c | 22 +-
drivers/staging/vt6655/datarate.h | 12 +-
drivers/staging/vt6655/desc.h | 30 +-
drivers/staging/vt6655/device.h | 148 +-
drivers/staging/vt6655/device_main.c | 190 +-
drivers/staging/vt6655/dpc.c | 242 +-
drivers/staging/vt6655/hostap.c | 16 +-
drivers/staging/vt6655/iocmd.h | 324 +-
drivers/staging/vt6655/ioctl.c | 16 +-
drivers/staging/vt6655/ioctl.h | 4 +-
drivers/staging/vt6655/iwctl.c | 18 +-
drivers/staging/vt6655/key.c | 72 +-
drivers/staging/vt6655/key.h | 40 +-
drivers/staging/vt6655/mac.c | 143 +-
drivers/staging/vt6655/mac.h | 161 +-
drivers/staging/vt6655/mib.c | 90 +-
drivers/staging/vt6655/mib.h | 183 +-
drivers/staging/vt6655/michael.c | 10 +-
drivers/staging/vt6655/michael.h | 4 +-
drivers/staging/vt6655/power.c | 8 +-
drivers/staging/vt6655/rc4.c | 28 +-
drivers/staging/vt6655/rc4.h | 10 +-
drivers/staging/vt6655/rf.c | 26 +-
drivers/staging/vt6655/rf.h | 12 +-
drivers/staging/vt6655/rxtx.c | 564 ++--
drivers/staging/vt6655/rxtx.h | 28 +-
drivers/staging/vt6655/srom.c | 28 +-
drivers/staging/vt6655/srom.h | 24 +-
drivers/staging/vt6655/tcrc.c | 6 +-
drivers/staging/vt6655/tcrc.h | 6 +-
drivers/staging/vt6655/tether.c | 6 +-
drivers/staging/vt6655/tether.h | 34 +-
drivers/staging/vt6655/tkip.c | 6 +-
drivers/staging/vt6655/tkip.h | 6 +-
drivers/staging/vt6655/ttype.h | 37 -
drivers/staging/vt6655/upc.h | 14 +-
drivers/staging/vt6655/vntwifi.c | 42 +-
drivers/staging/vt6655/vntwifi.h | 22 +-
drivers/staging/vt6655/wcmd.c | 43 +-
drivers/staging/vt6655/wcmd.h | 4 +-
drivers/staging/vt6655/wctl.c | 24 +-
drivers/staging/vt6655/wctl.h | 7 +-
drivers/staging/vt6655/wmgr.c | 259 +-
drivers/staging/vt6655/wmgr.h | 70 +-
drivers/staging/vt6655/wpa.c | 6 +-
drivers/staging/vt6655/wpa2.c | 24 +-
drivers/staging/vt6655/wpa2.h | 4 +-
drivers/staging/vt6655/wpactl.c | 18 +-
drivers/staging/vt6655/wpactl.h | 2 +-
drivers/staging/vt6655/wroute.c | 14 +-
drivers/staging/vt6655/wroute.h | 2 +-
drivers/staging/vt6656/80211mgr.c | 516 ++--
drivers/staging/vt6656/80211mgr.h | 33 +-
drivers/staging/vt6656/aes_ccmp.c | 4 +-
drivers/staging/vt6656/baseband.h | 19 +-
drivers/staging/vt6656/bssdb.c | 94 +-
drivers/staging/vt6656/bssdb.h | 8 +-
drivers/staging/vt6656/card.c | 7 +-
drivers/staging/vt6656/channel.c | 45 +-
drivers/staging/vt6656/channel.h | 12 +-
drivers/staging/vt6656/control.h | 14 +-
drivers/staging/vt6656/datarate.c | 10 +-
drivers/staging/vt6656/desc.h | 79 +-
drivers/staging/vt6656/device.h | 42 +-
drivers/staging/vt6656/device_cfg.h | 16 +-
drivers/staging/vt6656/dpc.c | 13 +-
drivers/staging/vt6656/int.h | 2 +-
drivers/staging/vt6656/iocmd.h | 14 +-
drivers/staging/vt6656/ioctl.c | 6 +-
drivers/staging/vt6656/iowpa.h | 47 +-
drivers/staging/vt6656/iwctl.c | 34 +-
drivers/staging/vt6656/iwctl.h | 4 +-
drivers/staging/vt6656/key.c | 24 +-
drivers/staging/vt6656/mac.c | 4 +-
drivers/staging/vt6656/mac.h | 8 +-
drivers/staging/vt6656/main_usb.c | 130 +-
drivers/staging/vt6656/mib.h | 14 +-
drivers/staging/vt6656/michael.c | 4 +-
drivers/staging/vt6656/michael.h | 6 +-
drivers/staging/vt6656/power.c | 2 +-
drivers/staging/vt6656/power.h | 2 +-
drivers/staging/vt6656/rf.h | 19 +-
drivers/staging/vt6656/rndis.h | 2 +-
drivers/staging/vt6656/rxtx.c | 40 +-
drivers/staging/vt6656/tether.h | 14 +-
drivers/staging/vt6656/tkip.c | 6 +-
drivers/staging/vt6656/ttype.h | 2 +-
drivers/staging/vt6656/usbpipe.c | 19 -
drivers/staging/vt6656/wcmd.c | 24 -
drivers/staging/vt6656/wctl.c | 21 +-
drivers/staging/vt6656/wmgr.c | 58 +-
drivers/staging/vt6656/wmgr.h | 6 +-
drivers/staging/vt6656/wpa.c | 6 +-
drivers/staging/vt6656/wpa2.h | 18 +-
drivers/staging/vt6656/wpactl.c | 10 +-
drivers/staging/winbond/mac_structures.h | 144 +-
drivers/staging/winbond/phy_calibration.c | 834 ++--
drivers/staging/wlags49_h2/wl_cs.c | 499 +--
drivers/staging/wlan-ng/Makefile | 1 -
drivers/staging/wlan-ng/cfg80211.c | 735 +++
drivers/staging/wlan-ng/hfa384x.h | 2 +
drivers/staging/wlan-ng/hfa384x_usb.c | 12 +-
drivers/staging/wlan-ng/p80211metastruct.h | 2 +
drivers/staging/wlan-ng/p80211netdev.c | 49 +-
drivers/staging/wlan-ng/p80211netdev.h | 3 +-
drivers/staging/wlan-ng/p80211wext.c | 1690 -------
drivers/staging/wlan-ng/prism2mgmt.c | 2 +
drivers/staging/wlan-ng/prism2sta.c | 64 +-
drivers/staging/wlan-ng/prism2usb.c | 2 +-
drivers/staging/xgifb/XGI.h | 10 -
drivers/staging/xgifb/XGI_accel.c | 307 --
drivers/staging/xgifb/XGI_accel.h | 14 +-
drivers/staging/xgifb/XGI_main.h | 182 +-
drivers/staging/xgifb/XGI_main_26.c | 255 +-
drivers/staging/xgifb/XGIfb.h | 31 +-
drivers/staging/xgifb/osdef.h | 153 -
drivers/staging/xgifb/vb_def.h | 4 +-
drivers/staging/xgifb/vb_ext.c | 510 +--
drivers/staging/xgifb/vb_ext.h | 26 +-
drivers/staging/xgifb/vb_init.c | 895 ++---
drivers/staging/xgifb/vb_init.h | 4 +-
drivers/staging/xgifb/vb_setmode.c | 2060 ++++-----
drivers/staging/xgifb/vb_setmode.h | 66 +-
drivers/staging/xgifb/vb_struct.h | 951 ++--
drivers/staging/xgifb/vb_table.h | 633 ++--
drivers/staging/xgifb/vb_util.c | 137 +-
drivers/staging/xgifb/vb_util.h | 20 +-
drivers/staging/xgifb/vgatypes.h | 271 +-
drivers/staging/zram/Kconfig | 28 +
drivers/staging/zram/Makefile | 3 +
drivers/staging/{ramzswap => zram}/xvmalloc.c | 0
drivers/staging/{ramzswap => zram}/xvmalloc.h | 0
drivers/staging/{ramzswap => zram}/xvmalloc_int.h | 0
drivers/staging/zram/zram.txt | 62 +
drivers/staging/zram/zram_drv.c | 804 ++++
.../{ramzswap/ramzswap_drv.h => zram/zram_drv.h} | 71 +-
.../ramzswap_ioctl.h => zram/zram_ioctl.h} | 21 +-
615 files changed, 95278 insertions(+), 16201 deletions(-)
create mode 100644 drivers/staging/batman-adv/bat_debugfs.c
create mode 100644 drivers/staging/batman-adv/bat_debugfs.h
delete mode 100644 drivers/staging/batman-adv/device.c
create mode 100644 drivers/staging/batman-adv/icmp_socket.c
rename drivers/staging/batman-adv/{device.h => icmp_socket.h} (54%)
create mode 100644 drivers/staging/batman-adv/sysfs-class-net-batman-adv
create mode 100644 drivers/staging/batman-adv/sysfs-class-net-mesh
create mode 100644 drivers/staging/easycap/Kconfig
create mode 100644 drivers/staging/easycap/Makefile
create mode 100644 drivers/staging/easycap/README
create mode 100644 drivers/staging/easycap/easycap.h
create mode 100644 drivers/staging/easycap/easycap_debug.h
create mode 100644 drivers/staging/easycap/easycap_ioctl.c
create mode 100644 drivers/staging/easycap/easycap_ioctl.h
create mode 100644 drivers/staging/easycap/easycap_low.c
create mode 100644 drivers/staging/easycap/easycap_main.c
create mode 100644 drivers/staging/easycap/easycap_settings.c
create mode 100644 drivers/staging/easycap/easycap_sound.c
create mode 100644 drivers/staging/easycap/easycap_sound.h
create mode 100644 drivers/staging/easycap/easycap_standard.h
create mode 100644 drivers/staging/easycap/easycap_testcard.c
delete mode 100644 drivers/staging/ramzswap/Kconfig
delete mode 100644 drivers/staging/ramzswap/Makefile
delete mode 100644 drivers/staging/ramzswap/ramzswap.txt
delete mode 100644 drivers/staging/ramzswap/ramzswap_drv.c
delete mode 100644 drivers/staging/rt3070/md4.h
create mode 100644 drivers/staging/solo6x10/Kconfig
create mode 100644 drivers/staging/solo6x10/Makefile
create mode 100644 drivers/staging/solo6x10/TODO
create mode 100644 drivers/staging/solo6x10/solo6010-core.c
create mode 100644 drivers/staging/solo6x10/solo6010-disp.c
create mode 100644 drivers/staging/solo6x10/solo6010-enc.c
create mode 100644 drivers/staging/solo6x10/solo6010-g723.c
create mode 100644 drivers/staging/solo6x10/solo6010-gpio.c
create mode 100644 drivers/staging/solo6x10/solo6010-i2c.c
create mode 100644 drivers/staging/solo6x10/solo6010-jpeg.h
create mode 100644 drivers/staging/solo6x10/solo6010-offsets.h
create mode 100644 drivers/staging/solo6x10/solo6010-osd-font.h
create mode 100644 drivers/staging/solo6x10/solo6010-p2m.c
create mode 100644 drivers/staging/solo6x10/solo6010-registers.h
create mode 100644 drivers/staging/solo6x10/solo6010-tw28.c
create mode 100644 drivers/staging/solo6x10/solo6010-tw28.h
create mode 100644 drivers/staging/solo6x10/solo6010-v4l2-enc.c
create mode 100644 drivers/staging/solo6x10/solo6010-v4l2.c
create mode 100644 drivers/staging/solo6x10/solo6010.h
create mode 100644 drivers/staging/spectra/Kconfig
create mode 100644 drivers/staging/spectra/Makefile
create mode 100644 drivers/staging/spectra/README
create mode 100644 drivers/staging/spectra/ffsdefs.h
create mode 100644 drivers/staging/spectra/ffsport.c
create mode 100644 drivers/staging/spectra/ffsport.h
create mode 100644 drivers/staging/spectra/flash.c
create mode 100644 drivers/staging/spectra/flash.h
create mode 100644 drivers/staging/spectra/lld.c
create mode 100644 drivers/staging/spectra/lld.h
create mode 100644 drivers/staging/spectra/lld_cdma.c
create mode 100644 drivers/staging/spectra/lld_cdma.h
create mode 100644 drivers/staging/spectra/lld_emu.c
create mode 100644 drivers/staging/spectra/lld_emu.h
create mode 100644 drivers/staging/spectra/lld_mtd.c
create mode 100644 drivers/staging/spectra/lld_mtd.h
create mode 100644 drivers/staging/spectra/lld_nand.c
create mode 100644 drivers/staging/spectra/lld_nand.h
create mode 100644 drivers/staging/spectra/nand_regs.h
create mode 100644 drivers/staging/spectra/spectraswconfig.h
create mode 100644 drivers/staging/tidspbridge/Documentation/CONTRIBUTORS
create mode 100644 drivers/staging/tidspbridge/Documentation/README
create mode 100644 drivers/staging/tidspbridge/Documentation/error-codes
create mode 100644 drivers/staging/tidspbridge/TODO
create mode 100644 drivers/staging/tidspbridge/core/_cmm.h
create mode 100644 drivers/staging/tidspbridge/core/_deh.h
create mode 100644 drivers/staging/tidspbridge/core/_msg_sm.h
create mode 100644 drivers/staging/tidspbridge/core/_tiomap.h
create mode 100644 drivers/staging/tidspbridge/core/_tiomap_pwr.h
create mode 100644 drivers/staging/tidspbridge/core/chnl_sm.c
create mode 100644 drivers/staging/tidspbridge/core/dsp-clock.c
create mode 100644 drivers/staging/tidspbridge/core/io_sm.c
create mode 100644 drivers/staging/tidspbridge/core/mmu_fault.c
create mode 100644 drivers/staging/tidspbridge/core/mmu_fault.h
create mode 100644 drivers/staging/tidspbridge/core/msg_sm.c
create mode 100644 drivers/staging/tidspbridge/core/tiomap3430.c
create mode 100644 drivers/staging/tidspbridge/core/tiomap3430_pwr.c
create mode 100644 drivers/staging/tidspbridge/core/tiomap_io.c
create mode 100644 drivers/staging/tidspbridge/core/tiomap_io.h
create mode 100644 drivers/staging/tidspbridge/core/ue_deh.c
create mode 100644 drivers/staging/tidspbridge/core/wdt.c
create mode 100644 drivers/staging/tidspbridge/dynload/cload.c
create mode 100644 drivers/staging/tidspbridge/dynload/dload_internal.h
create mode 100644 drivers/staging/tidspbridge/dynload/doff.h
create mode 100644 drivers/staging/tidspbridge/dynload/getsection.c
create mode 100644 drivers/staging/tidspbridge/dynload/header.h
create mode 100644 drivers/staging/tidspbridge/dynload/module_list.h
create mode 100644 drivers/staging/tidspbridge/dynload/params.h
create mode 100644 drivers/staging/tidspbridge/dynload/reloc.c
create mode 100644 drivers/staging/tidspbridge/dynload/reloc_table.h
create mode 100644 drivers/staging/tidspbridge/dynload/reloc_table_c6000.c
create mode 100644 drivers/staging/tidspbridge/dynload/tramp.c
create mode 100644 drivers/staging/tidspbridge/dynload/tramp_table_c6000.c
create mode 100644 drivers/staging/tidspbridge/gen/gb.c
create mode 100644 drivers/staging/tidspbridge/gen/gh.c
create mode 100644 drivers/staging/tidspbridge/gen/gs.c
create mode 100644 drivers/staging/tidspbridge/gen/uuidutil.c
create mode 100644 drivers/staging/tidspbridge/hw/EasiGlobal.h
create mode 100644 drivers/staging/tidspbridge/hw/GlobalTypes.h
create mode 100644 drivers/staging/tidspbridge/hw/MMUAccInt.h
create mode 100644 drivers/staging/tidspbridge/hw/MMURegAcM.h
create mode 100644 drivers/staging/tidspbridge/hw/hw_defs.h
create mode 100644 drivers/staging/tidspbridge/hw/hw_mmu.c
create mode 100644 drivers/staging/tidspbridge/hw/hw_mmu.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/_chnl_sm.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/brddefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/cfg.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/chnl.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/chnldefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/chnlpriv.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/clk.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/cmm.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/cmmdefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/cod.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbc.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbdcd.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbdcddef.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbdefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbldefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbll.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dblldefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbtype.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dehdefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dev.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/devdefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/disp.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dispdefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dmm.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/drv.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/drvdefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspapi-ioctl.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspapi.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspchnl.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspdeh.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspdrv.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspio.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspioctl.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspmsg.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dynamic_loader.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/gb.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/getsection.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/gh.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/gs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/host_os.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/io.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/io_sm.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/iodefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/ldr.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/list.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/mbx_sh.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/memdefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/mgr.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/mgrpriv.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/msg.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/msgdefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/nldr.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/node.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/nodedefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/nodepriv.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/ntfy.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/proc.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/procpriv.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/pwr.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/pwr_sh.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/resourcecleanup.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/rmm.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/rms_sh.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/rmstypes.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/services.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/std.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/strm.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/strmdefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/sync.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/utildefs.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/uuidutil.h
create mode 100644 drivers/staging/tidspbridge/include/dspbridge/wdt.h
create mode 100644 drivers/staging/tidspbridge/pmgr/chnl.c
create mode 100644 drivers/staging/tidspbridge/pmgr/chnlobj.h
create mode 100644 drivers/staging/tidspbridge/pmgr/cmm.c
create mode 100644 drivers/staging/tidspbridge/pmgr/cod.c
create mode 100644 drivers/staging/tidspbridge/pmgr/dbll.c
create mode 100644 drivers/staging/tidspbridge/pmgr/dev.c
create mode 100644 drivers/staging/tidspbridge/pmgr/dmm.c
create mode 100644 drivers/staging/tidspbridge/pmgr/dspapi.c
create mode 100644 drivers/staging/tidspbridge/pmgr/io.c
create mode 100644 drivers/staging/tidspbridge/pmgr/ioobj.h
create mode 100644 drivers/staging/tidspbridge/pmgr/msg.c
create mode 100644 drivers/staging/tidspbridge/pmgr/msgobj.h
create mode 100644 drivers/staging/tidspbridge/rmgr/dbdcd.c
create mode 100644 drivers/staging/tidspbridge/rmgr/disp.c
create mode 100644 drivers/staging/tidspbridge/rmgr/drv.c
create mode 100644 drivers/staging/tidspbridge/rmgr/drv_interface.c
create mode 100644 drivers/staging/tidspbridge/rmgr/drv_interface.h
create mode 100644 drivers/staging/tidspbridge/rmgr/dspdrv.c
create mode 100644 drivers/staging/tidspbridge/rmgr/mgr.c
create mode 100644 drivers/staging/tidspbridge/rmgr/nldr.c
create mode 100644 drivers/staging/tidspbridge/rmgr/node.c
create mode 100644 drivers/staging/tidspbridge/rmgr/proc.c
create mode 100644 drivers/staging/tidspbridge/rmgr/pwr.c
create mode 100644 drivers/staging/tidspbridge/rmgr/rmm.c
create mode 100644 drivers/staging/tidspbridge/rmgr/strm.c
create mode 100644 drivers/staging/tidspbridge/services/cfg.c
create mode 100644 drivers/staging/tidspbridge/services/ntfy.c
create mode 100644 drivers/staging/tidspbridge/services/services.c
create mode 100644 drivers/staging/tidspbridge/services/sync.c
create mode 100644 drivers/staging/vt6655/channel.c
create mode 100644 drivers/staging/vt6655/channel.h
create mode 100644 drivers/staging/wlan-ng/cfg80211.c
delete mode 100644 drivers/staging/wlan-ng/p80211wext.c
delete mode 100644 drivers/staging/xgifb/XGI.h
delete mode 100644 drivers/staging/xgifb/osdef.h
create mode 100644 drivers/staging/zram/Kconfig
create mode 100644 drivers/staging/zram/Makefile
rename drivers/staging/{ramzswap => zram}/xvmalloc.c (100%)
rename drivers/staging/{ramzswap => zram}/xvmalloc.h (100%)
rename drivers/staging/{ramzswap => zram}/xvmalloc_int.h (100%)
create mode 100644 drivers/staging/zram/zram.txt
create mode 100644 drivers/staging/zram/zram_drv.c
rename drivers/staging/{ramzswap/ramzswap_drv.h => zram/zram_drv.h} (69%)
rename drivers/staging/{ramzswap/ramzswap_ioctl.h => zram/zram_ioctl.h} (68%)
Merging slabh/slabh
$ git merge slabh/slabh
Already up-to-date.
Merging scsi-post-merge/master
$ git merge scsi-post-merge/master
Already up-to-date.