projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3930217 6ab3d56)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 30 Jun 2006 22:39:30 +0000 (15:39 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 30 Jun 2006 22:39:30 +0000 (15:39 -0700)
commit22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13
tree7ef158ba2c30e0dde2dc103d1904fae243759a6btree | snapshot
parent39302175c26d74be35715c05a0f342c9e64c21bfcommit | diff
parent6ab3d5624e172c553004ecc862bfeac16d9d68b7commit | diff
Merge git://git./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
43 files changed:
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/mm/mm-armv.c diff1 | diff2 | blob | history
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c diff1 | diff2 | blob | history
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c diff1 | diff2 | blob | history
arch/i386/kernel/msr.c diff1 | diff2 | blob | history
arch/i386/mach-voyager/voyager_smp.c diff1 | diff2 | blob | history
arch/i386/mm/pgtable.c diff1 | diff2 | blob | history
arch/s390/appldata/appldata_base.c diff1 | diff2 | blob | history
arch/s390/appldata/appldata_mem.c diff1 | diff2 | blob | history
arch/um/kernel/vmlinux.lds.S diff1 | diff2 | blob | history
arch/um/sys-x86_64/syscall_table.c diff1 | diff2 | blob | history
block/ll_rw_blk.c diff1 | diff2 | blob | history
drivers/acpi/osl.c diff1 | diff2 | blob | history
drivers/acpi/pci_irq.c diff1 | diff2 | blob | history
drivers/char/istallion.c diff1 | diff2 | blob | history
drivers/edac/amd76x_edac.c diff1 | diff2 | blob | history
drivers/edac/e752x_edac.c diff1 | diff2 | blob | history
drivers/edac/e7xxx_edac.c diff1 | diff2 | blob | history
drivers/edac/edac_mc.c diff1 | diff2 | blob | history
drivers/edac/edac_mc.h diff1 | diff2 | blob | history
drivers/edac/i82860_edac.c diff1 | diff2 | blob | history
drivers/edac/i82875p_edac.c diff1 | diff2 | blob | history
drivers/edac/r82600_edac.c diff1 | diff2 | blob | history
drivers/media/video/bt8xx/bttv-cards.c diff1 | diff2 | blob | history
drivers/media/video/saa7134/saa7134-core.c diff1 | diff2 | blob | history
drivers/net/wireless/hostap/hostap_cs.c diff1 | diff2 | blob | history
drivers/parisc/led.c diff1 | diff2 | blob | history
drivers/pcmcia/au1000_db1x00.c diff1 | diff2 | blob | history
drivers/usb/core/inode.c diff1 | diff2 | blob | history
fs/buffer.c diff1 | diff2 | blob | history
fs/inode.c diff1 | diff2 | blob | history
fs/nfs/pagelist.c diff1 | diff2 | blob | history
fs/nfs/write.c diff1 | diff2 | blob | history
fs/nfsd/vfs.c diff1 | diff2 | blob | history
fs/proc/proc_misc.c diff1 | diff2 | blob | history
init/main.c diff1 | diff2 | blob | history
kernel/signal.c diff1 | diff2 | blob | history
kernel/sysctl.c diff1 | diff2 | blob | history
mm/filemap.c diff1 | diff2 | blob | history
mm/page_alloc.c diff1 | diff2 | blob | history
mm/shmem.c diff1 | diff2 | blob | history
security/dummy.c diff1 | diff2 | blob | history
security/selinux/hooks.c diff1 | diff2 | blob | history
MicroBlaze GIT Repository