Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

d3ec4844 · Linus Torvalds <[email protected]> · 2011-07-25 13:56:39 -07:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)

Commit: d3ec4844d449cf7af9e749f73ba2052fb7b72fc2
Parents: 0003230e · df2e301f

Merge commit. Changes below are compared with the first parent: 0003230e.

Changes

384 files changed · +569 −676

File	Status	Add	Del	Content
.mailmap	modified	+1	−2	View file
Documentation/DocBook/v4l/io.xml	modified	+1	−1	View file
Documentation/RCU/NMI-RCU.txt	modified	+2	−2	View file
Documentation/blockdev/README.DAC960	modified	+1	−1	View file
Documentation/blockdev/ramdisk.txt	modified	+4	−4	View file
Documentation/cpu-freq/cpu-drivers.txt	modified	+1	−1	View file
Documentation/devicetree/bindings/net/can/fsl-flexcan.txt	modified	+0	−0	View file
Documentation/feature-removal-schedule.txt	modified	+10	−10	View file
Documentation/filesystems/nfs/nfsroot.txt	modified	+1	−1	View file
Documentation/i2o/ioctl	modified	+1	−1	View file
Documentation/isdn/README.HiSax	modified	+1	−1	View file
Documentation/kbuild/makefiles.txt	modified	+19	−19	View file
Documentation/magic-number.txt	modified	+1	−1	View file
Documentation/mca.txt	modified	+2	−2	View file
Documentation/scheduler/sched-arch.txt	modified	+1	−1	View file
Documentation/scsi/BusLogic.txt	modified	+1	−1	View file
Documentation/serial/computone.txt	modified	+1	−1	View file
Documentation/zh_CN/magic-number.txt	modified	+1	−1	View file
MAINTAINERS	modified	+3	−3	View file
arch/alpha/include/asm/floppy.h	modified	+1	−1	View file
arch/arm/common/scoop.c	modified	+1	−1	View file
arch/arm/mach-at91/at91sam9261_devices.c	modified	+1	−1	View file
arch/arm/mach-at91/board-snapper9260.c	modified	+1	−1	View file
arch/arm/mach-dove/common.c	modified	+0	−2	View file
arch/arm/mach-ep93xx/simone.c	modified	+2	−2	View file
arch/arm/mach-ep93xx/snappercl15.c	modified	+2	−2	View file
arch/arm/mach-mv78xx0/pcie.c	modified	+4	−4	View file
arch/arm/mach-pxa/include/mach/corgi.h	modified	+1	−1	View file
arch/arm/mach-pxa/include/mach/pxa27x-udc.h	modified	+2	−2	View file
arch/arm/mach-s3c2410/h1940-bluetooth.c	modified	+0	−1	View file
arch/arm/mach-shmobile/board-ap4evb.c	modified	+1	−1	View file
arch/arm/mach-u300/core.c	modified	+1	−1	View file
arch/arm/mach-ux500/board-mop500-regulators.c	modified	+1	−1	View file
arch/arm/plat-s5p/sysmmu.c	modified	+3	−3	View file
arch/arm/plat-samsung/pm-check.c	modified	+1	−1	View file
arch/avr32/kernel/setup.c	modified	+5	−5	View file
arch/avr32/mach-at32ap/extint.c	modified	+1	−1	View file
arch/avr32/mach-at32ap/hsmc.c	modified	+1	−1	View file
arch/avr32/mach-at32ap/intc.c	modified	+1	−1	View file
arch/avr32/mach-at32ap/pio.c	modified	+1	−1	View file
arch/h8300/kernel/setup.c	modified	+1	−1	View file
arch/ia64/include/asm/sn/tioce.h	modified	+1	−1	View file
arch/microblaze/pci/pci-common.c	modified	+1	−1	View file
arch/mips/bcm47xx/setup.c	modified	+1	−1	View file
arch/mips/include/asm/floppy.h	modified	+1	−1	View file
arch/mips/include/asm/mach-jz4740/gpio.h	modified	+2	−3	View file
arch/mips/lantiq/devices.c	modified	+0	−2	View file
arch/mips/lantiq/xway/devices.c	modified	+0	−2	View file
arch/mips/pci/pci-rc32434.c	modified	+1	−1	View file
arch/mips/pci/pci-vr41xx.c	modified	+1	−1	View file
arch/mips/powertv/asic/asic_devices.c	modified	+4	−6	View file
arch/parisc/include/asm/dma-mapping.h	modified	+1	−1	View file
arch/parisc/math-emu/decode_exc.c	modified	+1	−1	View file
arch/powerpc/include/asm/elf.h	modified	+2	−2	View file
arch/powerpc/include/asm/macio.h	modified	+1	−1	View file
arch/powerpc/include/asm/smu.h	modified	+1	−1	View file
arch/powerpc/kernel/machine_kexec.c	modified	+2	−2	View file
arch/powerpc/kernel/pci-common.c	modified	+1	−1	View file
arch/powerpc/platforms/52xx/mpc52xx_pci.c	modified	+4	−4	View file
arch/powerpc/platforms/83xx/km83xx.c	modified	+1	−1	View file
arch/powerpc/platforms/83xx/mpc832x_mds.c	modified	+1	−1	View file
arch/powerpc/platforms/83xx/mpc834x_mds.c	modified	+1	−1	View file
arch/powerpc/platforms/83xx/mpc836x_mds.c	modified	+1	−1	View file
arch/powerpc/platforms/83xx/usb.c	modified	+1	−1	View file
arch/powerpc/platforms/85xx/sbc8560.c	modified	+1	−1	View file
arch/powerpc/platforms/85xx/xes_mpc85xx.c	modified	+1	−1	View file
arch/powerpc/platforms/cell/celleb_scc_epci.c	modified	+4	−4	View file
arch/powerpc/platforms/cell/celleb_scc_pciex.c	modified	+1	−1	View file
arch/powerpc/platforms/cell/spu_manage.c	modified	+1	−1	View file
arch/powerpc/platforms/chrp/pci.c	modified	+1	−1	View file
arch/powerpc/platforms/pasemi/dma_lib.c	modified	+1	−1	View file
arch/powerpc/platforms/powermac/nvram.c	modified	+2	−2	View file
arch/powerpc/platforms/powermac/pci.c	modified	+2	−4	View file
arch/powerpc/platforms/powermac/time.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/smp.c	modified	+0	−1	View file
arch/powerpc/sysdev/axonram.c	modified	+1	−1	View file
arch/powerpc/sysdev/cpm1.c	modified	+1	−1	View file
arch/powerpc/sysdev/cpm_common.c	modified	+1	−1	View file
arch/powerpc/sysdev/dart_iommu.c	modified	+1	−1	View file
arch/powerpc/sysdev/fsl_msi.c	modified	+1	−1	View file
arch/powerpc/sysdev/fsl_pci.c	modified	+6	−6	View file
arch/powerpc/sysdev/fsl_rio.c	modified	+1	−1	View file
arch/powerpc/sysdev/ipic.c	modified	+1	−1	View file
arch/powerpc/sysdev/mmio_nvram.c	modified	+1	−1	View file
arch/powerpc/sysdev/mpc8xx_pic.c	modified	+1	−1	View file
arch/powerpc/sysdev/mv64x60_udbg.c	modified	+2	−2	View file
arch/powerpc/sysdev/ppc4xx_pci.c	modified	+8	−8	View file
arch/powerpc/sysdev/qe_lib/qe_ic.c	modified	+1	−1	View file
arch/powerpc/sysdev/qe_lib/qe_io.c	modified	+1	−1	View file
arch/powerpc/sysdev/xics/icp-native.c	modified	+1	−1	View file
arch/s390/oprofile/init.c	modified	+0	−2	View file
arch/sh/boards/mach-ap325rxa/setup.c	modified	+1	−1	View file
arch/sh/boards/mach-ecovec24/setup.c	modified	+2	−2	View file
arch/sh/boards/mach-kfr2r09/setup.c	modified	+1	−1	View file
arch/sh/boards/mach-migor/setup.c	modified	+1	−1	View file
arch/sh/boards/mach-se/7724/setup.c	modified	+2	−2	View file
arch/sh/kernel/io_trapped.c	modified	+4	−4	View file
arch/sh/kernel/machine_kexec.c	modified	+1	−1	View file
arch/sparc/include/asm/elf_64.h	modified	+1	−1	View file
arch/sparc/kernel/ioport.c	modified	+6	−6	View file
arch/sparc/kernel/pci.c	modified	+2	−4	View file
arch/tile/kernel/setup.c	modified	+1	−2	View file
arch/um/sys-i386/signal.c	modified	+1	−1	View file
arch/x86/Kconfig	modified	+2	−2	View file
arch/x86/kernel/i387.c	modified	+1	−1	View file
arch/x86/kernel/pci-calgary_64.c	modified	+1	−1	View file
arch/x86/kernel/probe_roms.c	modified	+1	−1	View file
arch/x86/kvm/mmu.c	modified	+0	−1	View file
arch/xtensa/include/asm/uaccess.h	modified	+1	−2	View file
arch/xtensa/variants/s6000/include/variant/dmac.h	modified	+1	−1	View file
crypto/Kconfig	modified	+1	−1	View file
drivers/acpi/ac.c	modified	+1	−1	View file
drivers/acpi/battery.c	modified	+1	−1	View file
drivers/acpi/sbs.c	modified	+1	−1	View file
drivers/bcma/driver_chipcommon.c	modified	+1	−1	View file
drivers/bcma/driver_chipcommon_pmu.c	modified	+1	−1	View file
drivers/bcma/driver_pci.c	modified	+1	−1	View file
drivers/char/bsr.c	modified	+1	−1	View file
drivers/char/hw_random/core.c	modified	+1	−1	View file
drivers/char/xilinx_hwicap/xilinx_hwicap.c	modified	+1	−1	View file
drivers/dma/mv_xor.c	modified	+2	−3	View file
drivers/edac/cell_edac.c	modified	+1	−1	View file
drivers/edac/mpc85xx_edac.c	modified	+6	−6	View file
drivers/gpio/gpio-ab8500.c	modified	+0	−1	View file
drivers/gpio/gpio-bt8xx.c	modified	+1	−1	View file
drivers/gpio/gpio-ep93xx.c	modified	+1	−1	View file
drivers/gpio/gpio-u300.c	modified	+4	−4	View file
drivers/gpu/drm/nouveau/nv50_graph.c	modified	+0	−1	View file
drivers/gpu/drm/sis/sis_drv.h	modified	+2	−2	View file
drivers/hwmon/gl520sm.c	modified	+1	−1	View file
drivers/i2c/Kconfig	modified	+1	−1	View file
drivers/i2c/busses/i2c-highlander.c	modified	+1	−1	View file
drivers/i2c/busses/i2c-omap.c	modified	+2	−2	View file
drivers/ide/palm_bk3710.c	modified	+1	−1	View file
drivers/ide/tx4939ide.c	modified	+2	−2	View file
drivers/input/serio/libps2.c	modified	+1	−1	View file
drivers/input/serio/sa1111ps2.c	modified	+2	−4	View file
drivers/isdn/i4l/isdn_bsdcomp.c	modified	+1	−1	View file
drivers/media/rc/ite-cir.c	modified	+0	−1	View file
drivers/media/video/davinci/vpif.c	modified	+1	−1	View file
drivers/media/video/m5mols/m5mols_capture.c	modified	+0	−1	View file
drivers/media/video/omap/omap_vout.c	modified	+1	−1	View file
drivers/media/video/omap24xxcam.c	modified	+2	−3	View file
drivers/media/video/videobuf2-memops.c	modified	+0	−1	View file
drivers/message/i2o/iop.c	modified	+4	−4	View file
drivers/mfd/tc6387xb.c	modified	+1	−1	View file
drivers/misc/atmel-ssc.c	modified	+1	−1	View file
drivers/misc/atmel_pwm.c	modified	+1	−1	View file
drivers/mmc/host/dw_mmc.c	modified	+1	−1	View file
drivers/mmc/host/vub300.c	modified	+2	−2	View file
drivers/mtd/devices/sst25l.c	modified	+2	−2	View file
drivers/mtd/maps/bfin-async-flash.c	modified	+1	−1	View file
drivers/mtd/maps/ixp2000.c	modified	+6	−5	View file
drivers/mtd/maps/pxa2xx-flash.c	modified	+1	−1	View file
drivers/mtd/nand/atmel_nand.c	modified	+2	−2	View file
drivers/mtd/nand/bcm_umi_nand.c	modified	+1	−1	View file
drivers/mtd/nand/mpc5121_nfc.c	modified	+1	−1	View file
drivers/net/b44.c	modified	+1	−1	View file
drivers/net/bcm63xx_enet.c	modified	+4	−4	View file
drivers/net/bsd_comp.c	modified	+1	−1	View file
drivers/net/can/softing/softing_main.c	modified	+1	−1	View file
drivers/net/davinci_emac.c	modified	+3	−3	View file
drivers/net/eexpress.c	modified	+1	−1	View file
drivers/net/ethoc.c	modified	+1	−1	View file
drivers/net/fec_mpc52xx.c	modified	+4	−3	View file
drivers/net/fs_enet/mii-bitbang.c	modified	+2	−2	View file
drivers/net/fs_enet/mii-fec.c	modified	+1	−1	View file
drivers/net/gianfar_ptp.c	modified	+1	−1	View file
drivers/net/ibm_newemac/core.c	modified	+1	−1	View file
drivers/net/irda/toim3232-sir.c	modified	+1	−1	View file
drivers/net/macb.c	modified	+1	−1	View file
drivers/net/mv643xx_eth.c	modified	+1	−1	View file
drivers/net/natsemi.c	modified	+2	−2	View file
drivers/net/pxa168_eth.c	modified	+1	−1	View file
drivers/net/r8169.c	modified	+1	−1	View file
drivers/net/s2io.h	modified	+2	−2	View file
drivers/net/sb1250-mac.c	modified	+1	−1	View file
drivers/net/sungem.c	modified	+1	−2	View file
drivers/net/wan/lmc/lmc_var.h	modified	+1	−1	View file
drivers/net/wireless/ath/ath5k/ahb.c	modified	+0	−1	View file
drivers/net/wireless/b43/debugfs.c	modified	+1	−1	View file
drivers/net/wireless/b43/dma.c	modified	+1	−1	View file
drivers/net/wireless/b43/leds.c	modified	+1	−1	View file
drivers/net/wireless/b43/lo.c	modified	+1	−1	View file
drivers/net/wireless/b43/main.c	modified	+1	−1	View file
drivers/net/wireless/b43/main.h	modified	+1	−1	View file
drivers/net/wireless/b43/pcmcia.c	modified	+1	−1	View file
drivers/net/wireless/b43/phy_a.c	modified	+1	−1	View file
drivers/net/wireless/b43/phy_common.c	modified	+1	−1	View file
drivers/net/wireless/b43/phy_g.c	modified	+1	−1	View file
drivers/net/wireless/b43/phy_lp.c	modified	+1	−1	View file
drivers/net/wireless/b43/phy_n.c	modified	+1	−1	View file
drivers/net/wireless/b43/pio.c	modified	+1	−1	View file
drivers/net/wireless/b43/radio_2055.c	modified	+1	−1	View file
drivers/net/wireless/b43/rfkill.c	modified	+1	−1	View file
drivers/net/wireless/b43/sdio.c	modified	+1	−1	View file
drivers/net/wireless/b43/sysfs.c	modified	+1	−1	View file
drivers/net/wireless/b43/tables.c	modified	+1	−1	View file
drivers/net/wireless/b43/tables_lpphy.c	modified	+1	−1	View file
drivers/net/wireless/b43/tables_nphy.c	modified	+1	−1	View file
drivers/net/wireless/b43/wa.c	modified	+1	−1	View file
drivers/net/wireless/b43/xmit.c	modified	+1	−1	View file
drivers/net/wireless/b43legacy/debugfs.c	modified	+1	−1	View file
drivers/net/wireless/b43legacy/dma.c	modified	+1	−1	View file
drivers/net/wireless/b43legacy/ilt.c	modified	+1	−1	View file
drivers/net/wireless/b43legacy/leds.c	modified	+1	−1	View file
drivers/net/wireless/b43legacy/main.c	modified	+1	−1	View file
drivers/net/wireless/b43legacy/main.h	modified	+1	−1	View file
drivers/net/wireless/b43legacy/phy.c	modified	+1	−1	View file
drivers/net/wireless/b43legacy/phy.h	modified	+1	−1	View file
drivers/net/wireless/b43legacy/pio.c	modified	+1	−1	View file
drivers/net/wireless/b43legacy/radio.c	modified	+1	−1	View file
drivers/net/wireless/b43legacy/radio.h	modified	+1	−1	View file
drivers/net/wireless/b43legacy/rfkill.c	modified	+1	−1	View file
drivers/net/wireless/b43legacy/sysfs.c	modified	+1	−1	View file
drivers/net/wireless/b43legacy/xmit.c	modified	+1	−1	View file
drivers/net/wireless/iwlegacy/iwl-commands.h	modified	+2	−2	View file
drivers/net/wireless/iwlwifi/iwl-commands.h	modified	+2	−2	View file
drivers/net/wireless/rtlwifi/rtl8192ce/reg.h	modified	+2	−2	View file
drivers/parport/parport_ax88796.c	modified	+1	−1	View file
drivers/pci/hotplug/shpchp_sysfs.c	modified	+9	−12	View file
drivers/pci/pcie/aspm.c	modified	+1	−1	View file
drivers/pcmcia/at91_cf.c	modified	+3	−4	View file
drivers/pcmcia/electra_cf.c	modified	+2	−2	View file
drivers/pcmcia/rsrc_iodyn.c	modified	+3	−3	View file
drivers/pcmcia/rsrc_nonstatic.c	modified	+3	−3	View file
drivers/pnp/pnpacpi/rsparser.c	modified	+5	−5	View file
drivers/pnp/pnpbios/rsparser.c	modified	+6	−6	View file
drivers/power/ds2782_battery.c	modified	+2	−2	View file
drivers/rtc/rtc-at32ap700x.c	modified	+1	−1	View file
drivers/rtc/rtc-cmos.c	modified	+3	−3	View file
drivers/rtc/rtc-ds1286.c	modified	+1	−1	View file
drivers/rtc/rtc-ds1511.c	modified	+1	−1	View file
drivers/rtc/rtc-ds1742.c	modified	+1	−1	View file
drivers/rtc/rtc-m48t35.c	modified	+1	−1	View file
drivers/rtc/rtc-m48t59.c	modified	+1	−1	View file
drivers/rtc/rtc-mrst.c	modified	+2	−3	View file
drivers/rtc/rtc-puv3.c	modified	+2	−3	View file
drivers/rtc/rtc-s3c.c	modified	+2	−3	View file
drivers/scsi/device_handler/scsi_dh_rdac.c	modified	+1	−1	View file
drivers/scsi/lpfc/lpfc_hw.h	modified	+4	−4	View file
drivers/scsi/qla2xxx/qla_isr.c	modified	+2	−2	View file
drivers/ssb/b43_pci_bridge.c	modified	+1	−1	View file
drivers/ssb/driver_chipcommon.c	modified	+1	−1	View file
drivers/ssb/driver_chipcommon_pmu.c	modified	+1	−1	View file
drivers/ssb/driver_extif.c	modified	+1	−1	View file
drivers/ssb/driver_gige.c	modified	+1	−1	View file
drivers/ssb/driver_mipscore.c	modified	+1	−1	View file
drivers/ssb/driver_pcicore.c	modified	+1	−1	View file
drivers/ssb/embedded.c	modified	+1	−1	View file
drivers/ssb/main.c	modified	+1	−1	View file
drivers/ssb/pci.c	modified	+1	−1	View file
drivers/ssb/pcihost_wrapper.c	modified	+1	−1	View file
drivers/ssb/pcmcia.c	modified	+1	−1	View file
drivers/ssb/scan.c	modified	+1	−1	View file
drivers/ssb/sdio.c	modified	+1	−1	View file
drivers/ssb/sprom.c	modified	+1	−1	View file
drivers/staging/ath6kl/os/linux/include/ar6000_drv.h	modified	+0	−1	View file
drivers/staging/bcm/headers.h	modified	+2	−5	View file
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c	modified	+0	−1	View file
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h	modified	+0	−1	View file
drivers/staging/brcm80211/brcmfmac/wl_iw.c	modified	+2	−7	View file
drivers/staging/hv/hv_mouse.c	modified	+0	−1	View file
drivers/staging/hv/tools/hv_kvp_daemon.c	modified	+0	−1	View file
drivers/staging/nvec/nvec.c	modified	+0	−1	View file
drivers/staging/rtl8712/drv_types.h	modified	+0	−1	View file
drivers/staging/rtl8712/osdep_service.h	modified	+0	−1	View file
drivers/staging/sep/sep_driver.c	modified	+0	−1	View file
drivers/staging/usbip/userspace/src/utils.h	modified	+0	−1	View file
drivers/target/tcm_fc/tfc_cmd.c	modified	+0	−1	View file
drivers/target/tcm_fc/tfc_conf.c	modified	+0	−1	View file
drivers/target/tcm_fc/tfc_io.c	modified	+0	−1	View file
drivers/target/tcm_fc/tfc_sess.c	modified	+0	−2	View file
drivers/tty/serial/8250_pci.c	modified	+1	−1	View file
drivers/tty/serial/bfin_5xx.c	modified	+2	−3	View file
drivers/tty/serial/imx.c	modified	+2	−3	View file
drivers/tty/serial/m32r_sio.c	modified	+1	−1	View file
drivers/tty/serial/omap-serial.c	modified	+3	−3	View file
drivers/tty/serial/pxa.c	modified	+1	−1	View file
drivers/tty/serial/sunsu.c	modified	+1	−1	View file
drivers/tty/serial/vt8500_serial.c	modified	+1	−2	View file
drivers/uio/uio_pdrv.c	modified	+1	−1	View file
drivers/uio/uio_pdrv_genirq.c	modified	+1	−1	View file
drivers/usb/gadget/atmel_usba_udc.c	modified	+1	−1	View file
drivers/usb/gadget/fsl_udc_core.c	modified	+3	−3	View file
drivers/usb/gadget/pxa27x_udc.h	modified	+2	−2	View file
drivers/usb/host/ehci-ath79.c	modified	+1	−1	View file
drivers/usb/host/ehci-cns3xxx.c	modified	+1	−1	View file
drivers/usb/host/ehci-fsl.c	modified	+1	−1	View file
drivers/usb/host/ehci-grlib.c	modified	+1	−1	View file
drivers/usb/host/ehci-ixp4xx.c	modified	+1	−1	View file
drivers/usb/host/ehci-octeon.c	modified	+1	−1	View file
drivers/usb/host/ehci-pmcmsp.c	modified	+5	−5	View file
drivers/usb/host/ehci-ppc-of.c	modified	+1	−1	View file
drivers/usb/host/ehci-w90x900.c	modified	+1	−1	View file
drivers/usb/host/ehci-xilinx-of.c	modified	+1	−1	View file
drivers/usb/host/fhci-hcd.c	modified	+1	−1	View file
drivers/usb/host/ohci-ath79.c	modified	+2	−2	View file
drivers/usb/host/ohci-cns3xxx.c	modified	+1	−1	View file
drivers/usb/host/ohci-da8xx.c	modified	+1	−1	View file
drivers/usb/host/ohci-octeon.c	modified	+1	−1	View file
drivers/usb/host/ohci-ppc-of.c	modified	+1	−1	View file
drivers/usb/host/ohci-ppc-soc.c	modified	+1	−1	View file
drivers/usb/host/ohci-sa1111.c	modified	+1	−1	View file
drivers/usb/host/ohci-sm501.c	modified	+5	−6	View file
drivers/usb/host/ohci-ssb.c	modified	+1	−1	View file
drivers/usb/host/ohci-tmio.c	modified	+3	−3	View file
drivers/usb/host/oxu210hp-hcd.c	modified	+1	−1	View file
drivers/usb/host/uhci-grlib.c	modified	+1	−1	View file
drivers/usb/host/whci/init.c	modified	+1	−1	View file
drivers/usb/misc/ftdi-elan.c	modified	+14	−14	View file
drivers/usb/musb/musb_core.c	modified	+1	−1	View file
drivers/usb/otg/isp1301_omap.c	modified	+2	−2	View file
drivers/usb/otg/otg_fsm.c	modified	+0	−1	View file
drivers/usb/otg/twl4030-usb.c	modified	+1	−1	View file
drivers/uwb/uwbd.c	modified	+1	−1	View file
drivers/uwb/whc-rc.c	modified	+1	−1	View file
drivers/video/atmel_lcdfb.c	modified	+2	−2	View file
drivers/video/aty/atyfb_base.c	modified	+4	−3	View file
drivers/video/au1100fb.c	modified	+1	−1	View file
drivers/video/cobalt_lcdfb.c	modified	+1	−1	View file
drivers/video/controlfb.c	modified	+2	−2	View file
drivers/video/ep93xx-fb.c	modified	+2	−2	View file
drivers/video/i810/i810.h	modified	+1	−1	View file
drivers/video/mb862xx/mb862xxfbdrv.c	modified	+2	−2	View file
drivers/video/msm/mdp.c	modified	+1	−2	View file
drivers/video/msm/msm_fb.c	modified	+3	−4	View file
drivers/video/nuc900fb.c	modified	+1	−1	View file
drivers/video/platinumfb.c	modified	+2	−3	View file
drivers/video/pxa168fb.c	modified	+1	−1	View file
drivers/video/udlfb.c	modified	+0	−1	View file
drivers/video/via/viafbdev.c	modified	+2	−2	View file
fs/ecryptfs/keystore.c	modified	+1	−1	View file
fs/jffs2/readinode.c	modified	+1	−1	View file
fs/nfs/idmap.c	modified	+2	−5	View file
fs/ocfs2/move_extents.c	modified	+0	−1	View file
fs/xfs/xfs_dir2_node.c	modified	+1	−1	View file
include/linux/ceph/libceph.h	modified	+1	−1	View file
include/linux/cgroup.h	modified	+0	−1	View file
include/linux/cred.h	modified	+0	−1	View file
include/linux/dio.h	modified	+1	−1	View file
include/linux/fdtable.h	modified	+0	−1	View file
include/linux/fs.h	modified	+0	−1	View file
include/linux/hw_random.h	modified	+1	−1	View file
include/linux/mfd/tps65910.h	modified	+1	−1	View file
include/linux/nl80211.h	modified	+1	−1	View file
include/linux/pnp.h	modified	+1	−1	View file
include/linux/rtnetlink.h	modified	+1	−2	View file
include/linux/ssb/ssb_driver_chipcommon.h	modified	+1	−1	View file
include/linux/stop_machine.h	modified	+1	−1	View file
include/linux/zorro.h	modified	+1	−1	View file
include/net/sock.h	modified	+1	−2	View file
include/scsi/osd_initiator.h	modified	+1	−1	View file
include/scsi/scsi.h	modified	+1	−1	View file
include/sound/soundfont.h	modified	+1	−1	View file
kernel/cgroup.c	modified	+2	−6	View file
kernel/exit.c	modified	+0	−1	View file
kernel/kexec.c	modified	+1	−1	View file
kernel/pid.c	modified	+0	−1	View file
kernel/power/Kconfig	modified	+2	−2	View file
kernel/rcutorture.c	modified	+0	−2	View file
kernel/sched.c	modified	+0	−1	View file
lib/vsprintf.c	modified	+1	−2	View file
mm/Kconfig	modified	+1	−1	View file
mm/slub.c	modified	+1	−1	View file
net/bridge/netfilter/ebt_ulog.c	modified	+0	−1	View file
net/mac80211/mesh_hwmp.c	modified	+10	−10	View file
net/mac80211/sta_info.c	modified	+0	−4	View file
net/netlabel/netlabel_domainhash.c	modified	+1	−2	View file
net/netlabel/netlabel_unlabeled.c	modified	+1	−2	View file
scripts/bootgraph.pl	modified	+1	−1	View file
scripts/docproc.c	modified	+5	−12	View file
scripts/gcc-goto.sh	modified	+1	−1	View file
security/keys/keyring.c	modified	+0	−1	View file
sound/aoa/soundbus/i2sbus/core.c	modified	+4	−5	View file
sound/atmel/abdac.c	modified	+1	−1	View file
sound/atmel/ac97c.c	modified	+1	−1	View file
sound/pci/ice1712/ice1712.c	modified	+1	−1	View file
sound/ppc/pmac.c	modified	+3	−6	View file
sound/soc/ep93xx/ep93xx-i2s.c	modified	+2	−2	View file
sound/soc/ep93xx/ep93xx-pcm.c	modified	+2	−2	View file
sound/soc/ep93xx/snappercl15.c	modified	+2	−2	View file
sound/soc/fsl/mpc5200_dma.c	modified	+1	−1	View file
sound/soc/omap/ams-delta.c	modified	+1	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

