Linus Torvalds 008d23e485 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits) Documentation/trace/events.txt: Remove obsolete sched_signal_send. writeback: fix global_dirty_limits comment runtime -> real-time ppc: fix comment typo singal -> signal drivers: fix comment typo diable -> disable. m68k: fix comment typo diable -> disable. wireless: comment typo fix diable -> disable. media: comment typo fix diable -> disable. remove doc for obsolete dynamic-printk kernel-parameter remove extraneous 'is' from Documentation/iostats.txt Fix spelling milisec -> ms in snd_ps3 module parameter description Fix spelling mistakes in comments Revert conflicting V4L changes i7core_edac: fix typos in comments mm/rmap.c: fix comment sound, ca0106: Fix assignment to 'channel'. hrtimer: fix a typo in comment init/Kconfig: fix typo anon_inodes: fix wrong function name in comment fix comment typos concerning "consistent" poll: fix a typo in comment ... Fix up trivial conflicts in: - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c) - fs/ext4/ext4.h Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.		2011-01-13 10:05:56 -08:00
..
iseries
8xx_immap.h	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
8253pit.h
abs_addr.h
agp.h
asm-compat.h
asm-offsets.h
async_tx.h
atomic.h
auxvec.h
backlight.h
bitops.h	powerpc: Add support for popcnt instructions	2010-11-29 15:48:17 +11:00
bitsperlong.h
bootx.h
btext.h
bug.h
bugs.h
byteorder.h
cache.h
cacheflush.h
cell-pmu.h
cell-regs.h
checksum.h
clk_interface.h
code-patching.h
compat.h
cpm.h
cpm1.h
cpm2.h
cputable.h	powerpc: Add support for popcnt instructions	2010-11-29 15:48:17 +11:00
cputhreads.h	powerpc: Cleanup APIs for cpu/thread/core mappings	2010-11-29 15:48:19 +11:00
cputime.h	taskstats: use real microsecond granularity for CPU times	2010-10-27 18:03:17 -07:00
current.h
dbdma.h
dbell.h
dcr-generic.h
dcr-mmio.h
dcr-native.h
dcr-regs.h
dcr.h
delay.h
device.h	powerpc/macio: Ensure all dma routines get copied over	2010-11-29 15:48:21 +11:00
disassemble.h
div64.h
dma-mapping.h
dma.h
edac.h
eeh_event.h
eeh.h
elf.h
emergency-restart.h
emulated_ops.h
errno.h
exception-64e.h
exception-64s.h
fb.h
fcntl.h
feature-fixups.h
firmware.h	powerpc: Add VPHN firmware feature	2010-11-29 15:48:22 +11:00
fixmap.h
floppy.h
fs_pd.h
fsl_85xx_cache_sram.h	powerpc/85xx: add cache-sram support	2010-10-14 00:54:38 -05:00
fsl_gtm.h
fsl_guts.h
fsl_lbc.h	P4080/mtd: Fix the freescale lbc issue with 36bit mode	2010-10-25 15:41:04 +01:00
ftrace.h
futex.h
gpio.h
grackle.h
hardirq.h
heathrow.h
highmem.h	mm: stack based kmap_atomic()	2010-10-26 16:52:08 -07:00
hugetlb.h
hvcall.h	powerpc: Add VPHN firmware feature	2010-11-29 15:48:22 +11:00
hvconsole.h
hvcserver.h
hw_breakpoint.h
hw_irq.h
hydra.h	Update broken web addresses in arch directory.	2010-10-18 11:03:21 +02:00
i8259.h
ibmebus.h
ide.h
immap_cpm2.h
immap_qe.h
io-defs.h
io.h
ioctl.h
ioctls.h	TTY: Add tty ioctl to figure device node of the system console.	2010-12-16 16:18:28 -08:00
iommu.h
ipcbuf.h
ipic.h
irq_regs.h
irq.h
irqflags.h
Kbuild
kdebug.h
kdump.h
kexec.h	powerpc/kexec: make masking/disabling interrupts generic	2010-10-14 00:52:46 -05:00
keylargo.h
kgdb.h	kgdb,ppc: Individual register get/set for ppc	2010-10-29 13:14:42 -05:00
kmap_types.h
kprobes.h
kvm_44x.h
kvm_asm.h	KVM: PPC: Implement Level interrupts on Book3S	2010-10-24 10:52:19 +02:00
kvm_book3s_32.h
kvm_book3s_64.h
kvm_book3s_asm.h
kvm_book3s.h	KVM: PPC: Implement correct SID mapping on Book3s_32	2010-10-24 10:52:15 +02:00
kvm_booke.h
kvm_e500.h
kvm_fpu.h
kvm_host.h	KVM: PPC: Add book3s_32 tlbie flush acceleration	2010-10-24 10:50:58 +02:00
kvm_para.h	KVM: PPC: Move of include to __KERNEL__ section	2010-10-24 10:52:23 +02:00
kvm_ppc.h	KVM: PPC: Implement hypervisor interface	2010-10-24 10:50:45 +02:00
kvm.h	KVM: PPC: Implement Level interrupts on Book3S	2010-10-24 10:52:19 +02:00
libata-portmap.h
linkage.h
local.h
local64.h
lppaca.h	powerpc/pseries: Poll VPA for topology changes and update NUMA maps	2010-12-09 15:36:29 +11:00
lv1call.h
machdep.h	powerpc: Minor cleanups for machdep.h	2010-12-09 15:35:31 +11:00
macio.h
mc146818rtc.h
mediabay.h
memblock.h
mman.h
mmu_context.h
mmu-8xx.h
mmu-40x.h
mmu-44x.h
mmu-book3e.h	powerpc/fsl-booke: Add support for FSL Arch v1.0 MMU in setup_page_sizes	2010-10-14 00:55:09 -05:00
mmu-hash32.h
mmu-hash64.h
mmu.h
mmzone.h	powerpc: Add memory_hotplug_max()	2010-11-29 15:48:21 +11:00
module.h
mpc5xxx.h
mpc6xx.h
mpc8xx.h
mpc52xx_psc.h
mpc52xx.h
mpc5121.h
mpc8260.h
mpic.h
msgbuf.h
msi_bitmap.h
mutex.h
nvram.h	powerpc/nvram: Move the log partition stuff to pseries	2010-11-30 15:37:45 +11:00
ohare.h
oprofile_impl.h
paca.h	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2010-10-21 21:19:54 -07:00
page_32.h
page_64.h
page.h
param.h
parport.h
pasemi_dma.h
pci-bridge.h
pci.h
percpu.h
perf_event_fsl_emb.h
perf_event_server.h
perf_event.h
pgalloc-32.h
pgalloc-64.h
pgalloc.h
pgtable-ppc32.h	mm: remove pte_*map_nested()	2010-10-26 16:52:08 -07:00
pgtable-ppc64-4k.h
pgtable-ppc64-64k.h
pgtable-ppc64.h	mm: remove pte_*map_nested()	2010-10-26 16:52:08 -07:00
pgtable.h
phyp_dump.h
pmac_feature.h
pmac_low_i2c.h
pmac_pfunc.h
pmc.h
pmi.h
poll.h
posix_types.h
ppc_asm.h
ppc-opcode.h	powerpc: Hardcode popcnt instructions for old assemblers	2010-12-09 15:35:30 +11:00
ppc-pci.h	powerpc/pci: Fix return type of BUID_{HI,LO} macros	2010-10-13 16:19:20 +11:00
ppc4xx.h
processor.h	powerpc: Removing undead ifdef __KERNEL__	2010-11-29 15:48:18 +11:00
prom.h	of/address: use proper endianess in get_flags	2010-12-23 15:57:48 -07:00
ps3.h
ps3av.h
ps3fb.h
ps3gpu.h
ps3stor.h
pSeries_reconfig.h
pte-8xx.h
pte-40x.h
pte-44x.h
pte-book3e.h
pte-common.h	powerpc: Fix invalid page flags in create TLB CAM path for PTE_64BIT	2010-10-14 00:52:55 -05:00
pte-fsl-booke.h
pte-hash32.h
pte-hash64-4k.h
pte-hash64-64k.h
pte-hash64.h
ptrace.h
qe_ic.h
qe.h
reg_8xx.h
reg_booke.h
reg_fsl_emb.h
reg.h
resource.h
rheap.h
rio.h
rtas.h
rtc.h
rwsem.h
scatterlist.h
seccomp.h
sections.h
sembuf.h
serial.h
setjmp.h
setup.h
sfp-machine.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
smp.h
smu.h
socket.h
sockios.h
sparsemem.h
spinlock_types.h
spinlock.h
spu_csa.h
spu_info.h
spu_priv1.h
spu.h
sstep.h
stat.h
statfs.h
string.h
suspend.h
swab.h
swiotlb.h
synch.h
syscall.h
syscalls.h
systbl.h
system.h	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2010-10-21 21:19:54 -07:00
tce.h
termbits.h
termios.h
thread_info.h
time.h
timex.h
tlb.h
tlbflush.h
topology.h	powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA	2011-01-12 10:56:29 +11:00
trace.h
tsi108_irq.h
tsi108_pci.h
tsi108.h
types.h
uaccess.h
ucc_fast.h
ucc_slow.h
ucc.h
ucontext.h
udbg.h
uic.h
unaligned.h
uninorth.h
unistd.h
user.h
vdso_datapage.h	powerpc: Removing undead ifdef __KERNEL__	2010-11-29 15:48:18 +11:00
vdso.h
vga.h
vio.h
xilinx_intc.h
xilinx_pci.h
xmon.h
xor.h