original_kernel/drivers/i2c/busses
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
..
Kconfig
Makefile
i2c-ali15x3.c
i2c-ali1535.c
i2c-ali1563.c
i2c-amd756-s4882.c
i2c-amd756.c
i2c-amd8111.c
i2c-au1550.c
i2c-au1550.h
i2c-elektor.c
i2c-hydra.c
i2c-i801.c [PATCH] i2c-801: 64bit resource fix 2006-06-30 11:25:41 -07:00
i2c-i810.c
i2c-ibm_iic.c
i2c-ibm_iic.h
i2c-iop3xx.c
i2c-iop3xx.h
i2c-isa.c
i2c-ite.c
i2c-ixp4xx.c
i2c-ixp2000.c
i2c-mpc.c
i2c-mv64xxx.c
i2c-nforce2.c
i2c-ocores.c
i2c-parport-light.c
i2c-parport.c
i2c-parport.h
i2c-pca-isa.c
i2c-piix4.c
i2c-powermac.c
i2c-prosavage.c
i2c-pxa.c
i2c-rpx.c
i2c-s3c2410.c
i2c-savage4.c
i2c-sibyte.c
i2c-sis96x.c
i2c-sis630.c
i2c-sis5595.c
i2c-stub.c
i2c-via.c
i2c-viapro.c
i2c-voodoo3.c
scx200_acb.c
scx200_i2c.c