From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Tue, 12 Dec 2006 16:01:50 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
X-Git-Tag: v2.6.20-rc1~146^2~7
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d907dd2efd69195f4a5fc584a0eaecc599ca4c2c;p=linux-2.6

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (4954): Fix: On ia64, i2c adap->inb/adap->outb are wrongly evaluated
---

d907dd2efd69195f4a5fc584a0eaecc599ca4c2c