Linus Torvalds 22a3e233ca Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial ...

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  Remove obsolete #include <linux/config.h>
  remove obsolete swsusp_encrypt
  arch/arm26/Kconfig typos
  Documentation/IPMI typos
  Kconfig: Typos in net/sched/Kconfig
  v9fs: do not include linux/version.h
  Documentation/DocBook/mtdnand.tmpl: typo fixes
  typo fixes: specfic -> specific
  typo fixes in Documentation/networking/pktgen.txt
  typo fixes: occuring -> occurring
  typo fixes: infomation -> information
  typo fixes: disadvantadge -> disadvantage
  typo fixes: aquire -> acquire
  typo fixes: mecanism -> mechanism
  typo fixes: bandwith -> bandwidth
  fix a typo in the RTC_CLASS help text
  smb is no longer maintained

Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S

2006-06-30 15:39:30 -07:00

..

abort-ev4.S

…

abort-ev4t.S

…

abort-ev5t.S

…

abort-ev5tj.S

…

abort-ev6.S

[ARM] CONFIG_CPU_MPCORE -> CONFIG_CPU_32v6K

2006-02-22 21:13:28 +00:00

abort-lv4t.S

…

abort-macro.S

…

alignment.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

cache-v3.S

…

cache-v4.S

…

cache-v4wb.S

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

cache-v4wt.S

…

cache-v6.S

[ARM] 3356/1: Workaround for the ARM1136 I-cache invalidation problem

2006-03-10 22:26:47 +00:00

consistent.c

[ARM] 3439/2: xsc3: add I/O coherency support

2006-04-02 00:07:39 +01:00

copypage-v3.S

[ARM] Remove LOADREGS macro

2006-06-25 11:23:45 +01:00

copypage-v4mc.c

…

copypage-v4wb.S

kbuild: arm - use generic asm-offsets.h support

2005-09-09 21:08:59 +02:00

copypage-v4wt.S

kbuild: arm - use generic asm-offsets.h support

2005-09-09 21:08:59 +02:00

copypage-v6.c

[ARM] Make v6 copypage function static and cleanup pgprots

2005-10-30 19:03:21 +00:00

copypage-xsc3.S

[ARM] 3377/2: add support for intel xsc3 core

2006-03-28 21:00:40 +01:00

copypage-xscale.c

…

discontig.c

[ARM] Cleanup ARM includes

2006-01-03 17:39:34 +00:00

extable.c

…

fault-armv.c

[PATCH] mm: arm ready for split ptlock

2005-10-29 21:40:42 -07:00

fault.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

fault.h

…

flush.c

[ARM] 3356/1: Workaround for the ARM1136 I-cache invalidation problem

2006-03-10 22:26:47 +00:00

init.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

iomap.c

[ARM] nommu: add stubs for ioremap and friends

2006-06-28 17:59:48 +01:00

ioremap.c

[ARM] nommu: add stubs for ioremap and friends

2006-06-28 17:59:48 +01:00

Kconfig

[ARM] nommu: avoid selecting TLB and CPU specific copy code

2006-06-28 17:59:47 +01:00

Makefile

[ARM] nommu: remove fault-armv, mmap and mm-armv files from nommu build

2006-06-28 17:59:52 +01:00

mm-armv.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

2006-06-30 15:39:30 -07:00

mmap.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

mmu.c

…

nommu.c

[ARM] nommu: export flush_dcache_page()

2006-06-28 17:59:53 +01:00

proc-arm6_7.S

[ARM] nommu: Initial uCLinux support for MMU-based CPUs

2006-06-28 17:59:56 +01:00

proc-arm720.S

[ARM] nommu: Initial uCLinux support for MMU-based CPUs

2006-06-28 17:59:56 +01:00

proc-arm920.S

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

proc-arm922.S

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

proc-arm925.S

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

proc-arm926.S

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

proc-arm1020.S

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

proc-arm1020e.S

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

proc-arm1022.S

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

proc-arm1026.S

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

proc-macros.S

kbuild: arm - use generic asm-offsets.h support

2005-09-09 21:08:59 +02:00

proc-sa110.S

[ARM] nommu: Initial uCLinux support for MMU-based CPUs

2006-06-28 17:59:56 +01:00

proc-sa1100.S

[ARM] nommu: Initial uCLinux support for MMU-based CPUs

2006-06-28 17:59:56 +01:00

proc-syms.c

…

proc-v6.S

[ARM] nommu: Initial uCLinux support for MMU-based CPUs

2006-06-28 17:59:56 +01:00

proc-xsc3.S

[PATCH] ARM: explicitly disable BTB on ixp2350

2006-05-30 20:33:20 -07:00

proc-xscale.S

Merge nommu tree

2006-03-25 22:08:55 +00:00

tlb-v3.S

kbuild: arm - use generic asm-offsets.h support

2005-09-09 21:08:59 +02:00

tlb-v4.S

kbuild: arm - use generic asm-offsets.h support

2005-09-09 21:08:59 +02:00

tlb-v4wb.S

kbuild: arm - use generic asm-offsets.h support

2005-09-09 21:08:59 +02:00

tlb-v4wbi.S

kbuild: arm - use generic asm-offsets.h support

2005-09-09 21:08:59 +02:00

tlb-v6.S

[ARM] 3352/1: DSB required for the completion of a TLB maintenance operation

2006-03-07 14:42:27 +00:00