From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 12 May 2006 19:14:52 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
X-Git-Tag: v2.6.17-rc5~164
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be1fd94fd698e9dfa2676f688d4e9b034e0d4b9e;p=linux-2.6

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

* 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
---

be1fd94fd698e9dfa2676f688d4e9b034e0d4b9e