[XFS] Fix merge failures
[pandora-kernel.git] / include / linux / i2c-algo-pca.h
2008-07-10 Russell KingMerge branches 'at91', 'dyntick', 'ep93xx', 'iop',...
2008-07-03 Russell KingMerge branch 'fb' into devel
2008-05-07 Russell KingMerge branch 'irq-fix' of git://modarm9.com/gitsrc...
2008-05-03 Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2008-05-01 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-05-01 Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2008-05-01 David S. MillerMerge branch 'master' of /linux/kernel/git/linville...
2008-05-01 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-30 Len BrownMerge branches 'release', 'acpica', 'bugzilla-10224...
2008-04-30 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-30 Paul MackerrasMerge git://git./pub/scm/linux/kernel/git/jk/spufs
2008-04-29 Russell KingMerge branches 'pxa' and 'orion-fixes1'
2008-04-28 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-27 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-04-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-25 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-25 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-04-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-24 Trond MyklebustMerge branch 'devel'
2008-04-24 Linus TorvaldsMerge branch 'irq-fixes-2' of git://git./linux/kernel...
2008-04-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-04-24 Linus TorvaldsMerge branch 'fixes' of /home/rmk/linux-2.6-arm
2008-04-24 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-04-24 Paul MackerrasMerge branch 'powerpc-next' of /linux/kernel/git/galak...
2008-04-23 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-22 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-04-22 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-22 Linus TorvaldsMerge branch 'i2c-for-linus' of git://jdelvare.pck...
2008-04-22 Wolfram Sangi2c-algo-pca: Extend for future drivers
2007-02-17 Kyle McMartinMerge branch 'parisc' from /home/kyle/repos/parisc...
2007-02-10 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-02-03 Len BrownPull video into test branch
2007-01-17 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-12-21 Linus TorvaldsMerge branch 'drm-patches' of /linux/kernel/git/airlied...
2006-12-20 Len BrownPull bugfix into test branch
2006-12-20 Len BrownPull ec into test branch
2006-12-20 Len BrownPull platform-drivers into test branch
2006-12-16 Len BrownPull style into test branch
2006-12-16 Len BrownPull bugfix into test branch
2006-12-16 Len BrownPull trivial into test branch
2006-12-16 Len BrownPull platform-drivers into test branch
2006-12-16 Len BrownPull button into test branch
2006-12-16 Len BrownPull dock into test branch
2006-12-16 Len BrownPull ec into test branch
2006-12-13 Russell King[ARM] Merge AT91 and devel branches
2006-12-13 Linus TorvaldsMerge branch 'hwmon-for-linus' of git://jdelvare.pck...
2006-12-13 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-12-13 Linus TorvaldsMerge git://git./linux/kernel/git/bunk/trivial
2006-12-13 Linus TorvaldsMerge /linux/kernel/git/wim/linux-2.6-watchdog
2006-12-12 Dave JonesMerge ../linus
2006-12-12 Dave JonesMerge ../linus
2006-12-12 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2006-12-12 Linus TorvaldsMerge branch 'i2c-for-linus' of git://jdelvare.pck...
2006-12-10 Jean Delvarei2c: Discard the i2c algo del_bus wrappers
2005-12-06 Len BrownPull release into acpica branch
2005-11-21 David S. MillerMerge git://git.skbuff.net/gitroot/yoshfuji/linux-2...
2005-11-11 Jeff GarzikMerge branch 'atmel'
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 Jeff GarzikMerge branch 'master'
2005-11-05 James BottomleyMerge by Hand
2005-11-02 Linus TorvaldsMerge /pub/scm/linux/kernel/git/airlied/drm-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 Paul MackerrasMerge ../linux-2.6 by hand
2005-10-30 Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2005-10-30 Jeff GarzikMerge branch 'upstream'
2005-10-30 Jeff GarzikMerge branch 'upstream'
2005-10-29 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2005-10-29 Arnaldo Carvalho... Merge /pub/scm/linux/kernel/git/sridhar/lksctp-2.6
2005-10-29 Jeff GarzikMerge branch 'upstream'
2005-10-28 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2005-10-28 Roland DreierMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-10-28 Jeff GarzikMerge branch 'master'
2005-10-28 Jeff GarzikMerge branch 'master'
2005-10-28 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/i2c-2.6
2005-10-28 Jean Delvare[PATCH] i2c: Drop unused per-i2c-algorithm adapter max
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2