Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 12 May 2006 19:14:52 +0000 (12:14 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 12 May 2006 19:14:52 +0000 (12:14 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6:
  [PATCH] scx200_acb: Fix for the CS5535 errata
  [PATCH] scx200_acb: Fix resource name use after free
  [PATCH] scx200_acb: Fix return on init error


Trivial merge