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
..
asm-offsets.c	[PARISC] Further work for multiple page sizes	2006-04-21 22:20:34 +00:00
binfmt_elf32.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
cache.c	[PARISC] Ensure Space ID hashing is turned off	2006-06-27 23:28:42 +00:00
drivers.c	[PARISC] Use kzalloc and other janitor-style cleanups	2006-01-22 20:26:31 -05:00
entry.S	[PARISC] Ensure all ldcw uses are ldcw,co on pa2.0	2006-06-27 23:28:32 +00:00
firmware.c	[PARISC] OS_ID_LINUX == 0x0006	2006-06-27 23:28:42 +00:00
hardware.c	[PARISC] Fix Dino reporting on J2240	2006-01-10 21:53:14 -05:00
head.S	[PARISC] Further work for multiple page sizes	2006-04-21 22:20:34 +00:00
hpmc.S	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
init_task.c	[PARISC] Further work for multiple page sizes	2006-04-21 22:20:34 +00:00
inventory.c	[PARISC] Add __read_mostly section for parisc	2006-01-10 20:35:03 -05:00
irq.c	[PATCH] genirq: add ->retrigger() irq op to consolidate hw_irq_resend()	2006-06-29 10:26:23 -07:00
Makefile	[PATCH] sanitize building of fs/compat_ioctl.c	2006-01-10 08:01:33 -08:00
module.c	[PARISC] Fix PCREL22F relocation problem for most modules	2006-06-27 23:28:44 +00:00
pa7300lc.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
pacache.S	[PARISC] Further work for multiple page sizes	2006-04-21 22:20:34 +00:00
parisc_ksyms.c	[PATCH] No arch-specific strpbrk implementations	2006-04-11 06:18:40 -07:00
pci-dma.c	[PARISC] Add __read_mostly section for parisc	2006-01-10 20:35:03 -05:00
pci.c	[PATCH] 64bit resource: change pci core and arch code to use resource_size_t	2006-06-27 09:24:00 -07:00
pdc_chassis.c	[PARISC] Work around machines which do not support chassis warnings	2006-06-27 23:28:37 +00:00
pdc_cons.c	[PARISC] Update pdc console from parisc tree	2005-10-21 22:50:06 -04:00
perf.c	[PARISC] I/O-Space must be ioremap_nocache()'d	2006-03-30 17:48:42 +00:00
perf_asm.S	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
perf_images.h	[PARISC] Use kzalloc and other janitor-style cleanups	2006-01-22 20:26:31 -05:00
process.c	[PATCH] kill include/linux/platform.h, default_idle() cleanup	2006-03-24 07:33:21 -08:00
processor.c	[PARISC] Add __read_mostly section for parisc	2006-01-10 20:35:03 -05:00
ptrace.c	[PARISC] Add is_compat_task() helper	2006-06-27 23:28:40 +00:00
real2.S	[PARISC] Remove dead function pc_in_user_space	2006-06-27 23:28:35 +00:00
semaphore.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
setup.c	[PARISC] OS_ID_LINUX == 0x0006	2006-06-27 23:28:42 +00:00
signal.c	[PARISC] Add is_compat_task() helper	2006-06-27 23:28:40 +00:00
signal32.c	[PARISC] Arch-specific compat signals	2006-01-22 20:57:42 -05:00
signal32.h	[PARISC] Arch-specific compat signals	2006-01-22 20:57:42 -05:00
smp.c	[PATCH] more for_each_cpu() conversions	2006-03-23 07:38:17 -08:00
sys32.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
sys_parisc.c	[PARISC] Add new entries to the syscall table	2006-04-21 22:20:35 +00:00
sys_parisc32.c	[PATCH] consolidate sys32/compat_adjtimex	2006-03-26 08:56:57 -08:00
syscall.S	[PARISC] Remove unused macro fixup_branch in syscall.S	2006-06-27 23:28:40 +00:00
syscall_table.S	[PARISC] Add new entries to the syscall table	2006-04-21 22:20:35 +00:00
time.c	[PARISC] Fix do_gettimeofday() hang	2006-06-27 23:28:45 +00:00
topology.c	[PATCH] node hotplug: register cpu: remove node struct	2006-06-27 17:32:37 -07:00
traps.c	[PARISC] Refactor show_regs in traps.c	2006-06-27 23:28:44 +00:00
unaligned.c	[PARISC] Use FIXUP_BRANCH_CLOBBER to asm clobber list	2006-06-27 23:28:33 +00:00
unwind.c	[PARISC] Add __read_mostly section for parisc	2006-01-10 20:35:03 -05:00
vmlinux.lds.S	[PARISC] Further work for multiple page sizes	2006-04-21 22:20:34 +00:00