Merge by hand (conflicts between pending drivers and kfree cleanups)
[linux-2.6] / drivers / i2c / busses / i2c-pxa.c
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2005-11-06  Thomas GleixnerMerge branch 'master' of /home/tglx/work/mtd/git/linux...
2005-11-05  Jeff GarzikMerge branch 'master'
2005-11-05  James BottomleyMerge by Hand
2005-11-05  Jeff GarzikMerge branch 'master'
2005-11-05  Linus TorvaldsMerge branch 'srp' of /linux/kernel/git/roland/infiniband
2005-11-05  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2005-11-02  Stephen RothwellMerge Paulus' tree
2005-11-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/airlied/drm-2.6
2005-11-02  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-11-02  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-02  Paul MackerrasMerge ../linux-2.6
2005-11-01  Anton AltaparmakovMerge branch 'master' of /home/src/linux-2.6/
2005-10-31  Tony Luckmanual update from upstream:
2005-10-31  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-10-31  Linus TorvaldsMerge git://git./linux/kernel/git/aia21/ntfs-2.6
2005-10-31  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2005-10-31  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-drvmodel
2005-10-29  Russell KingCreate platform_device.h to contain all the platform...
2005-10-28  Tony LuckPull xpc-disengage into release branch
2005-10-28  Tony LuckPull new-efi-memmap into release branch
2005-10-28  Tony LuckPull altix-mmr into release branch
2005-10-28  Tony LuckPull altix-fpga-reset into release branch
2005-10-28  James BottomleyMerge HEAD from ../scsi-misc-2.6-old
2005-10-21  Steve FrenchMerge ... /linux/kernel/git/sfrench/cifs-2.6.git/
2005-10-06  Jeff GarzikMerge branch 'master'
2005-09-25  Dave Airlieupdate from upstream
2005-09-24  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-24  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-23  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-23  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/shaggy...
2005-09-22  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-20  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-09-16  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-14  Linus TorvaldsMerge branch 'release' of /linux/kernel/git/aegl/linux-2.6
2005-09-14  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-arm-smp
2005-09-14  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-09-14  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-i2c
2005-09-14  Russell King[I2C] Add a functionality method, and remove algorithm ids
2005-09-14  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-14  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-14  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/chrisw/lsm-2.6
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dwmw2/audit-2.6
2005-09-13  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-09-11  Tony LuckPull sn-features into release branch
2005-09-11  Tony LuckPull sim-fixes into release branch
2005-09-11  Linus TorvaldsMerge /pub/scm/linux/kernel/git/roland/infiniband
2005-09-11  Linus TorvaldsMerge branch 'for-linus' from /.../shaggy/jfs-2.6 manually
2005-09-10  Dmitry TorokhovManual merge with Linus
2005-09-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2005-09-09  Greg KHMerge gregkh@/linux/kernel/git/gregkh/driver-2.6
2005-09-09  David S. MillerMerge /pub/scm/linux/kernel/git/acme/net-2.6
2005-09-09  Anton AltaparmakovMerge branch 'master' of /linux/kernel/git/torvalds...
2005-09-09  Linus TorvaldsMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
2005-09-09  Linus TorvaldsMerge branch 'release' of /linux/kernel/git/aegl/linux-2.6
2005-09-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-09-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2005-09-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/usb-2.6
2005-09-08  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/w1-2.6
2005-09-08  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/pci-2.6
2005-09-08  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-09-08  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-09-08  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-i2c manually
2005-09-08  Russell King[I2C] Clean up i2c-pxa debugging/printks
2005-06-15  Russell King[PATCH] I2C: Add PXA I2C driver