.mailmap

View file

diff --git a/.mailmap b/.mailmap
index 353ad56..a4806f0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -73,8 +73,7 @@ Linas Vepstas <[email protected]>
 Mark Brown <[email protected]>
 Matthieu CASTET <[email protected]>
 Mayuresh Janorkar <[email protected]>
-Michael Buesch <[email protected]>
-Michael Buesch <[email protected]>
+Michael Buesch <[email protected]>
 Michel Dänzer <[email protected]>
 Mitesh shah <[email protected]>
 Morten Welinder <[email protected]>

Documentation/DocBook/v4l/io.xml

View file

diff --git a/Documentation/DocBook/v4l/io.xml b/Documentation/DocBook/v4l/io.xml
index 227e7ac..c57d1ec 100644
--- a/Documentation/DocBook/v4l/io.xml
+++ b/Documentation/DocBook/v4l/io.xml
@@ -210,7 +210,7 @@ for (i = 0; i &lt; reqbuf.count; i++)
       <programlisting>
 &v4l2-requestbuffers; reqbuf;
 /* Our current format uses 3 planes per buffer */
-#define FMT_NUM_PLANES = 3;
+#define FMT_NUM_PLANES = 3
 
 struct {
 	void *start[FMT_NUM_PLANES];

Documentation/RCU/NMI-RCU.txt

View file

diff --git a/Documentation/RCU/NMI-RCU.txt b/Documentation/RCU/NMI-RCU.txt
index a8536cb..bf82851 100644
--- a/Documentation/RCU/NMI-RCU.txt
+++ b/Documentation/RCU/NMI-RCU.txt
@@ -5,8 +5,8 @@ Although RCU is usually used to protect read-mostly data structures,
 it is possible to use RCU to provide dynamic non-maskable interrupt
 handlers, as well as dynamic irq handlers.  This document describes
 how to do this, drawing loosely from Zwane Mwaikambo's NMI-timer
-work in "arch/i386/oprofile/nmi_timer_int.c" and in
-"arch/i386/kernel/traps.c".
+work in "arch/x86/oprofile/nmi_timer_int.c" and in
+"arch/x86/kernel/traps.c".
 
 The relevant pieces of code are listed below, each followed by a
 brief explanation.

Documentation/blockdev/README.DAC960

View file

diff --git a/Documentation/blockdev/README.DAC960 b/Documentation/blockdev/README.DAC960
index 0e8f618..bd85fb9 100644
--- a/Documentation/blockdev/README.DAC960
+++ b/Documentation/blockdev/README.DAC960
@@ -214,7 +214,7 @@ replacing "/usr/src" with wherever you keep your Linux kernel source tree:
   make config
   make bzImage (or zImage)
 
-Then install "arch/i386/boot/bzImage" or "arch/i386/boot/zImage" as your
+Then install "arch/x86/boot/bzImage" or "arch/x86/boot/zImage" as your
 standard kernel, run lilo if appropriate, and reboot.
 
 To create the necessary devices in /dev, the "make_rd" script included in

Documentation/blockdev/ramdisk.txt

View file

diff --git a/Documentation/blockdev/ramdisk.txt b/Documentation/blockdev/ramdisk.txt
index 6c820ba..fa72e97 100644
--- a/Documentation/blockdev/ramdisk.txt
+++ b/Documentation/blockdev/ramdisk.txt
@@ -64,9 +64,9 @@ the RAM disk dynamically grows as data is being written into it, a size field
 is not required. Bits 11 to 13 are not currently used and may as well be zero.
 These numbers are no magical secrets, as seen below:
 
-./arch/i386/kernel/setup.c:#define RAMDISK_IMAGE_START_MASK     0x07FF
-./arch/i386/kernel/setup.c:#define RAMDISK_PROMPT_FLAG          0x8000
-./arch/i386/kernel/setup.c:#define RAMDISK_LOAD_FLAG            0x4000
+./arch/x86/kernel/setup.c:#define RAMDISK_IMAGE_START_MASK     0x07FF
+./arch/x86/kernel/setup.c:#define RAMDISK_PROMPT_FLAG          0x8000
+./arch/x86/kernel/setup.c:#define RAMDISK_LOAD_FLAG            0x4000
 
 Consider a typical two floppy disk setup, where you will have the
 kernel on disk one, and have already put a RAM disk image onto disk #2.
@@ -85,7 +85,7 @@ The command line equivalent is: "prompt_ramdisk=1"
 Putting that together gives 2^15 + 2^14 + 0 = 49152 for an rdev word.
 So to create disk one of the set, you would do:
 
-	/usr/src/linux# cat arch/i386/boot/zImage > /dev/fd0
+	/usr/src/linux# cat arch/x86/boot/zImage > /dev/fd0
 	/usr/src/linux# rdev /dev/fd0 /dev/fd0
 	/usr/src/linux# rdev -r /dev/fd0 49152
 

Documentation/cpu-freq/cpu-drivers.txt

View file

diff --git a/Documentation/cpu-freq/cpu-drivers.txt b/Documentation/cpu-freq/cpu-drivers.txt
index 6c30e93..c436096 100644
--- a/Documentation/cpu-freq/cpu-drivers.txt
+++ b/Documentation/cpu-freq/cpu-drivers.txt
@@ -168,7 +168,7 @@ in-chipset dynamic frequency switching to policy->min, the upper limit
 to policy->max, and -if supported- select a performance-oriented
 setting when policy->policy is CPUFREQ_POLICY_PERFORMANCE, and a
 powersaving-oriented setting when CPUFREQ_POLICY_POWERSAVE. Also check
-the reference implementation in arch/i386/kernel/cpu/cpufreq/longrun.c
+the reference implementation in drivers/cpufreq/longrun.c
 
 
 

Documentation/devicetree/bindings/net/can/fsl-flexcan.txt

View file

diff --git a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
old mode 100755
new mode 100644

Documentation/feature-removal-schedule.txt

View file

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index d59e71d..c8616f7 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -199,7 +199,7 @@ Files:	drivers/staging/cs5535_gpio/*
 Check:	drivers/staging/cs5535_gpio/cs5535_gpio.c
 Why:	A newer driver replaces this; it is drivers/gpio/cs5535-gpio.c, and
 	integrates with the Linux GPIO subsystem.  The old driver has been
-	moved to staging, and will be removed altogether around 2.6.40.
+	moved to staging, and will be removed altogether around 3.0.
 	Please test the new driver, and ensure that the functionality you
 	need and any bugfixes from the old driver are available in the new
 	one.
@@ -294,7 +294,7 @@ When:	The schedule was July 2008, but it was decided that we are going to keep t
 Why:	The support code for the old firmware hurts code readability/maintainability
 	and slightly hurts runtime performance. Bugfixes for the old firmware
 	are not provided by Broadcom anymore.
-Who:	Michael Buesch <[email protected]>
+Who:	Michael Buesch <[email protected]>
 
 ---------------------------
 
@@ -430,7 +430,7 @@ Who:	Avi Kivity <[email protected]>
 ----------------------------
 
 What:	iwlwifi 50XX module parameters
-When:	2.6.40
+When:	3.0
 Why:	The "..50" modules parameters were used to configure 5000 series and
 	up devices; different set of module parameters also available for 4965
 	with same functionalities. Consolidate both set into single place
@@ -441,7 +441,7 @@ Who:	Wey-Yi Guy <[email protected]>
 ----------------------------
 
 What:	iwl4965 alias support
-When:	2.6.40
+When:	3.0
 Why:	Internal alias support has been present in module-init-tools for some
 	time, the MODULE_ALIAS("iwl4965") boilerplate aliases can be removed
 	with no impact.
@@ -482,7 +482,7 @@ Who:	FUJITA Tomonori <[email protected]>
 ----------------------------
 
 What:	iwlwifi disable_hw_scan module parameters
-When:	2.6.40
+When:	3.0
 Why:	Hareware scan is the prefer method for iwlwifi devices for
 	scanning operation. Remove software scan support for all the
 	iwlwifi devices.
@@ -493,7 +493,7 @@ Who:	Wey-Yi Guy <[email protected]>
 
 What:   access to nfsd auth cache through sys_nfsservctl or '.' files
         in the 'nfsd' filesystem.
-When:   2.6.40
+When:   3.0
 Why:    This is a legacy interface which have been replaced by a more
         dynamic cache.  Continuing to maintain this interface is an
         unnecessary burden.
@@ -519,7 +519,7 @@ Files:	net/netfilter/xt_connlimit.c
 ----------------------------
 
 What:	noswapaccount kernel command line parameter
-When:	2.6.40
+When:	3.0
 Why:	The original implementation of memsw feature enabled by
 	CONFIG_CGROUP_MEM_RES_CTLR_SWAP could be disabled by the noswapaccount
 	kernel parameter (introduced in 2.6.29-rc1). Later on, this decision
@@ -552,7 +552,7 @@ Who:	Jean Delvare <[email protected]>
 ----------------------------
 
 What:	Support for UVCIOC_CTRL_ADD in the uvcvideo driver
-When:	2.6.42
+When:	3.2
 Why:	The information passed to the driver by this ioctl is now queried
 	dynamically from the device.
 Who:	Laurent Pinchart <[email protected]>
@@ -560,7 +560,7 @@ Who:	Laurent Pinchart <[email protected]>
 ----------------------------
 
 What:	Support for UVCIOC_CTRL_MAP_OLD in the uvcvideo driver
-When:	2.6.42
+When:	3.2
 Why:	Used only by applications compiled against older driver versions.
 	Superseded by UVCIOC_CTRL_MAP which supports V4L2 menu controls.
 Who:	Laurent Pinchart <[email protected]>
@@ -568,7 +568,7 @@ Who:	Laurent Pinchart <[email protected]>
 ----------------------------
 
 What:	Support for UVCIOC_CTRL_GET and UVCIOC_CTRL_SET in the uvcvideo driver
-When:	2.6.42
+When:	3.2
 Why:	Superseded by the UVCIOC_CTRL_QUERY ioctl.
 Who:	Laurent Pinchart <[email protected]>
 

Documentation/filesystems/nfs/nfsroot.txt

View file

diff --git a/Documentation/filesystems/nfs/nfsroot.txt b/Documentation/filesystems/nfs/nfsroot.txt
index 90c71c6..ffdd9d8 100644
--- a/Documentation/filesystems/nfs/nfsroot.txt
+++ b/Documentation/filesystems/nfs/nfsroot.txt
@@ -226,7 +226,7 @@ They depend on various facilities being available:
      	cdrecord.
 
 	e.g.
-	  cdrecord dev=ATAPI:1,0,0 arch/i386/boot/image.iso
+	  cdrecord dev=ATAPI:1,0,0 arch/x86/boot/image.iso
 
      	For more information on isolinux, including how to create bootdisks
      	for prebuilt kernels, see http://syslinux.zytor.com/

Documentation/i2o/ioctl

View file

diff --git a/Documentation/i2o/ioctl b/Documentation/i2o/ioctl
index 1e77fac..22ca53a 100644
--- a/Documentation/i2o/ioctl
+++ b/Documentation/i2o/ioctl
@@ -110,7 +110,7 @@ V. Getting Logical Configuration Table
       ENOBUFS     Buffer not large enough.  If this occurs, the required
                   buffer length is written into *(lct->reslen)
 
-VI. Settting Parameters
+VI. Setting Parameters
 
    SYNOPSIS
 

Documentation/isdn/README.HiSax

View file

diff --git a/Documentation/isdn/README.HiSax b/Documentation/isdn/README.HiSax
index 99e87a6..b1a573c 100644
--- a/Documentation/isdn/README.HiSax
+++ b/Documentation/isdn/README.HiSax
@@ -506,7 +506,7 @@ to e.g. the Internet:
      <ISDN subsystem - ISDN support -- HiSax>
      make clean; make zImage; make modules; make modules_install
 2. Install the new kernel
-     cp /usr/src/linux/arch/i386/boot/zImage /etc/kernel/linux.isdn
+     cp /usr/src/linux/arch/x86/boot/zImage /etc/kernel/linux.isdn
      vi /etc/lilo.conf
      <add new kernel in the bootable image section>
      lilo

Documentation/kbuild/makefiles.txt

View file

diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 47435e5..f47cdef 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -441,7 +441,7 @@ more details, with real examples.
 	specified if first option are not supported.
 
 	Example:
-		#arch/i386/kernel/Makefile
+		#arch/x86/kernel/Makefile
 		vsyscall-flags += $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
 
 	In the above example, vsyscall-flags will be assigned the option
@@ -460,7 +460,7 @@ more details, with real examples.
 	supported to use an optional second option.
 
 	Example:
-		#arch/i386/Makefile
+		#arch/x86/Makefile
 		cflags-y += $(call cc-option,-march=pentium-mmx,-march=i586)
 
 	In the above example, cflags-y will be assigned the option
@@ -522,7 +522,7 @@ more details, with real examples.
 	even though the option was accepted by gcc.
 
 	Example:
-		#arch/i386/Makefile
+		#arch/x86/Makefile
 		cflags-y += $(shell \
 		if [ $(call cc-version) -ge 0300 ] ; then \
 			echo "-mregparm=3"; fi ;)
@@ -802,7 +802,7 @@ but in the architecture makefiles where the kbuild infrastructure
 is not sufficient this sometimes needs to be explicit.
 
 	Example:
-		#arch/i386/boot/Makefile
+		#arch/x86/boot/Makefile
 		subdir- := compressed/
 
 The above assignment instructs kbuild to descend down in the
@@ -812,12 +812,12 @@ To support the clean infrastructure in the Makefiles that builds the
 final bootimage there is an optional target named archclean:
 
 	Example:
-		#arch/i386/Makefile
+		#arch/x86/Makefile
 		archclean:
-			$(Q)$(MAKE) $(clean)=arch/i386/boot
+			$(Q)$(MAKE) $(clean)=arch/x86/boot
 
-When "make clean" is executed, make will descend down in arch/i386/boot,
-and clean as usual. The Makefile located in arch/i386/boot/ may use
+When "make clean" is executed, make will descend down in arch/x86/boot,
+and clean as usual. The Makefile located in arch/x86/boot/ may use
 the subdir- trick to descend further down.
 
 Note 1: arch/$(ARCH)/Makefile cannot use "subdir-", because that file is
@@ -882,7 +882,7 @@ When kbuild executes, the following steps are followed (roughly):
 	LDFLAGS_vmlinux uses the LDFLAGS_$@ support.
 
 	Example:
-		#arch/i386/Makefile
+		#arch/x86/Makefile
 		LDFLAGS_vmlinux := -e stext
 
     OBJCOPYFLAGS	objcopy flags
@@ -920,14 +920,14 @@ When kbuild executes, the following steps are followed (roughly):
 	Often, the KBUILD_CFLAGS variable depends on the configuration.
 
 	Example:
-		#arch/i386/Makefile
+		#arch/x86/Makefile
 		cflags-$(CONFIG_M386) += -march=i386
 		KBUILD_CFLAGS += $(cflags-y)
 
 	Many arch Makefiles dynamically run the target C compiler to
 	probe supported options:
 
-		#arch/i386/Makefile
+		#arch/x86/Makefile
 
 		...
 		cflags-$(CONFIG_MPENTIUMII)     += $(call cc-option,\
@@ -1038,8 +1038,8 @@ When kbuild executes, the following steps are followed (roughly):
 	into the arch/$(ARCH)/boot/Makefile.
 
 	Example:
-		#arch/i386/Makefile
-		boot := arch/i386/boot
+		#arch/x86/Makefile
+		boot := arch/x86/boot
 		bzImage: vmlinux
 			$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
@@ -1051,7 +1051,7 @@ When kbuild executes, the following steps are followed (roughly):
 	To support this, $(archhelp) must be defined.
 
 	Example:
-		#arch/i386/Makefile
+		#arch/x86/Makefile
 		define archhelp
 		  echo  '* bzImage      - Image (arch/$(ARCH)/boot/bzImage)'
 		endif
@@ -1065,7 +1065,7 @@ When kbuild executes, the following steps are followed (roughly):
 	from vmlinux.
 
 	Example:
-		#arch/i386/Makefile
+		#arch/x86/Makefile
 		all: bzImage
 
 	When "make" is executed without arguments, bzImage will be built.
@@ -1083,7 +1083,7 @@ When kbuild executes, the following steps are followed (roughly):
 	2) kbuild knows what files to delete during "make clean"
 
 	Example:
-		#arch/i386/kernel/Makefile
+		#arch/x86/kernel/Makefile
 		extra-y := head.o init_task.o
 
 	In this example, extra-y is used to list object files that
@@ -1133,7 +1133,7 @@ When kbuild executes, the following steps are followed (roughly):
 	Compress target. Use maximum compression to compress target.
 
 	Example:
-		#arch/i386/boot/Makefile
+		#arch/x86/boot/Makefile
 		LDFLAGS_bootsect := -Ttext 0x0 -s --oformat binary
 		LDFLAGS_setup    := -Ttext 0x0 -s --oformat binary -e begtext
 
@@ -1193,7 +1193,7 @@ When kbuild executes, the following steps are followed (roughly):
 
 	When updating the $(obj)/bzImage target, the line
 
-	BUILD    arch/i386/boot/bzImage
+	BUILD    arch/x86/boot/bzImage
 
 	will be displayed with "make KBUILD_VERBOSE=0".
 
@@ -1207,7 +1207,7 @@ When kbuild executes, the following steps are followed (roughly):
 	kbuild knows .lds files and includes a rule *lds.S -> *lds.
 
 	Example:
-		#arch/i386/kernel/Makefile
+		#arch/x86/kernel/Makefile
 		always := vmlinux.lds
 
 		#Makefile

Documentation/magic-number.txt

View file

diff --git a/Documentation/magic-number.txt b/Documentation/magic-number.txt
index 4b12abc..abf481f 100644
--- a/Documentation/magic-number.txt
+++ b/Documentation/magic-number.txt
@@ -66,7 +66,7 @@ MKISS_DRIVER_MAGIC    0x04bf      mkiss_channel     drivers/net/mkiss.h
 RISCOM8_MAGIC         0x0907      riscom_port       drivers/char/riscom8.h
 SPECIALIX_MAGIC       0x0907      specialix_port    drivers/char/specialix_io8.h
 HDLC_MAGIC            0x239e      n_hdlc            drivers/char/n_hdlc.c
-APM_BIOS_MAGIC        0x4101      apm_user          arch/i386/kernel/apm.c
+APM_BIOS_MAGIC        0x4101      apm_user          arch/x86/kernel/apm_32.c
 CYCLADES_MAGIC        0x4359      cyclades_port     include/linux/cyclades.h
 DB_MAGIC              0x4442      fc_info           drivers/net/iph5526_novram.c
 DL_MAGIC              0x444d      fc_info           drivers/net/iph5526_novram.c

Documentation/mca.txt

View file

diff --git a/Documentation/mca.txt b/Documentation/mca.txt
index 510375d..dfd130c 100644
--- a/Documentation/mca.txt
+++ b/Documentation/mca.txt
@@ -11,7 +11,7 @@ Adapter Detection
 
 The ideal MCA adapter detection is done through the use of the
 Programmable Option Select registers.  Generic functions for doing
-this have been added in include/linux/mca.h and arch/i386/kernel/mca.c.
+this have been added in include/linux/mca.h and arch/x86/kernel/mca_32.c.
 Everything needed to detect adapters and read (and write) configuration
 information is there.  A number of MCA-specific drivers already use
 this.  The typical probe code looks like the following:
@@ -81,7 +81,7 @@ more people use shared IRQs on PCI machines.
 In general, an interrupt must be acknowledged not only at the ICU (which
 is done automagically by the kernel), but at the device level.  In
 particular, IRQ 0 must be reset after a timer interrupt (now done in
-arch/i386/kernel/time.c) or the first timer interrupt hangs the system.
+arch/x86/kernel/time.c) or the first timer interrupt hangs the system.
 There were also problems with the 1.3.x floppy drivers, but that seems
 to have been fixed.
 

Documentation/scheduler/sched-arch.txt

View file

diff --git a/Documentation/scheduler/sched-arch.txt b/Documentation/scheduler/sched-arch.txt
index d43dbcb..28aa107 100644
--- a/Documentation/scheduler/sched-arch.txt
+++ b/Documentation/scheduler/sched-arch.txt
@@ -66,7 +66,7 @@ Your cpu_idle routines need to obey the following rules:
 	    barrier issued (followed by a test of need_resched with
 	    interrupts disabled, as explained in 3).
 
-arch/i386/kernel/process.c has examples of both polling and
+arch/x86/kernel/process.c has examples of both polling and
 sleeping idle functions.
 
 

Documentation/scsi/BusLogic.txt

View file

diff --git a/Documentation/scsi/BusLogic.txt b/Documentation/scsi/BusLogic.txt
index d7fbc94..48e982c 100644
--- a/Documentation/scsi/BusLogic.txt
+++ b/Documentation/scsi/BusLogic.txt
@@ -553,7 +553,7 @@ replacing "/usr/src" with wherever you keep your Linux kernel source tree:
   make config
   make zImage
 
-Then install "arch/i386/boot/zImage" as your standard kernel, run lilo if
+Then install "arch/x86/boot/zImage" as your standard kernel, run lilo if
 appropriate, and reboot.
 
 

Documentation/serial/computone.txt

View file

diff --git a/Documentation/serial/computone.txt b/Documentation/serial/computone.txt
index c57ea47..60a6f65 100644
--- a/Documentation/serial/computone.txt
+++ b/Documentation/serial/computone.txt
@@ -87,7 +87,7 @@ c) Set address on ISA cards then:
 	   edit /usr/src/linux/drivers/char/ip2.c  
            (Optional - may be specified on kernel command line now)
 d) Run "make zImage" or whatever target you prefer.
-e) mv /usr/src/linux/arch/i386/boot/zImage to /boot.
+e) mv /usr/src/linux/arch/x86/boot/zImage to /boot.
 f) Add new config for this kernel into /etc/lilo.conf, run "lilo"
 	or copy to a floppy disk and boot from that floppy disk.
 g) Reboot using this kernel

Documentation/zh_CN/magic-number.txt

View file

diff --git a/Documentation/zh_CN/magic-number.txt b/Documentation/zh_CN/magic-number.txt
index 4c4ce85..c278f41 100644
--- a/Documentation/zh_CN/magic-number.txt
+++ b/Documentation/zh_CN/magic-number.txt
@@ -66,7 +66,7 @@ MKISS_DRIVER_MAGIC    0x04bf      mkiss_channel     drivers/net/mkiss.h
 RISCOM8_MAGIC         0x0907      riscom_port       drivers/char/riscom8.h
 SPECIALIX_MAGIC       0x0907      specialix_port    drivers/char/specialix_io8.h
 HDLC_MAGIC            0x239e      n_hdlc            drivers/char/n_hdlc.c
-APM_BIOS_MAGIC        0x4101      apm_user          arch/i386/kernel/apm.c
+APM_BIOS_MAGIC        0x4101      apm_user          arch/x86/kernel/apm_32.c
 CYCLADES_MAGIC        0x4359      cyclades_port     include/linux/cyclades.h
 DB_MAGIC              0x4442      fc_info           drivers/net/iph5526_novram.c
 DL_MAGIC              0x444d      fc_info           drivers/net/iph5526_novram.c

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 39d8822..efe0a4b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -696,7 +696,7 @@ T:	git git://git.infradead.org/users/cbou/linux-cns3xxx.git
 
 ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
 M:	Hartley Sweeten <[email protected]>
-M:	Ryan Mallon <[email protected]>
+M:	Ryan Mallon <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 S:	Maintained
 F:	arch/arm/mach-ep93xx/
@@ -1588,7 +1588,7 @@ F:	Documentation/sound/alsa/Bt87x.txt
 F:	sound/pci/bt87x.c
 
 BT8XXGPIO DRIVER
-M:	Michael Buesch <[email protected]>
+M:	Michael Buesch <[email protected]>
 W:	http://bu3sch.de/btgpio.php
 S:	Maintained
 F:	drivers/gpio/bt8xxgpio.c
@@ -5910,7 +5910,7 @@ S:	Maintained
 F:	drivers/net/sonic.*
 
 SONICS SILICON BACKPLANE DRIVER (SSB)
-M:	Michael Buesch <[email protected]>
+M:	Michael Buesch <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/ssb/

arch/alpha/include/asm/floppy.h

View file

diff --git a/arch/alpha/include/asm/floppy.h b/arch/alpha/include/asm/floppy.h
index 0be5041..46cefbd 100644
--- a/arch/alpha/include/asm/floppy.h
+++ b/arch/alpha/include/asm/floppy.h
@@ -27,7 +27,7 @@
 #define fd_cacheflush(addr,size) /* nothing */
 #define fd_request_irq()        request_irq(FLOPPY_IRQ, floppy_interrupt,\
 					    IRQF_DISABLED, "floppy", NULL)
