davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9c7a41691f
kernel-ark/arch/ia64
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
..
configs [IA64] tiger_defconfig s/NR_CPUS=4/NR_CPUS=16/ 2006-06-28 09:57:16 -07:00
dig Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
hp Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ia32 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02: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
mm Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
oprofile Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
pci Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
scripts Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sn Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
defconfig [IA64] Increase max node count on SN platforms 2006-03-24 13:15:03 -08:00
install.sh Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Kconfig [PATCH] zoned vm counters: basic ZVC (zoned vm counter) implementation 2006-06-30 11:25:34 -07:00
Kconfig.debug [PATCH] Move Kprobes and Oprofile to "Instrumentation Support" menu 2005-11-07 07:53:35 -08:00
Makefile [IA64] add vmlinuz target 2006-06-21 14:31:07 -07:00
module.lds Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00