David Woodhouse 66643de455 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: include/asm-powerpc/unistd.h include/asm-sparc/unistd.h include/asm-sparc64/unistd.h Signed-off-by: David Woodhouse <dwmw2@infradead.org>		2006-05-24 09:22:21 +01:00
..
a.out.h	[SPARC64]: Increase top of 32-bit process stack.	2006-03-20 01:16:36 -08:00
agp.h	[PATCH] AGP fix for Xen VMM	2005-06-07 12:35:43 -07:00
apb.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
asi.h	[SPARC64]: Sun4v specific ASI defines.	2006-03-20 01:11:43 -08:00
atomic.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
auxio.h	[SPARC64]: Get rid of fast IRQ feature.	2005-06-27 17:04:45 -07:00
auxvec.h	[PATCH] auxiliary vector cleanups	2005-09-07 16:57:21 -07:00
bbc.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
bitops.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
bpp.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
bsderrno.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
bug.h	[PATCH] remove all kernel BUGs	2005-05-01 08:59:01 -07:00
bugs.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
byteorder.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
cache.h	[PATCH] Move read_mostly definition to asm/cache.h	2006-03-23 07:38:10 -08:00
cacheflush.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
chafsr.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
checksum.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
chmctrl.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
cmt.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
compat.h	[PATCH] compat: be more consistent about [ug]id_t	2005-09-07 16:57:19 -07:00
const.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
cpudata.h	[SPARC64]: Add a secondary TSB for hugepage mappings.	2006-03-22 01:15:14 -08:00
cputime.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
current.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
dcr.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
dcu.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
delay.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
display7seg.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
div64.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
dma-mapping.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-05-24 09:22:21 +01:00
dma.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
ebus.h	[SPARC]: More abstractions and cleanups of dma handling in cs4231.	2005-11-07 14:09:19 -08:00
elf.h	[SPARC64]: Add HWCAP_SPARC_BLKINIT elf capability flag for Niagara.	2006-03-20 01:13:26 -08:00
emergency-restart.h	[PATCH] Add emergency_restart()	2005-07-26 14:35:41 -07:00
envctrl.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
errno.h	[PATCH] add EOWNERDEAD and ENOTRECOVERABLE version 2	2005-05-01 08:59:06 -07:00
estate.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
fbio.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
fcntl.h	[PATCH] Clean up struct flock definitions	2005-09-07 16:57:38 -07:00
fhc.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
floppy.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
fpumacro.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
futex.h	[SPARC64]: Implement futex_atomic_cmpxchg_inatomic().	2006-03-28 01:00:08 -08:00
hardirq.h	[SPARC64]: Eliminate irq_cpustat_t.	2005-08-29 22:46:43 -07:00
head.h	[SPARC64]: Add GET_GL_GLOBAL() macro for SUN4V.	2006-03-20 01:13:18 -08:00
hw_irq.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
hypervisor.h	[SPARC64]: Fix bugs in SUN4V cpu mondo dispatch.	2006-03-20 01:14:09 -08:00
ide.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
idprom.h	[SPARC]: Clean up idprom header files.	2006-03-20 01:12:08 -08:00
intr_queue.h	[SPARC64]: Sun4v interrupt queue register definitions.	2006-03-20 01:11:44 -08:00
io.h	[SPARC64]: Use 'unsigned long' for port argument to I/O string ops.	2005-08-31 15:01:33 -07:00
ioctl.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
ioctls.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
iommu.h	[SPARC64]: Fix streaming buffer flushing on PCI and SBUS.	2005-05-31 16:57:59 -07:00
ipc.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
ipcbuf.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
irq.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
isa.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
kdebug.h	[PATCH] Notifier chain update: API changes	2006-03-27 08:44:50 -08:00
kmap_types.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
kprobes.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
linkage.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
local.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
lsu.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
mc146818rtc.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
mman.h	[PATCH] add asm-generic/mman.h	2006-02-15 15:32:22 -08:00
mmu_context.h	[SPARC64]: Add a secondary TSB for hugepage mappings.	2006-03-22 01:15:14 -08:00
mmu.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
module.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
mostek.h	[PATCH] mostek bogus sparse annotations fixed	2005-04-24 12:28:36 -07:00
msgbuf.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
mutex.h	[PATCH] mutex subsystem, add default include/asm-*/mutex.h files	2006-01-09 15:59:19 -08:00
namei.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
ns87303.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
numnodes.h	[SPARC64]: Move over to sparsemem.	2006-03-20 01:14:22 -08:00
openprom.h	[SPARC64]: Rewrite convoluted physical memory probing.	2005-09-29 17:58:26 -07:00
openpromio.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
oplib.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
page.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
param.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
parport.h	[SPARC64]: Fix enable_dma() in asm-sparc64/parport.h	2005-07-06 15:41:54 -07:00
pbm.h	[SPARC64]: More SUN4V PCI controller work.	2006-03-20 01:12:11 -08:00
pci.h	[SPARC64]: Respect gfp_t argument to dma_alloc_coherent().	2006-05-23 02:07:22 -07:00
pconf.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
percpu.h	[PATCH] for_each_possible_cpu: sparc64	2006-04-11 06:18:31 -07:00
perfctr.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
pgalloc.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
pgtable.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
pil.h	[SPARC64]: Fix new context version SMP handling.	2006-03-20 01:14:21 -08:00
poll.h	[PATCH] POLLRDHUP/EPOLLRDHUP handling for half-closed devices notifications	2006-03-25 08:22:56 -08:00
posix_types.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
processor.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
psrcompat.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
pstate.h	[SPARC64]: Fixup TSTATE layout diagram in asm/pstate.h	2006-03-20 01:13:02 -08:00
ptrace.h	[PATCH] consolidate sys_ptrace()	2005-11-07 07:53:42 -08:00
reg.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
resource.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
rtc.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
rwsem-const.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
rwsem.h	[PATCH] add sem_is_read/write_locked()	2005-10-29 21:40:35 -07:00
sbus.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
scatterlist.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
scratchpad.h	[SPARC64]: Sun4v scratchpad register layout.	2006-03-20 01:11:44 -08:00
seccomp.h	[SPARC64]: Add missing asm-sparc64/seccomp.h file.	2005-07-11 13:44:56 -07:00
sections.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
semaphore.h	[PATCH] semaphore: Remove __MUTEX_INITIALIZER()	2005-10-30 17:37:27 -08:00
sembuf.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
setup.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
sfafsr.h	[SPARC64]: Revamp Spitfire error trap handling.	2005-08-29 12:45:11 -07:00
sfp-machine.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
shmbuf.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
shmparam.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
sigcontext.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
siginfo.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
signal.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
smp.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
socket.h	[NET]: Introduce SO_{SND,RCV}BUFFORCE socket options	2005-08-29 15:31:35 -07:00
sockios.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
solerrno.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
sparsemem.h	[SPARC64]: Move over to sparsemem.	2006-03-20 01:14:22 -08:00
spinlock_types.h	[PATCH] spinlock consolidation	2005-09-10 10:06:21 -07:00
spinlock.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
spitfire.h	[SPARC64]: Add 'hypervisor' to ultra_tlb_type enumeration.	2006-03-20 01:11:39 -08:00
starfire.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
stat.h	[PATCH] sparc64: Fix stat	2005-04-18 15:13:15 -07:00
statfs.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
string.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
sunbpp.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
svr4.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
system.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
termbits.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
termios.h	[SPARC]: remove duplicate TIOCPKT_ definitions	2005-11-07 14:10:42 -08:00
thread_info.h	[SPARC64]: Correctable ECC errors cannot occur at trap level > 0.	2006-03-20 01:11:33 -08:00
timer.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
timex.h	[SPARC64]: Define ARCH_HAS_READ_CURRENT_TIMER.	2006-03-20 01:13:29 -08:00
tlb.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
tlbflush.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-05-06 19:59:18 +01:00
topology.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
tsb.h	[SPARC64]: Create a seperate kernel TSB for 4MB/256MB mappings.	2006-03-20 01:13:56 -08:00
ttable.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
types.h	[PATCH] sab: consolidate kmem_bufctl_t	2005-09-05 00:05:48 -07:00
uaccess.h	[SPARC64]: __bzero_noasi --> __clear_user	2006-03-20 01:13:28 -08:00
uctx.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
unaligned.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
unistd.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-05-24 09:22:21 +01:00
upa.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
user.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
utrap.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
vdev.h	[SPARC64]: Decode virtual-devices interrupts correctly.	2006-03-20 01:13:05 -08:00
vga.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
visasm.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
watchdog.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
xor.h	[SPARC64]: Niagara optimized XOR functions for RAID.	2006-03-20 01:14:03 -08:00