Linus Torvalds 4d3ce21fa9 Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6 ... * master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6: (23 commits) [PARISC] Move os_id_to_string() inside #ifndef __ASSEMBLY__ [PARISC] Fix do_gettimeofday() hang [PARISC] Fix PCREL22F relocation problem for most modules [PARISC] Refactor show_regs in traps.c [PARISC] Add os_id_to_string helper [PARISC] OS_ID_LINUX == 0x0006 [PARISC] Ensure Space ID hashing is turned off [PARISC] Match show_cache_info with reality [PARISC] Remove unused macro fixup_branch in syscall.S [PARISC] Add is_compat_task() helper [PARISC] Update Thibaut Varene's CREDITS entry [PARISC] Reduce data footprint in pdc_stable.c [PARISC] pdc_stable version 0.30 [PARISC] Work around machines which do not support chassis warnings [PARISC] PDC_CHASSIS is implemented on all machines [PARISC] Remove unconditional #define PIC in syscall macros [PARISC] Use MFIA in current_text_addr on pa2.0 processors [PARISC] Remove dead function pc_in_user_space [PARISC] Test ioc_needs_fdc variable instead of open coding [PARISC] Fix gcc 4.1 warnings in sba_iommu.c ...		2006-06-29 11:30:45 -07:00
..
a.out.h
asmregs.h
assembly.h	[PARISC] Ensure all ldcw uses are ldcw,co on pa2.0	2006-06-27 23:28:32 +00:00
atomic.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
auxvec.h	[PATCH] auxiliary vector cleanups	2005-09-07 16:57:21 -07:00
bitops.h	[PATCH] bitops: parisc: use generic bitops	2006-03-26 08:57:14 -08:00
bug.h
bugs.h
byteorder.h
cache.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
cacheflush.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
checksum.h
compat_rt_sigframe.h
compat_signal.h
compat_ucontext.h	[PARISC] Arch-specific compat signals	2006-01-22 20:57:42 -05:00
compat.h	[PARISC] Add is_compat_task() helper	2006-06-27 23:28:40 +00:00
cputime.h
current.h
delay.h
div64.h
dma-mapping.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
dma.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
eisa_bus.h
eisa_eeprom.h
elf.h
emergency-restart.h
errno.h	[PARISC] Add ECANCELED to errno.h	2005-10-21 22:53:43 -04:00
fcntl.h	[PATCH] Clean up struct flock64 definitions	2005-09-07 16:57:38 -07:00
fixmap.h
floppy.h	[PATCH] random: remove SA_SAMPLE_RANDOM from floppy driver	2006-06-25 10:01:00 -07:00
futex.h	[PATCH] consolidate asm/futex.h	2006-01-08 20:13:39 -08:00
grfioctl.h	[PARISC] Use kzalloc and other janitor-style cleanups	2006-01-22 20:26:31 -05:00
hardirq.h
hardware.h
hw_irq.h	[PATCH] genirq: add ->retrigger() irq op to consolidate hw_irq_resend()	2006-06-29 10:26:23 -07:00
ide.h	[PATCH] remove some more check_region stuff	2005-10-30 17:37:18 -08:00
io.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
ioctl.h
ioctls.h
iosapic.h
ipcbuf.h
irq.h	[PATCH] genirq: cleanup: turn ARCH_HAS_IRQ_PER_CPU into CONFIG_IRQ_PER_CPU	2006-06-29 10:26:23 -07:00
kmap_types.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
led.h	[PARISC] Use work queue in LED/LCD driver instead of tasklet.	2005-10-21 22:46:18 -04:00
linkage.h
local.h	[PARISC] Make local_t use atomic_long_t	2006-03-30 17:48:56 +00:00
machdep.h
mc146818rtc.h
mman.h	[PATCH] add asm-generic/mman.h	2006-02-15 15:32:22 -08:00
mmu_context.h
mmu.h
mmzone.h	[PATCH] Delete unused definitions of kvaddr_to_nid	2006-06-23 07:42:52 -07:00
module.h
msgbuf.h
mutex.h	[PATCH] mutex subsystem, add default include/asm-*/mutex.h files	2006-01-09 15:59:19 -08:00
namei.h
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
parisc-device.h	[PARISC] Convert parisc_device to use struct resource for hpa	2005-10-21 22:36:40 -04:00
parport.h
pci.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
pdc_chassis.h	[PARISC] Clarify pdc_stable license terms	2006-03-30 17:48:41 +00:00
pdc.h	[PARISC] Move os_id_to_string() inside #ifndef __ASSEMBLY__	2006-06-27 23:28:45 +00:00
pdcpat.h
percpu.h
perf.h
pgalloc.h	[PARISC] Drop unused do_check_pgt_cache()	2006-01-22 20:26:37 -05:00
pgtable.h	[PARISC] Whitespace clean up in asm/pgtable.h	2006-06-27 23:28:33 +00:00
poll.h	[PATCH] POLLRDHUP/EPOLLRDHUP handling for half-closed devices notifications	2006-03-25 08:22:56 -08:00
posix_types.h
processor.h	[PARISC] Use MFIA in current_text_addr on pa2.0 processors	2006-06-27 23:28:36 +00:00
psw.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
ptrace.h	[PARISC] Take into account nullified insn and lock functions for profiling	2005-10-21 22:42:18 -04:00
real.h
resource.h
rt_sigframe.h	[PARISC] Arch-specific compat signals	2006-01-22 20:57:42 -05:00
rtc.h
runway.h
scatterlist.h
sections.h
segment.h
semaphore-helper.h
semaphore.h	[PATCH] semaphore: Remove __MUTEX_INITIALIZER()	2005-10-30 17:37:27 -08:00
sembuf.h
serial.h
setup.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
smp.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
socket.h
sockios.h
spinlock_types.h	[PARISC] Update spinlocks from parisc tree	2005-10-21 22:41:25 -04:00
spinlock.h	[PARISC] More useful readwrite lock helpers	2006-03-30 17:48:53 +00:00
stat.h
statfs.h
string.h
superio.h
system.h	[PARISC] Ensure all ldcw uses are ldcw,co on pa2.0	2006-06-27 23:28:32 +00:00
termbits.h
termios.h
thread_info.h	[PARISC] Add PREEMPT support	2006-03-30 17:48:54 +00:00
timex.h
tlb.h
tlbflush.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
topology.h
traps.h
types.h	[PARISC] Update bitops from parisc tree	2005-10-21 22:45:22 -04:00
uaccess.h	[PARISC] Use FIXUP_BRANCH_CLOBBER to asm clobber list	2006-06-27 23:28:33 +00:00
ucontext.h
unaligned.h
unistd.h	[PARISC] Remove unconditional #define PIC in syscall macros	2006-06-27 23:28:36 +00:00
unwind.h
user.h
xor.h