Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
authorLinus Torvalds <torvalds@woody.osdl.org>
Tue, 12 Dec 2006 16:01:50 +0000 (08:01 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Tue, 12 Dec 2006 16:01:50 +0000 (08:01 -0800)
commitd907dd2efd69195f4a5fc584a0eaecc599ca4c2c
tree839e5bb487d4a7acc1e15ce76744019f7b3efc78
parent11c302c14d8ddc47504bd3b650bc9e8da7c717b7
parent2a7e9a260ede3b17b5bc25c540a033a45bbf0461
Merge branch 'master' of /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