Linus Torvalds d3ec4844d4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... * '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)		2011-07-25 13:56:39 -07:00
..
a.out-core.h
a.out.h	alpha: introduce field 'taso' into struct linux_binprm	2008-10-16 11:21:38 -07:00
agp.h	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
agp_backend.h
asm-offsets.h	kbuild: move asm-offsets.h to include/generated	2009-12-12 13:08:14 +01:00
atomic.h	atomic_t: Cast to volatile when accessing atomic variables	2010-05-17 07:57:27 -07:00
auxvec.h
barrier.h	alpha: futex implementation	2009-05-02 15:36:10 -07:00
bitops.h	bitops: remove minix bitops from asm/bitops.h	2011-03-23 19:46:22 -07:00
bitsperlong.h	asm-generic: introduce asm/bitsperlong.h	2009-06-11 21:02:14 +02:00
bug.h	alpha: Convert BUG() to use unreachable()	2009-12-18 01:14:52 -05:00
bugs.h
byteorder.h	byteorder: make swab.h include asm/swab.h like a regular header	2009-01-14 19:56:50 -08:00
cache.h	alpha: remove homegrown L1_CACHE_ALIGN macro	2010-08-31 22:45:31 -04:00
cacheflush.h	mm: Fix out-of-date comments which refers non-existent functions	2011-02-17 16:54:39 +01:00
checksum.h
compiler.h
console.h
core_apecs.h
core_cia.h
core_irongate.h
core_lca.h
core_marvel.h	alpha: fix compile errors in dma-mapping-common.h	2010-03-18 22:35:28 -04:00
core_mcpcia.h	alpha: use single HAE window on T2 core logic (gamma, sable)	2010-10-26 16:52:12 -07:00
core_polaris.h
core_t2.h	alpha: use single HAE window on T2 core logic (gamma, sable)	2010-10-26 16:52:12 -07:00
core_titan.h	alpha: fix compile errors in dma-mapping-common.h	2010-03-18 22:35:28 -04:00
core_tsunami.h	alpha: fix compile errors in dma-mapping-common.h	2010-03-18 22:35:28 -04:00
core_wildfire.h
cputime.h
current.h
delay.h
device.h
div64.h
dma-mapping.h	dma-mapping: remove dma_is_consistent API	2010-08-11 08:59:21 -07:00
dma.h
elf.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
emergency-restart.h
err_common.h
err_ev6.h
err_ev7.h
errno.h	mm: make __get_user_pages return -EHWPOISON for HWPOISON page optionally	2011-03-17 13:08:27 -03:00
fb.h
fcntl.h	vfs: add nonconflicting values for O_PATH	2011-03-16 09:54:02 -04:00
floppy.h	treewide: fix potentially dangerous trailing ';' in #defined values/expressions	2011-07-21 14:10:00 +02:00
fpu.h
ftrace.h	tracing: make CALLER_ADDRx overwriteable	2009-03-02 16:49:37 -05:00
futex.h	futex: Sanitize futex ops argument types	2011-03-11 12:23:31 +01:00
gct.h
gentrap.h
gpio.h	alpha: hook up gpiolib support	2011-05-25 08:39:38 -07:00
hardirq.h	alpha: convert to asm-generic/hardirq.h	2009-09-22 07:17:43 -07:00
hw_irq.h	alpha: add performance monitor interrupt counter	2010-08-09 20:45:03 -07:00
hwrpb.h
io.h	alpha: fix breakage caused by df9ee29270	2011-01-17 05:42:15 +01:00
io_trivial.h
ioctl.h
ioctls.h	tty: add TIOCVHANGUP to allow clean tty shutdown of all ttys	2011-02-17 14:16:30 -08:00
ipcbuf.h
irq.h	alpha: kill off alpha_do_IRQ	2011-01-17 05:42:13 +01:00
irq_regs.h
irqflags.h	Fix IRQ flag handling naming	2010-10-07 14:08:55 +01:00
jensen.h
Kbuild	archs: replace unifdef-y with header-y	2010-08-14 22:26:51 +02:00
kdebug.h
kmap_types.h	kmap_types: make most arches use generic header file	2009-06-16 19:47:51 -07:00
linkage.h
local.h	local_t: Remove cpu_local_xx macros	2010-01-05 15:34:49 +09:00
local64.h	arch: Implement local64_t	2010-06-09 11:12:36 +02:00
machvec.h	alpha: convert u64 to unsigned long long	2009-04-01 08:59:16 -07:00
mc146818rtc.h
mman.h	thp: mm: define MADV_NOHUGEPAGE	2011-01-13 17:32:47 -08:00
mmu.h
mmu_context.h
mmzone.h	Fix node_start/end_pfn() definition for mm/page_cgroup.c	2011-06-27 14:13:09 -07:00
module.h
msgbuf.h
mutex.h
page.h	asm-generic: rename page.h and uaccess.h	2009-06-11 21:02:17 +02:00
pal.h
param.h
parport.h
pci.h	dma-mapping: alpha: use include/linux/pci-dma-compat.h	2010-03-12 15:52:42 -08:00
percpu.h	alpha: fix percpu build breakage	2009-06-30 18:55:59 -07:00
perf_event.h	perf, arch: Cleanup perf-pmu init vs lockup-detector	2010-11-26 15:14:56 +01:00
pgalloc.h	alpha: make pte_alloc_one_kernel() inline	2009-01-15 16:39:40 -08:00
pgtable.h	mm: remove pte_*map_nested()	2010-10-26 16:52:08 -07:00
poll.h
posix_types.h
processor.h
ptrace.h	alpha: use generic ptrace_resume code	2010-03-12 15:52:38 -08:00
reg.h
regdef.h
resource.h
rtc.h	alpha: fix RTC on marvel	2009-01-15 16:39:40 -08:00
rwsem.h	rwsem: Move duplicate function prototypes to linux/rwsem.h	2011-01-27 12:30:39 +01:00
scatterlist.h	remove needless ISA_DMA_THRESHOLD	2010-08-07 18:15:50 +02:00
sections.h
segment.h
sembuf.h
serial.h
setup.h
sfp-machine.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h	asm-generic: rename termios.h, signal.h and mman.h	2009-06-11 21:01:52 +02:00
smp.h	Remove unused PROC_CHANGE_PENALTY constant	2011-05-25 08:39:43 -07:00
socket.h	net: Generalize socket rx gap / receive queue overflow cmsg	2009-10-12 13:26:31 -07:00
sockios.h
spinlock.h	locking: Convert raw_rwlock functions to arch_rwlock	2009-12-14 23:55:32 +01:00
spinlock_types.h	locking: Convert raw_rwlock to arch_rwlock	2009-12-14 23:55:32 +01:00
stat.h
statfs.h	headers_check fix: alpha, statfs.h	2009-02-01 11:01:22 +05:30
string.h
swab.h	headers_check fix: alpha, swab.h	2009-02-01 11:01:22 +05:30
sysinfo.h
system.h	Fix IRQ flag handling naming	2010-10-07 14:08:55 +01:00
termbits.h	tty: Add EXTPROC support for LINEMODE	2010-08-10 13:47:39 -07:00
termios.h
thread_info.h	add descriptive comment for TIF_MEMDIE task flag declaration.	2010-05-14 11:13:27 +02:00
timex.h
tlb.h	mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()	2009-07-27 12:10:38 -07:00
tlbflush.h	alpha: switch to dynamic percpu allocator	2009-06-24 15:13:52 +09:00
topology.h	alpha: cpumask_of_node() should handle -1 as a node	2010-01-14 13:21:35 -05:00
types.h	remove dma64_addr_t	2011-03-23 19:47:18 -07:00
uaccess.h	alpha: exception table sorting	2009-05-02 15:36:10 -07:00
ucontext.h
unaligned.h
unistd.h	ns: Wire up the setns system call	2011-05-28 10:48:39 -07:00
user.h
vga.h
wrperfmon.h	alpha: add wrperfmon.h header file to aid use of wrperfmon PALcall	2010-08-09 20:45:04 -07:00
xchg.h	alpha: xchg/cmpxchg cleanup and fixes	2009-04-01 08:59:16 -07:00
xor.h