[pull] Please pull bjdooks' i2c git

[pull] Please pull bjdooks' i2c git

[Ben Dooks]

The following changes since commit f878133bf022717b880d0e0995b8f91436fd605c:

  Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (2011-01-12 08:40:25 -0800)

are available in the git repository at:

  git://git.fluff.org/bjdooks/linux.git for-linus/i2c-2638

Aaro Koskinen (1):
      i2c-iop3xx: add iomem annotation

Ben Dooks (7):
      Merge branch 'for-2638/i2c/mv64xx' into for-linus/i2c-2638
      Merge branch 'for-2638/i2c/omap' into for-linus/i2c-2638
      Merge branch 'for-2638/i2c/iop' into for-linus/i2c-2638
      Merge branch 'for-2638/i2c/ocores' into for-linus/i2c-2638
      Merge branch 'for-2638/i2c/intel' into for-linus/i2c-2638
      Merge branch 'for-2638/i2c/nomadik' into for-linus/i2c-2638
      Merge branch 'for-2638/i2c/bfin2' into for-linus/i2c-2638

Jonas Bonn (3):
      i2c-ocores: Adapt for device tree
      i2c-ocores: Use devres for resource allocation
      i2c-ocores: add some device tree documentation

Linus Walleij (1):
      i2c-nomadik: fix regression on adapter name

Michael Hennerich (2):
      i2c-bfin-twi: handle faulty slave devices better
      i2c-bfin-twi: move setup to the earlier subsys initcall

Rodolfo Giometti (1):
      i2c-mv64xxx: send repeated START between messages in xfer

Samu Onkalo (1):
      i2c-omap: Set latency requirements only once for several messages

Tomoya MORINAGA (1):
      i2c-eg20t: add driver for Intel EG20T

 drivers/i2c/busses/Kconfig        |    8 +
 drivers/i2c/busses/Makefile       |    1 +
 drivers/i2c/busses/i2c-bfin-twi.c |   24 +-
 drivers/i2c/busses/i2c-eg20t.c    |  900 +++++++++++++++++++++++++++++++++++++
 drivers/i2c/busses/i2c-iop3xx.c   |    6 +-
 drivers/i2c/busses/i2c-iop3xx.h   |    2 +-
 drivers/i2c/busses/i2c-mv64xxx.c  |   45 ++-
 drivers/i2c/busses/i2c-nomadik.c  |    6 +-
 drivers/i2c/busses/i2c-ocores.c   |  145 +++++--
 drivers/i2c/busses/i2c-omap.c     |   10 +-
 10 files changed, 1086 insertions(+), 61 deletions(-)
 create mode 100644 drivers/i2c/busses/i2c-eg20t.c

Re: [pull] Please pull bjdooks' i2c git

[Ben Dooks]

On Wed, Jan 12, 2011 at 10:29:04PM +0000, Ben Dooks wrote:
> The following changes since commit f878133bf022717b880d0e0995b8f91436fd605c:
> 
>   Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (2011-01-12 08:40:25 -0800)
> 
> are available in the git repository at:
> 
>   git://git.fluff.org/bjdooks/linux.git for-linus/i2c-2638

If there is anything else people want in, please let me know.

I will consider if all or part of the CE4100 changes are to be
applied and make a second pull request with these in.

-- 
Ben Dooks, ben-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org, http://www.fluff.org/ben/

Large Hadron Colada: A large Pina Colada that makes the universe disappear.

Re: [pull] Please pull bjdooks' i2c git

[Linus Torvalds]

On Wed, Jan 12, 2011 at 2:29 PM, Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org> wrote:
>
> Ben Dooks (7):
>      Merge branch 'for-2638/i2c/mv64xx' into for-linus/i2c-2638
>      Merge branch 'for-2638/i2c/omap' into for-linus/i2c-2638
>      Merge branch 'for-2638/i2c/iop' into for-linus/i2c-2638
>      Merge branch 'for-2638/i2c/ocores' into for-linus/i2c-2638
>      Merge branch 'for-2638/i2c/intel' into for-linus/i2c-2638
>      Merge branch 'for-2638/i2c/nomadik' into for-linus/i2c-2638
>      Merge branch 'for-2638/i2c/bfin2' into for-linus/i2c-2638

Btw, this is where octopus merges are just very nice.

IOW, just do

      git merge for-2638/i2c/mv64xx for-2638/i2c/omap for-2638/i2c/iop
for-2638/i2c/ocores for-2638/i2c/intel for-2638/i2c/nomadik
for-2638/i2c/bfin2

and it actually ends up looking much better.

Of course, it does make bisecting a bit harder, but when you have lots
of branches with just one or two commits each, and they are pretty
independent (so a bug in one is unlikely to be mistaken for a bug in
another), octopus really is the way to go.

Anyway, pulled.

                 Linus