merge Linus head tree into my drm tree and fix up conflicts
[linux-2.6] / drivers / media / dvb / frontends / tda1004x.h
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/chrisw/lsm-2.6
2005-09-08  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-i2c manually
2005-08-29  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-08-28  James Bottomleyfix mismerge in ll_rw_blk.c
2005-08-18  Dave JonesMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-08-15  Len BrownMerge 'acpi-2.6.12' branch into to-akpm
2005-08-15  Len BrownMerge ../to-linus-stable/
2005-08-11  Len BrownMerge acpi-2.6.12 to-akpm
2005-08-05  Len Brown[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3
2005-08-04  Len Brown/home/lenb/src/to-akpm branch 'acpi-2.6.12'
2005-08-04  Len Brown/home/lenb/src/to-linus-stable branch 'acpi-2.6.12'
2005-08-03  Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-07-30  Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-07-26  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-07-23  Luming Yu/home/lenb/linux-2.6 branch 'acpi-2.6.12'
2005-07-13  Jeff GarzikMerge /spare/repo/netdev-2.6 branch 'ieee80211'
2005-07-13  Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git.
2005-07-13  Jeff GarzikMerge upstream 2.6.13-rc3 into ieee80211 branch of...
2005-07-13  David WoodhouseMerge with /shiny/git/linux-2.6/.git
2005-07-13  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-07-12  Todd PoynorMerge with rsync://fileserver/linux
2005-07-12  Len Brown[ACPI] merge acpi-2.6.12 branch into latest Linux 2...
2005-07-11  Linus TorvaldsMerge /pub/scm/linux/kernel/git/tglx/mtd-2.6
2005-07-11  Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-07-09  Linus TorvaldsMerge head 'drm-fixes' of /linux/kernel/git/airlied...
2005-07-09  Linus TorvaldsMerge head 'drm-3264' of /linux/kernel/git/airlied...
2005-07-09  Linus TorvaldsMerge head 'drm-via' of /linux/kernel/git/airlied/drm-2.6
2005-07-08  Tony LuckAuto merge with /home/aegl/GIT/linus
2005-07-08  Hartmut Hackmann[PATCH] dvb: frontend: tda1004x: support tda827x tuners
2005-07-08  Hartmut Hackmann[PATCH] dvb: frontend: tda1004x update
2005-06-26  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-26  Jeff GarzikMerge upstream (approx. 2.6.12-git8) into 'janitor...
2005-06-23  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-15  Tony LuckAuto merge with /home/aegl/GIT/linus
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch skge
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch starfire
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch smc91x
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch remove-drivers
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch iff-running
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch viro
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch orinoco-hch
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch ppp
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch hdlc
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch dm9000
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch 8139too-iomap
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch 8139cp
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/linux-2.6/.git branch HEAD
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/linux-2.6/.git branch HEAD
2005-06-02  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-05-28   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch we18-ieee80211
2005-05-28   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch we18
2005-05-28   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch master
2005-05-28   <jgarzik@pretzel... Merge ... fr.zoreil.com/linux-2.6.git branch HEAD
2005-05-27  Christoph HellwigMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-27   <jgarzik@pretzel... Merge ... /linux/kernel/git/torvalds/linux-2.6.git...
2005-05-26  James BottomleyAutomatic merge of ../scsi-misc-2.6-old/
2005-05-26   <jgarzik@pretzel... Merge ... /linux/kernel/git/torvalds/linux-2.6.git...
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch tlan
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch sis900
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch veth
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch qeth
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch ns83820
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch natsemi
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch forcedeth
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch airo
2005-05-26   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch atmel
2005-05-25   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch amd8111
2005-05-25   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch pcnet32
2005-05-25   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch ixgb
2005-05-25   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch e1000
2005-05-25   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch e100
2005-05-21  Anton AltaparmakovMerge with /usr/src/ntfs-2.6.git
2005-05-21  Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus...
2005-05-19  Linus TorvaldsMerge ... /linux/kernel/git/davem/sparc-2.6.git/
2005-05-19  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-17  Tony LuckMerge with linus
2005-05-17  Linus TorvaldsMerge ... /linux/kernel/git/jgarzik/libata-2.6.git
2005-05-17  Linus TorvaldsMerge ... /linux/kernel/git/gregkh/usb-2.6.git/
2005-05-17  Johannes Stezenbach[PATCH] dvb: tda1004x: allow N_I2C to be overridden...
2005-05-17  Johannes Stezenbach[PATCH] dvb: tda1004x: dont use bitfields
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2