openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/arch/arm
History
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
..
boot Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
common Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
configs [ARM] 3654/1: add ajeco 1arm sbc support 2006-06-26 17:48:29 +01:00
kernel Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
lib Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-aaec2000 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-at91rm9200 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-clps711x Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-clps7500 [ARM] 3260/1: remove phys_ram from struct machine_desc (part 2) 2006-01-13 20:51:52 +00:00
mach-ebsa110 [ARM] 3260/1: remove phys_ram from struct machine_desc (part 2) 2006-01-13 20:51:52 +00:00
mach-ep93xx Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-footbridge Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-h720x Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-imx Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-integrator Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-iop3xx Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-ixp4xx Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-ixp23xx Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-ixp2000 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-l7200 [ARM] 3260/1: remove phys_ram from struct machine_desc (part 2) 2006-01-13 20:51:52 +00:00
mach-lh7a40x Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-netx [ARM] Include asm/hardware.h not asm/arch/hardware.h 2006-06-20 19:53:16 +01:00
mach-omap1 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-omap2 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-pnx4008 [ARM] 3623/1: pnx4008: move GPIO-related defines to gpio.h 2006-06-22 10:26:21 +01:00
mach-pxa Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-realview Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-rpc [ARM] 3260/1: remove phys_ram from struct machine_desc (part 2) 2006-01-13 20:51:52 +00:00
mach-s3c2410 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-sa1100 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-shark Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mach-versatile Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mm Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
nwfpe Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
oprofile [ARM] Use kcalloc to allocate counter_config array rather than kmalloc 2006-03-21 23:30:02 +00:00
plat-omap Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
tools [ARM] Update mach-types 2006-06-26 22:50:21 +01:00
vfp Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
Kconfig [ARM] nommu: prevent Xscale-based machines being selected 2006-06-28 17:59:54 +01:00
Kconfig-nommu [ARM] nommu: fixups for the exception vectors 2006-03-27 15:18:50 +01:00
Kconfig.debug [ARM] Trivial typo fixes 2006-06-04 21:22:11 +01:00
Makefile Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild 2006-06-26 11:05:15 -07:00