-#define fd_free_irq()           free_irq(FLOPPY_IRQ, NULL);
+#define fd_free_irq()           free_irq(FLOPPY_IRQ, NULL)
 
 #ifdef CONFIG_PCI
 

arch/arm/common/scoop.c

View file

diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index c11af1e..a07b0e7 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -193,7 +193,7 @@ static int __devinit scoop_probe(struct platform_device *pdev)
 	spin_lock_init(&devptr->scoop_lock);
 
 	inf = pdev->dev.platform_data;
-	devptr->base = ioremap(mem->start, mem->end - mem->start + 1);
+	devptr->base = ioremap(mem->start, resource_size(mem));
 
 	if (!devptr->base) {
 		ret = -ENOMEM;

arch/arm/mach-at91/at91sam9261_devices.c

View file

diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
index 5004bf0..0f91792 100644
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
@@ -525,7 +525,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
 	if (ARRAY_SIZE(lcdc_resources) > 2) {
 		void __iomem *fb;
 		struct resource *fb_res = &lcdc_resources[2];
-		size_t fb_len = fb_res->end - fb_res->start + 1;
+		size_t fb_len = resource_size(fb_res);
 
 		fb = ioremap(fb_res->start, fb_len);
 		if (fb) {

arch/arm/mach-at91/board-snapper9260.c

View file

diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c
index 3eb0a11..6010ce1 100644
--- a/arch/arm/mach-at91/board-snapper9260.c
+++ b/arch/arm/mach-at91/board-snapper9260.c
@@ -4,7 +4,7 @@
  *  Copyright (C) 2010 Bluewater System Ltd
  *
  * Author: Andre Renaud <[email protected]>
- * Author: Ryan Mallon  <[email protected]>
+ * Author: Ryan Mallon
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

arch/arm/mach-dove/common.c

View file

diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index 5ed51b8..83dce85 100644
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -13,11 +13,9 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/pci.h>
-#include <linux/serial_8250.h>
 #include <linux/clk.h>
 #include <linux/mbus.h>
 #include <linux/ata_platform.h>
-#include <linux/serial_8250.h>
 #include <linux/gpio.h>
 #include <asm/page.h>
 #include <asm/setup.h>

arch/arm/mach-ep93xx/simone.c

View file

diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c
index d96dc1c..8392e95 100644
--- a/arch/arm/mach-ep93xx/simone.c
+++ b/arch/arm/mach-ep93xx/simone.c
@@ -2,7 +2,7 @@
  * arch/arm/mach-ep93xx/simone.c
  * Simplemachines Sim.One support.
  *
- * Copyright (C) 2010 Ryan Mallon <[email protected]>
+ * Copyright (C) 2010 Ryan Mallon
  *
  * Based on the 2.6.24.7 support:
  *   Copyright (C) 2009 Simplemachines
@@ -65,7 +65,7 @@ static void __init simone_init_machine(void)
 }
 
 MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board")
-/* Maintainer: Ryan Mallon <[email protected]> */
+/* Maintainer: Ryan Mallon */
 	.boot_params	= EP93XX_SDCE0_PHYS_BASE + 0x100,
 	.map_io		= ep93xx_map_io,
 	.init_irq	= ep93xx_init_irq,

arch/arm/mach-ep93xx/snappercl15.c

View file

diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c
index ac601fe..2e9c614 100644
--- a/arch/arm/mach-ep93xx/snappercl15.c
+++ b/arch/arm/mach-ep93xx/snappercl15.c
@@ -3,7 +3,7 @@
  * Bluewater Systems Snapper CL15 system module
  *
  * Copyright (C) 2009 Bluewater Systems Ltd
- * Author: Ryan Mallon <[email protected]>
+ * Author: Ryan Mallon
  *
  * NAND code adapted from driver by:
  *   Andre Renaud <[email protected]>
@@ -162,7 +162,7 @@ static void __init snappercl15_init_machine(void)