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
Domen Puncer
0973ddddca
[PATCH] au1xxx: pcmcia: fix __init called from non-init
...
This must not be marked __init, as it is called from
au1x00_drv_pcmcia_probe.
Signed-off-by: Domen Puncer <domen.puncer@ultra.si>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
2006-06-30 22:09:13 +02:00
Jörn Engel
6ab3d5624e
Remove obsolete #include <linux/config.h>
...
Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
2006-06-30 19:25:36 +02:00
Ralf Baechle
5ab0b37494
[PATCH] Alchemy PCMCIA: Fix config.h inclusion
...
Add rsp. remove the inclusion of <linux/config.h> as needed.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
2005-11-10 11:18:26 +01:00
Pete Popov
d6460827af
Updated pcmcia driver with pb1200 and db1200 support.
...
Updated db1200_defconfig so pcmcia is enabled by default.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2005-10-29 19:32:24 +01:00
Linus Torvalds
1da177e4c3
Linux-2.6.12-rc2
...
Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.
Let it rip!
2005-04-16 15:20:36 -07:00
