Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/include/asm-m32r
History
Linus Torvalds ea62ccd00f Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 
* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: (231 commits)
  [PATCH] i386: Don't delete cpu_devs data to identify different x86 types in late_initcall
  [PATCH] i386: type may be unused
  [PATCH] i386: Some additional chipset register values validation.
  [PATCH] i386: Add missing !X86_PAE dependincy to the 2G/2G split.
  [PATCH] x86-64: Don't exclude asm-offsets.c in Documentation/dontdiff
  [PATCH] i386: avoid redundant preempt_disable in __unlazy_fpu
  [PATCH] i386: white space fixes in i387.h
  [PATCH] i386: Drop noisy e820 debugging printks
  [PATCH] x86-64: Fix allnoconfig error in genapic_flat.c
  [PATCH] x86-64: Shut up warnings for vfat compat ioctls on other file systems
  [PATCH] x86-64: Share identical video.S between i386 and x86-64
  [PATCH] x86-64: Remove CONFIG_REORDER
  [PATCH] x86-64: Print type and size correctly for unknown compat ioctls
  [PATCH] i386: Remove copy_*_user BUG_ONs for (size < 0)
  [PATCH] i386: Little cleanups in smpboot.c
  [PATCH] x86-64: Don't enable NUMA for a single node in K8 NUMA scanning
  [PATCH] x86: Use RDTSCP for synchronous get_cycles if possible
  [PATCH] i386: Add X86_FEATURE_RDTSCP
  [PATCH] i386: Implement X86_FEATURE_SYNC_RDTSC on i386
  [PATCH] i386: Implement alternative_io for i386
  ...

Fix up trivial conflict in include/linux/highmem.h manually.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-05 14:55:20 -07:00
..
m32104ut [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
m32700ut [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
mappi2 [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
mappi3 [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
opsput [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
a.out.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
addrspace.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
assembler.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
atomic.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
auxvec.h
bitops.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
bug.h
bugs.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
byteorder.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
cache.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
cachectl.h
cacheflush.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
checksum.h [NET]: M32R checksum annotations and cleanups. 2006-12-02 21:23:06 -08:00
cputime.h
current.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
delay.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
device.h Driver core: add dev_archdata to struct device 2006-12-01 14:52:01 -08:00
div64.h
dma-mapping.h [PATCH] m32r dma-mapping.h should simply include generic/dma-mapping-broken.h 2007-03-14 15:27:49 -07:00
dma.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
elf.h
emergency-restart.h
errno.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
fcntl.h
flat.h
futex.h
hardirq.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
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] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
io.h [PATCH] Consolidate check_signature 2006-10-11 11:14:23 -07:00
ioctl.h
ioctls.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
ipc.h
ipcbuf.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
irq.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
irq_regs.h [PATCH] m32r pt_regs fixes 2006-10-07 10:51:15 -07:00
Kbuild Add empty Kbuild files for 'make headers_install' in remaining arches. 2006-06-18 12:58:53 +01:00
kmap_types.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
linkage.h
local.h
m32r.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
m32r_mp_fpga.h
m32102.h [PATCH] m32r: support a synthesizable M32700 core 2006-12-08 08:28:37 -08:00
mc146818rtc.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
mman.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
mmu.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
mmu_context.h [PATCH] x86: PARAVIRT: add hooks to intercept mm creation and destruction 2007-05-02 19:27:14 +02:00
mmzone.h
module.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
msgbuf.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
mutex.h
namei.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
page.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
param.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
pci.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
percpu.h
pgalloc.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
pgtable-2level.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
pgtable.h [PATCH] Standardize pxx_page macros 2006-09-26 08:48:51 -07:00
poll.h
posix_types.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
processor.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
ptrace.h [PATCH] m32r: make userspace headers platform-independent 2006-12-08 08:28:37 -08:00
resource.h
rtc.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
s1d13806.h
scatterlist.h PCI: scatterlist.h needs types.h 2007-05-02 19:02:34 -07:00
sections.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
segment.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
semaphore.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
sembuf.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
serial.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
setup.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
shmbuf.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
shmparam.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
sigcontext.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
siginfo.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
signal.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
smp.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
socket.h [NET]: Adding SO_TIMESTAMPNS / SCM_TIMESTAMPNS support 2007-04-25 22:24:21 -07:00
sockios.h [NET]: Introduce SIOCGSTAMPNS ioctl to get timestamps with nanosec resolution 2007-04-25 22:24:04 -07:00
spinlock.h [PATCH] Directed yield: cpu_relax variants for spinlocks and rw-locks 2006-10-01 00:39:21 -07:00
spinlock_types.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
stat.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
statfs.h
string.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
syscall.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
system.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
termbits.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
termios.h [PATCH] consolidate line discipline number definitions 2007-02-11 10:51:26 -08:00
thread_info.h
timex.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
tlb.h
tlbflush.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
topology.h
types.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
uaccess.h [PATCH] fix sparse warnings from {asm,net}/checksum.h 2007-02-11 10:51:31 -08:00
ucontext.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
unaligned.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
unistd.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
user.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
vga.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00
xor.h [PATCH] m32r: cosmetic updates and trivial fixes 2007-02-11 10:51:20 -08:00