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)
commitbe1fd94fd698e9dfa2676f688d4e9b034e0d4b9e
treefc19e966f53d2bc7202fd4565d999595515ce50b
parent0d38eddab9ce6de3a9d6d583043dfa97b6bc0d3b
parent95563d343fec8d3e2f667c95230ac4ab7674b757
Merge /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