22a3e233ca
* 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
7 lines
144 B
ArmAsm
7 lines
144 B
ArmAsm
/* in case the preprocessor is a 32bit one */
|
|
#undef i386
|
|
#ifdef CONFIG_LD_SCRIPT_STATIC
|
|
#include "uml.lds.S"
|
|
#else
|
|
#include "dyn.lds.S"
|
|
#endif
|