diff options
| author | James Morris <jmorris@namei.org> | 2008-08-28 10:47:34 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-08-28 10:47:34 +1000 |
| commit | 86d688984deefa3ae5a802880c11f2b408b5d6cf (patch) | |
| tree | 7ea5e8189b0a774626d3ed7c3c87df2495a4c4a0 | |
| parent | 93c06cbbf9fea5d5be1778febb7fa9ab1a74e5f5 (diff) | |
| parent | 4c246edd2550304df5b766cc841584b2bb058843 (diff) | |
Merge branch 'master' into next
| -rw-r--r-- | Documentation/00-INDEX | 2 | ||||
| -rw-r--r-- | Documentation/DocBook/Makefile | 9 | ||||
| -rw-r--r-- | Documentation/DocBook/procfs_example.c | 4 | ||||
| -rw-r--r-- | Documentation/DocBook/s390-drivers.tmpl | 8 | ||||
| -rw-r--r-- | Documentation/DocBook/sh.tmpl | 105 | ||||
| -rw-r--r-- | Documentation/DocBook/videobook.tmpl | 2 | ||||
| -rw-r--r-- | Documentation/DocBook/z8530book.tmpl | 38 | ||||
| -rw-r--r-- | Documentation/Makefile | 3 | ||||
| -rw-r--r-- | Documentation/accounting/Makefile | 10 | ||||
| -rw-r--r-- | Documentation/accounting/getdelays.c | 25 | ||||
| -rw-r--r-- | Documentation/arm/IXP4xx | 2 | ||||
| -rw-r--r-- | Documentation/arm/Interrupts | 2 | ||||
| -rw-r--r-- | Documentation/arm/README | 4 | ||||
| -rw-r--r-- | Documentation/arm/Samsung-S3C24XX/GPIO.txt | 23 | ||||
| -rw-r--r-- | Documentation/arm/Samsung-S3C24XX/Overview.txt | 37 | ||||
| -rw-r--r-- | Documentation/arm/Samsung-S3C24XX/USB-Host.txt | 2 | ||||
| -rw-r--r-- | Documentation/auxdisplay/Makefile | 10 | ||||
| -rw-r--r-- | Documentation/cciss.txt | 21 | ||||
| -rw-r--r-- | Documentation/cli-sti-removal.txt | 133 | ||||
| -rw-r--r-- | Documentation/connector/Makefile | 11 | ||||
| -rw-r--r-- | Documentation/cpu-hotplug.txt | 5 | ||||
| -rw-r--r-- | Documentation/devices.txt | 3 | ||||
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 22 | ||||
| -rw-r--r-- | Documentation/filesystems/configfs/Makefile | 3 | ||||
| -rw-r--r-- | Documentation/filesystems/ext4.txt | 6 | ||||
| -rw-r--r-- | Documentation/filesystems/quota.txt | 22 | ||||
| -rw-r--r-- | Documentation/filesystems/ubifs.txt | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/dme1737 | 53 | ||||
| -rw-r--r-- | Documentation/hwmon/ibmaem | 33 | ||||
| -rw-r--r-- | Documentation/hwmon/it87 | 13 | ||||
| -rw-r--r-- | Documentation/hwmon/w83627hf | 4 | ||||
| -rw-r--r-- | Documentation/hwmon/w83791d | 6 | ||||
| -rw-r--r-- | Documentation/ia64/Makefile | 8 | ||||
| -rw-r--r-- | Documentation/ioctl-number.txt | 1 | ||||
| -rw-r--r-- | Documentation/ja_JP/HOWTO | 67 | ||||
| -rw-r--r-- | Documentation/ja_JP/SubmitChecklist | 111 | ||||
| -rw-r--r-- | Documentation/kernel-parameters.txt | 5 | ||||
| -rw-r--r-- | Documentation/lguest/lguest.c | 31 | ||||
| -rw-r--r-- | Documentation/networking/Makefile | 8 | ||||
| -rw-r--r-- | Documentation/networking/ifenslave.c | 2 | ||||
| -rw-r--r-- | Documentation/pcmcia/Makefile | 10 | ||||
| -rw-r--r-- | Documentation/pcmcia/crc32hash.c | 2 | ||||
| -rw-r--r-- | Documentation/power/pm_qos_interface.txt | 7 | ||||
| -rw-r--r-- | Documentation/powerpc/booting-without-of.txt | 4 | ||||
| -rw-r--r-- | Documentation/powerpc/eeh-pci-error-recovery.txt | 2 | ||||
| -rw-r--r-- | Documentation/rfkill.txt | 5 | ||||
| -rw-r--r-- | Documentation/scsi/ChangeLog.megaraid_sas | 23 | ||||
| -rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 10 | ||||
| -rw-r--r-- | Documentation/spi/Makefile | 11 | ||||
| -rw-r--r-- | Documentation/spi/pxa2xx | 4 | ||||
| -rw-r--r-- | Documentation/spi/spi-summary | 4 | ||||
| -rw-r--r-- | Documentation/usb/auerswald.txt | 30 | ||||
| -rw-r--r-- | Documentation/usb/power-management.txt | 7 | ||||
| -rw-r--r-- | Documentation/video4linux/Makefile | 8 | ||||
| -rw-r--r-- | Documentation/video4linux/gspca.txt | 1 | ||||
| -rw-r--r-- | Documentation/vm/Makefile | 8 | ||||
| -rw-r--r-- | Documentation/vm/page_migration | 9 | ||||
| -rw-r--r-- | Documentation/watchdog/src/Makefile | 8 | ||||
| -rw-r--r-- | MAINTAINERS | 150 | ||||
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | arch/alpha/include/asm/8253pit.h (renamed from include/asm-alpha/8253pit.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/Kbuild (renamed from include/asm-alpha/Kbuild) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/a.out-core.h (renamed from include/asm-alpha/a.out-core.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/a.out.h (renamed from include/asm-alpha/a.out.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/agp.h (renamed from include/asm-alpha/agp.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/agp_backend.h (renamed from include/asm-alpha/agp_backend.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/atomic.h (renamed from include/asm-alpha/atomic.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/auxvec.h (renamed from include/asm-alpha/auxvec.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/barrier.h (renamed from include/asm-alpha/barrier.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/bitops.h (renamed from include/asm-alpha/bitops.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/bug.h (renamed from include/asm-alpha/bug.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/bugs.h (renamed from include/asm-alpha/bugs.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/byteorder.h (renamed from include/asm-alpha/byteorder.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/cache.h (renamed from include/asm-alpha/cache.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/cacheflush.h (renamed from include/asm-alpha/cacheflush.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/checksum.h (renamed from include/asm-alpha/checksum.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/compiler.h (renamed from include/asm-alpha/compiler.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/console.h (renamed from include/asm-alpha/console.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/core_apecs.h (renamed from include/asm-alpha/core_apecs.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/core_cia.h (renamed from include/asm-alpha/core_cia.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/core_irongate.h (renamed from include/asm-alpha/core_irongate.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/core_lca.h (renamed from include/asm-alpha/core_lca.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/core_marvel.h (renamed from include/asm-alpha/core_marvel.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/core_mcpcia.h (renamed from include/asm-alpha/core_mcpcia.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/core_polaris.h (renamed from include/asm-alpha/core_polaris.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/core_t2.h (renamed from include/asm-alpha/core_t2.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/core_titan.h (renamed from include/asm-alpha/core_titan.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/core_tsunami.h (renamed from include/asm-alpha/core_tsunami.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/core_wildfire.h (renamed from include/asm-alpha/core_wildfire.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/cputime.h (renamed from include/asm-alpha/cputime.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/current.h (renamed from include/asm-alpha/current.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/delay.h (renamed from include/asm-alpha/delay.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/device.h (renamed from include/asm-alpha/device.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/div64.h (renamed from include/asm-alpha/div64.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/dma-mapping.h (renamed from include/asm-alpha/dma-mapping.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/dma.h (renamed from include/asm-alpha/dma.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/elf.h (renamed from include/asm-alpha/elf.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/emergency-restart.h (renamed from include/asm-alpha/emergency-restart.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/err_common.h (renamed from include/asm-alpha/err_common.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/err_ev6.h (renamed from include/asm-alpha/err_ev6.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/err_ev7.h (renamed from include/asm-alpha/err_ev7.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/errno.h (renamed from include/asm-alpha/errno.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/fb.h (renamed from include/asm-alpha/fb.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/fcntl.h (renamed from include/asm-alpha/fcntl.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/floppy.h (renamed from include/asm-alpha/floppy.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/fpu.h (renamed from include/asm-alpha/fpu.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/futex.h (renamed from include/asm-alpha/futex.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/gct.h (renamed from include/asm-alpha/gct.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/gentrap.h (renamed from include/asm-alpha/gentrap.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/hardirq.h (renamed from include/asm-alpha/hardirq.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/hw_irq.h (renamed from include/asm-alpha/hw_irq.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/hwrpb.h (renamed from include/asm-alpha/hwrpb.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/io.h (renamed from include/asm-alpha/io.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/io_trivial.h (renamed from include/asm-alpha/io_trivial.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/ioctl.h (renamed from include/asm-alpha/ioctl.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/ioctls.h (renamed from include/asm-alpha/ioctls.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/ipcbuf.h (renamed from include/asm-alpha/ipcbuf.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/irq.h (renamed from include/asm-alpha/irq.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/irq_regs.h (renamed from include/asm-alpha/irq_regs.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/jensen.h (renamed from include/asm-alpha/jensen.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/kdebug.h (renamed from include/asm-alpha/kdebug.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/kmap_types.h (renamed from include/asm-alpha/kmap_types.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/linkage.h (renamed from include/asm-alpha/linkage.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/local.h (renamed from include/asm-alpha/local.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/machvec.h (renamed from include/asm-alpha/machvec.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/mc146818rtc.h (renamed from include/asm-alpha/mc146818rtc.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/md.h (renamed from include/asm-alpha/md.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/mman.h (renamed from include/asm-alpha/mman.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/mmu.h (renamed from include/asm-alpha/mmu.h) | 0 | ||||
| -rw-r--r-- | arch/alpha/include/asm/mmu_context.h (renamed from include/asm-alpha/mmu_context.h) | 0 | ||||
| -rw-r--r-- |